evince r3102 - in trunk: . cut-n-paste/evmountoperation

[carlosgc svn gnome org]

Author: carlosgc
Date: Mon Aug 11 16:29:14 2008
New Revision: 3102
URL: http://svn.gnome.org/viewvc/evince?rev=3102&view=rev

Log:
2008-08-11  Carlos Garcia Campos  <carlosgc gnome org>

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

	Sync with current GTK+.


Modified:
   trunk/ChangeLog
   trunk/cut-n-paste/evmountoperation/ev-mount-operation.c

Modified: trunk/cut-n-paste/evmountoperation/ev-mount-operation.c
==============================================================================
--- trunk/cut-n-paste/evmountoperation/ev-mount-operation.c	(original)
+++ trunk/cut-n-paste/evmountoperation/ev-mount-operation.c	Mon Aug 11 16:29:14 2008
@@ -578,13 +578,23 @@
                     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));