From bc48caa272bdc0971191bd5f2bfc61bbdd48f460 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 26 Sep 2008 19:25:35 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20553133=20=E2=80=93=20GtkFileChooser=20won?= =?UTF-8?q?'t=20ask=20to=20mount=20a=20volume?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-09-26 Matthias Clasen Bug 553133 – GtkFileChooser won't ask to mount a volume * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Use a GtkMountOperation when mounting, so that we get a password dialog when required. svn path=/trunk/; revision=21523 --- ChangeLog | 8 ++++++++ gtk/gtkfilechooserdefault.c | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ee1c6c74f..38d7ab8e7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-09-26 Matthias Clasen + + Bug 553133 – GtkFileChooser won't ask to mount a volume + + * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Use + a GtkMountOperation when mounting, so that we get a password + dialog when required. + 2008-09-26 Cody Russell Bug 553917 – Typo in gdkwindow-win32.c diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index ec88425749..8881936dc2 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -6542,7 +6542,7 @@ show_and_select_files (GtkFileChooserDefault *impl, impl->show_and_select_files_cancellable = _gtk_file_system_get_folder (impl->file_system, parent_file, - "standard::is-hidden,standard::type,standard::name", + "standard::is-hidden,standard::type,standard::name,standard::content-type", show_and_select_files_get_folder_cb, info); profile_end ("end", NULL); @@ -10261,12 +10261,16 @@ shortcuts_activate_volume (GtkFileChooserDefault *impl, if (!_gtk_file_system_volume_is_mounted (volume)) { - set_busy_cursor (impl, TRUE); + GtkMountOperation *mount_op; + set_busy_cursor (impl, TRUE); + + mount_op = gtk_mount_operation_new (get_toplevel (GTK_WIDGET (impl))); impl->shortcuts_activate_iter_cancellable = - _gtk_file_system_mount_volume (impl->file_system, volume, NULL, + _gtk_file_system_mount_volume (impl->file_system, volume, mount_op, shortcuts_activate_volume_mount_cb, g_object_ref (impl)); + g_object_unref (mount_op); } else {