gtk+ r20182 - in trunk: . gtk

[carlosg svn gnome org]

Author: carlosg
Date: Tue May 27 00:08:00 2008
New Revision: 20182
URL: http://svn.gnome.org/viewvc/gtk+?rev=20182&view=rev

Log:
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.


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkmountoperation.c

Modified: trunk/gtk/gtkmountoperation.c
==============================================================================
--- trunk/gtk/gtkmountoperation.c	(original)
+++ trunk/gtk/gtkmountoperation.c	Tue May 27 00:08:00 2008
@@ -621,7 +621,12 @@
 
   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));