AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

filechooser: Use _gtk_file_has_native_path() throughout when testing for local_only

Browse Source 
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>
This commit is contained in:
Federico Mena Quintero 2013-03-05 17:17:00 -06:00
parent d484721b5c
commit a89d420270
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkfilechooserbutton.c
View File

@ -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--;

2
gtk/gtkfilechooserdefault.c
View File

@ -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