Sync with current GTK+.

2008-08-11  Carlos Garcia Campos  <carlosgc@gnome.org>

	* cut-n-paste/evmountoperation/ev-mount-operation.c:

	Sync with current GTK+.

svn path=/trunk/; revision=3102

diff --git a/ChangeLog b/ChangeLog
index 32410fdf348f721627ffe29d219c91e09044722c..f33b2ce569a62bf9f6dc612a43e2b6b6d66cdeb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-11  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * cut-n-paste/evmountoperation/ev-mount-operation.c:
+
+       Sync with current GTK+.
+       
 2008-08-06  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * configure.ac:

diff --git a/cut-n-paste/evmountoperation/ev-mount-operation.c b/cut-n-paste/evmountoperation/ev-mount-operation.c
index 165c625a9738d7127c24f3eb347b6acaf7760350..0ce69847b1b5fec9231abcb0a6e576e4bc7f689e 100644 (file)
--- a/cut-n-paste/evmountoperation/ev-mount-operation.c
+++ b/cut-n-paste/evmountoperation/ev-mount-operation.c
@@ -578,13 +578,23 @@ ev_mount_operation_ask_password (GMountOperation   *mount_op,
                     G_CALLBACK (pw_dialog_got_response), operation);
 
   if (can_anonymous)
-    gtk_widget_set_sensitive (priv->entry_container, FALSE);
+    {
+      /* The anonymous option will be active by default,
+       * ensure the toggled signal is emitted for it.
+       */
+      gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (priv->anonymous_toggle));
+    }
   else if (! pw_dialog_input_is_valid (operation))
     gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);
 
   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));