Set password dialog modal and transient for the parent window also if it

2008-05-27  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): Set
        password dialog modal and transient for the parent window also if it
        was specified in the constructor. Bug #531864.

svn path=/trunk/; revision=20182

diff --git a/ChangeLog b/ChangeLog
index 8df23b979e8adcf7555a77fbfd2641710bb8b384..daf74c9d63cba3d2c5b7306b0f3109bfc3f35b79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-27  Carlos Garnacho  <carlos@imendio.com>
+
+       * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): Set
+       password dialog modal and transient for the parent window also if it
+       was specified in the constructor. Bug #531864.
+
 2008-05-26  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c: (gdk_screen_get_setting): Try

diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 38fe03c39102a5e45ebe9c9683766c8b8bc74436..ebd6cbf03137c39cab01d3dea81c784b4399c34a 100644 (file)
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -621,7 +621,12 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
 
   g_object_notify (G_OBJECT (operation), "is-showing");
 
-  if (priv->parent_window == NULL && priv->screen)
+  if (priv->parent_window)
+    {
+      gtk_window_set_transient_for (window, priv->parent_window);
+      gtk_window_set_modal (window, TRUE);
+    }
+  else if (priv->screen)
     gtk_window_set_screen (GTK_WINDOW (dialog), priv->screen);
 
   gtk_widget_show_all (GTK_WIDGET (dialog));