From: Carlos Garcia Campos Date: Mon, 11 Aug 2008 16:29:14 +0000 (+0000) Subject: Sync with current GTK+. X-Git-Tag: EVINCE_2_23_91~34 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=13948dea9658bd64604cd71d8913583afb88776a;p=evince.git Sync with current GTK+. 2008-08-11 Carlos Garcia Campos * cut-n-paste/evmountoperation/ev-mount-operation.c: Sync with current GTK+. svn path=/trunk/; revision=3102 --- diff --git a/ChangeLog b/ChangeLog index 32410fdf..f33b2ce5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-11 Carlos Garcia Campos + + * cut-n-paste/evmountoperation/ev-mount-operation.c: + + Sync with current GTK+. + 2008-08-06 Nickolay V. Shmyrev * configure.ac: diff --git a/cut-n-paste/evmountoperation/ev-mount-operation.c b/cut-n-paste/evmountoperation/ev-mount-operation.c index 165c625a..0ce69847 100644 --- 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));