[mednaffe] 38/99: 'Preferences' window should be set transient for the main window

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository mednaffe.

commit c7b2307574fcc8733e41ac86bc429082b7c37228
Author: amatcoder at gmail.com <amatcoder at gmail.com@44025b82-9115-564b-7d03-7f3fc60b4744>
Date:   Fri Dec 27 03:40:27 2013 +0000

    'Preferences' window should be set transient for the main window
---
 src/common.h         | 1 +
 src/gui.c            | 9 +++------
 src/mednaffe.c       | 7 ++++++-
 src/settings_glade.h | 1 -
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/common.h b/src/common.h
index 68ff238..ed4435f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -25,6 +25,7 @@
 typedef struct
 {
    GtkWidget *topwindow;
+   GtkWidget *prefwindow;
    GtkWidget *cbpath;
    GtkWidget *sbname;
    GtkWidget *sbnumber;
diff --git a/src/gui.c b/src/gui.c
index becd2dd..925d549 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -90,8 +90,7 @@ G_MODULE_EXPORT
 #endif
 gboolean close_prefs(GtkWidget *widget, GdkEvent *event, guidata *gui)
 {
-  gtk_widget_hide_on_delete(GTK_WIDGET(gtk_builder_get_object(gui->settings,
-                             "dialog1")));
+  gtk_widget_hide_on_delete(gui->prefwindow);
   return TRUE;
 }
 
@@ -100,8 +99,7 @@ G_MODULE_EXPORT
 #endif
 void cancel_prefs(GtkButton *button, guidata *gui)
 {
-  gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(gui->settings,
-                             "dialog1")));
+  gtk_widget_hide(gui->prefwindow);
 }
 
 #ifdef G_OS_WIN32
@@ -109,7 +107,6 @@ G_MODULE_EXPORT
 #endif
 void on_preferences_activate(GtkMenuItem *menuitem, guidata *gui)
 {
-  gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(gui->settings,
-                             "dialog1")));
+  gtk_widget_show(gui->prefwindow);
 
 }
diff --git a/src/mednaffe.c b/src/mednaffe.c
index e403be1..7b5fe9a 100644
--- a/src/mednaffe.c
+++ b/src/mednaffe.c
@@ -330,6 +330,9 @@ int main(int argc, char **argv)
   gui.topwindow = GTK_WIDGET(gtk_builder_get_object(gui.builder,
                              "topwindow"));
                              
+  gui.prefwindow = GTK_WIDGET(gtk_builder_get_object(gui.settings,
+                             "dialog1"));
+                                                          
   gui.cbpath = GTK_WIDGET(gtk_builder_get_object(gui.builder, 
                           "cbpath"));
                           
@@ -360,7 +363,7 @@ int main(int argc, char **argv)
   gui.setlabel = GTK_WIDGET(gtk_builder_get_object(gui.builder,
                             "settings_label"));                   
   g_object_ref(gui.setlabel);
-  
+
   /* Connect signals */
   gtk_builder_connect_signals(gui.builder, &gui);
   gtk_builder_connect_signals(gui.specific, &gui);
@@ -404,6 +407,8 @@ int main(int argc, char **argv)
   gui.dinlist = NULL;
   gui.system = NULL;
   gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gui.notebook2),FALSE);
+  gtk_window_set_transient_for(GTK_WINDOW(gui.prefwindow), 
+                               GTK_WINDOW(gui.topwindow));
 
   /* Set statusbar messages */
   #ifdef GTK2_ENABLED
diff --git a/src/settings_glade.h b/src/settings_glade.h
index 5a5fac0..02eab44 100644
--- a/src/settings_glade.h
+++ b/src/settings_glade.h
@@ -35,7 +35,6 @@ static const char *settings_glade =
 "<property name=\"modal\">True</property>\n"
 "<property name=\"destroy_with_parent\">True</property>\n"
 "<property name=\"type_hint\">dialog</property>\n"
-"<property name=\"skip_taskbar_hint\">True</property>\n"
 "<signal name=\"delete-event\" handler=\"close_prefs\" swapped=\"no\"/>\n"
 "<child internal-child=\"vbox\">\n"
 "<object class=\"GtkVBox\" id=\"dialog-vbox1\">\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git