summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorCarlos Garnacho <carlos@imendio.com>2008-05-27 00:08:00 +0000
committerCarlos Garnacho <carlosg@src.gnome.org>2008-05-27 00:08:00 +0000
commit416bda12047586a847f554615c2df53804f43c20 (patch)
tree8429ac135315207d5759b18f9cc5a04d7fbf251e /gtk
parentf3a6fecb671a2aec691940c9e1b74c7f11e15930 (diff)
downloadgtk+-416bda12047586a847f554615c2df53804f43c20.tar.gz
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
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkmountoperation.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 38fe03c391..ebd6cbf031 100644
--- 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));