[Gpa-commits] r798 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-31 01:28:42 +0100 (Thu, 31 Jan 2008)
New Revision: 798

Modified:
   trunk/src/ChangeLog
   trunk/src/gpa.c
Log:
2008-01-31  Marcus Brinkmann  <marcus at g10code.de>

	* gpa.c (gpa_open_keyring_editor): Use gtk_window_present instead
	of gdk_window_raise.
	(gpa_open_filemanager, gpa_open_settings_dialog,
	(gpa_open_backend_config_dialog): Likewise.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-01-29 11:43:46 UTC (rev 797)
+++ trunk/src/ChangeLog	2008-01-31 00:28:42 UTC (rev 798)
@@ -1,3 +1,10 @@
+2008-01-31  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpa.c (gpa_open_keyring_editor): Use gtk_window_present instead
+	of gdk_window_raise.
+	(gpa_open_filemanager, gpa_open_settings_dialog,
+	(gpa_open_backend_config_dialog): Likewise.
+
 2008-01-29  Marcus Brinkmann  <marcus at g10code.de>
 
 	* keyring.c (keyring_toolbar_new): Use stock icon for file manager

Modified: trunk/src/gpa.c
===================================================================
--- trunk/src/gpa.c	2008-01-29 11:43:46 UTC (rev 797)
+++ trunk/src/gpa.c	2008-01-31 00:28:42 UTC (rev 798)
@@ -129,14 +129,15 @@
 void
 gpa_open_keyring_editor (void)
 {
-  if (!keyringeditor)
+  if (! keyringeditor)
     {
       keyringeditor = keyring_editor_new ();
       gtk_signal_connect (GTK_OBJECT (keyringeditor), "destroy",
 			  GTK_SIGNAL_FUNC (close_main_window), &keyringeditor);
       gtk_widget_show_all (keyringeditor);
     }
-  gdk_window_raise (keyringeditor->window);
+
+  gtk_window_present (GTK_WINDOW (keyringeditor));
 }
 
 
@@ -144,10 +145,13 @@
 void
 gpa_open_filemanager (void)
 {
+  /* FIXME: Shouldn't this connect only happen if the instance is
+     created the first time?  Looks like a memory leak to me.  */
   gtk_signal_connect (GTK_OBJECT (gpa_file_manager_get_instance ()), "destroy",
 		      GTK_SIGNAL_FUNC (quit_if_no_window), NULL);
   gtk_widget_show_all (gpa_file_manager_get_instance ());
-  gdk_window_raise (gpa_file_manager_get_instance ()->window);
+
+  gtk_window_present (GTK_WINDOW (gpa_file_manager_get_instance ()));
 }
 
 
@@ -155,7 +159,7 @@
 void
 gpa_open_settings_dialog (void)
 {
-  if (!settings_dialog)
+  if (! settings_dialog)
     {
       settings_dialog = gpa_settings_dialog_new ();
       gtk_signal_connect (GTK_OBJECT (settings_dialog), "destroy",
@@ -163,7 +167,7 @@
                           &settings_dialog);
       gtk_widget_show_all (settings_dialog);
     }
-  gdk_window_raise (settings_dialog->window);
+  gtk_window_present (GTK_WINDOW (settings_dialog));
 }
 
 
@@ -179,7 +183,8 @@
                           &backend_config_dialog);
       gtk_widget_show_all (backend_config_dialog);
     }
-  gdk_window_raise (backend_config_dialog->window);
+
+  gtk_window_present (GTK_WINDOW (backend_config_dialog));
 }