diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2013-03-05 17:17:00 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2013-03-05 17:17:42 -0600 |
| commit | a89d420270d1a856e072ed87c365b0176f102e6c (patch) | |
| tree | 4a3f46e4d4be874320f2bd03edb43c1238b9f393 | |
| parent | d484721b5ca9e82d6422cca8a3a40f001208f87b (diff) | |
| download | gtk+-a89d420270d1a856e072ed87c365b0176f102e6c.tar.gz | |
filechooser: Use _gtk_file_has_native_path() throughout when testing for local_only
In the case of checking for local_only, g_file_is_native() is not useful, since it
will return FALSE for something in a FUSE mount.
Signed-off-by: Federico Mena Quintero <federico@gnome.org>
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 10 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index c66769382c..a14bd92e2e 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -1954,7 +1954,7 @@ model_add_volumes (GtkFileChooserButton *button, base_file = _gtk_file_system_volume_get_root (volume); if (base_file != NULL) { - if (!g_file_is_native (base_file)) + if (!_gtk_file_has_native_path (base_file)) { g_object_unref (base_file); continue; @@ -2014,7 +2014,7 @@ model_add_bookmarks (GtkFileChooserButton *button, file = l->data; - if (g_file_is_native (file)) + if (_gtk_file_has_native_path (file)) { gtk_list_store_insert (store, &iter, pos); gtk_list_store_set (store, &iter, @@ -2236,7 +2236,7 @@ test_if_file_is_visible (GtkFileSystem *fs, if (!file) return FALSE; - if (local_only && !g_file_is_native (file)) + if (local_only && !_gtk_file_has_native_path (file)) return FALSE; if (!is_folder) @@ -2289,7 +2289,7 @@ filter_model_visible_func (GtkTreeModel *model, if (base_file) { - if (!g_file_is_native (base_file)) + if (!_gtk_file_has_native_path (base_file)) retval = FALSE; g_object_unref (base_file); } @@ -2809,7 +2809,7 @@ dialog_notify_cb (GObject *dialog, /* If the path isn't local but we're in local-only mode now, remove * the custom-folder row */ - if (data && g_file_is_native (G_FILE (data)) && + if (data && _gtk_file_has_native_path (G_FILE (data)) && gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (priv->dialog))) { pos--; diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 55788e3669..99c4200abd 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5159,7 +5159,7 @@ set_local_only (GtkFileChooserDefault *impl, } if (local_only && impl->current_folder && - !g_file_is_native (impl->current_folder)) + !_gtk_file_has_native_path (impl->current_folder)) { /* If we are pointing to a non-local folder, make an effort to change * back to a local folder, but it's really up to the app to not cause |