From 0c1868687b287c021c68241f980f0aedec615b62 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 11 Nov 2005 19:50:21 +0000 Subject: [PATCH] Merged from HEAD: 2005-11-11 Federico Mena Quintero Merged from HEAD: * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get the base path of the volume if it is mounted. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtkfilechooserdefault.c | 21 +++++++++++++-------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44e5075b64..920fe8f58e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-11 Federico Mena Quintero + + Merged from HEAD: + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get + the base path of the volume if it is mounted. + 2005-11-10 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_motion_resize_column): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 44e5075b64..920fe8f58e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-11-11 Federico Mena Quintero + + Merged from HEAD: + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get + the base path of the volume if it is mounted. + 2005-11-10 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_motion_resize_column): Remove diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 98bab5b71e..1159fdacc0 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1627,16 +1627,21 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl) if (impl->local_only) { - GtkFilePath *base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume); - if (base_path != NULL) + if (gtk_file_system_volume_get_is_mounted (impl->file_system, volume)) { - gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path); - gtk_file_path_free (base_path); - - if (!is_local) + GtkFilePath *base_path; + + base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume); + if (base_path != NULL) { - gtk_file_system_volume_free (impl->file_system, volume); - continue; + gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path); + gtk_file_path_free (base_path); + + if (!is_local) + { + gtk_file_system_volume_free (impl->file_system, volume); + continue; + } } } }