gconf-editor r1404 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Thu Sep 25 17:18:21 2008
New Revision: 1404
URL: http://svn.gnome.org/viewvc/gconf-editor?rev=1404&view=rev

Log:
2008-09-25  Cosimo Cecchi  <cosimoc gnome org>

	* src/gconf-search-dialog.c: (gconf_search_not_found_dialog),
	(gconf_search_dialog_search), (gconf_search_dialog_init):
	Set the right parent on the "Pattern not found" dialog, so that
	focus will return to the right dialog after closing (#349844).


Modified:
   trunk/ChangeLog
   trunk/src/gconf-search-dialog.c

Modified: trunk/src/gconf-search-dialog.c
==============================================================================
--- trunk/src/gconf-search-dialog.c	(original)
+++ trunk/src/gconf-search-dialog.c	Thu Sep 25 17:18:21 2008
@@ -49,18 +49,17 @@
 
 
 static void
-gconf_search_not_found_dialog (GConfEditorWindow *window) 
+gconf_search_not_found_dialog (GConfSearchDialog *dialog) 
 {
 	GtkWidget *not_found_dialog;
 	
-	not_found_dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+	not_found_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
 						   GTK_DIALOG_DESTROY_WITH_PARENT,
 						   GTK_MESSAGE_ERROR,
 						   GTK_BUTTONS_CLOSE,
 						   _("Pattern not found"));
 	gtk_dialog_run (GTK_DIALOG (not_found_dialog));
 	gtk_widget_destroy (GTK_WIDGET (not_found_dialog));
-	
 }
 
 static void
@@ -117,7 +116,7 @@
 		if (res != 0) {
 			gtk_widget_destroy (GTK_WIDGET (dialog));
 		} else {
-			gconf_search_not_found_dialog(window);
+			gconf_search_not_found_dialog (dialog);
 		}
 	}
 }
@@ -138,8 +137,6 @@
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
-	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-
 	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Find"));