# HG changeset patch
# User masneyb
# Date 1154560477 0
# Node ID 419443feddacfdd46c44d32b5b69241e691533cc
# Parent  ca59edd1b04d3c1e7b26f290cbb73dd0efe60994
2006-8-2 Brian Masney <masneyb@gftp.org>

        * src/gtk/misc-gtk.c (MakeYesNoDialog, MakeEditDialog) - use
        gtk_grab_add() to make sure these dialogs have exclusive focus in
        gftp (closes #340436)

diff -r ca59edd1b04d -r 419443feddac ChangeLog
--- a/ChangeLog	Wed Aug 02 22:50:21 2006 +0000
+++ b/ChangeLog	Wed Aug 02 23:14:37 2006 +0000
@@ -1,4 +1,8 @@
 2006-8-2 Brian Masney <masneyb@gftp.org>
+	* src/gtk/misc-gtk.c (MakeYesNoDialog, MakeEditDialog) - use
+	gtk_grab_add() to make sure these dialogs have exclusive focus in
+	gftp (closes #340436)
+
 	* src/uicommon/gftpui.c (gftpui_common_add_file_transfer) - don't
 	prompt the user about what to do with the file(s) that already exist if
 	the overwrite_default option is enabled. This option is disabled by
@@ -3528,7 +3532,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.463 2006/08/02 22:50:21 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.464 2006/08/02 23:14:36 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r ca59edd1b04d -r 419443feddac src/gtk/misc-gtk.c
--- a/src/gtk/misc-gtk.c	Wed Aug 02 22:50:21 2006 +0000
+++ b/src/gtk/misc-gtk.c	Wed Aug 02 23:14:37 2006 +0000
@@ -928,7 +928,6 @@
 #if GTK_MAJOR_VERSION == 1
   dialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (dialog), diagtxt);
-  gtk_grab_add (dialog);
   gtk_container_border_width (GTK_CONTAINER
 			      (GTK_DIALOG (dialog)->action_area), 5);
   gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 15);
@@ -967,6 +966,7 @@
   gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5);
   gtk_window_set_wmclass (GTK_WINDOW(dialog), "edit", "gFTP");
   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+  gtk_grab_add (dialog);
   gtk_widget_realize (dialog);
 
   if (gftp_icon != NULL)
@@ -1076,7 +1076,6 @@
 
 #if GTK_MAJOR_VERSION == 1
   dialog = gtk_dialog_new ();
-  gtk_grab_add (dialog);
   gtk_window_set_title (GTK_WINDOW (dialog), diagtxt);
   gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 
                               5);
@@ -1094,6 +1093,7 @@
   gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5);
   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
   gtk_window_set_wmclass (GTK_WINDOW(dialog), "yndiag", "gFTP");
+  gtk_grab_add (dialog);
   gtk_widget_realize (dialog);
 
   if (gftp_icon != NULL)