[nautilus] directory: assume recent as local



commit bfd0b4bf02187b4da6ce0eb7c9a36df5d96ca649
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Dec 2 18:03:52 2015 +0100

    directory: assume recent as local
    
    We were assuming trash and native_path as local, but not recent,
    which is wrong.
    So assume recent as local, with the benefit that we can use it
    for mime type polling and remove some dead code now.

 libnautilus-private/nautilus-directory.c |    1 +
 src/nautilus-mime-actions.c              |   27 +--------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 073e42c..95f2a92 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -574,6 +574,7 @@ nautilus_directory_is_local (NautilusDirectory *directory)
        }
 
        return nautilus_directory_is_in_trash (directory) ||
+               nautilus_directory_is_in_recent (directory) ||
               g_file_is_native (directory->details->location);
 }
 
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 07ae9c1..44c99d8 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -250,31 +250,6 @@ nautilus_mime_actions_get_required_file_attributes (void)
                NAUTILUS_FILE_ATTRIBUTE_LINK_INFO;
 }
 
-static gboolean
-file_has_local_path (NautilusFile *file)
-{
-       GFile *location;
-       char *path;
-       gboolean res;
-
-       
-       /* Don't only check _is_native, because we want to support
-          using the fuse path */
-       location = nautilus_file_get_location (file);
-       if (g_file_is_native (location)) {
-               res = TRUE;
-       } else {
-               path = g_file_get_path (location);
-               
-               res = path != NULL;
-               
-               g_free (path);
-       }
-       g_object_unref (location);
-       
-       return res;
-}
-
 GAppInfo *
 nautilus_mime_get_default_application_for_file (NautilusFile *file)
 {
@@ -287,7 +262,7 @@ nautilus_mime_get_default_application_for_file (NautilusFile *file)
        }
 
        mime_type = nautilus_file_get_mime_type (file);
-       app = g_app_info_get_default_for_type (mime_type, !file_has_local_path (file));
+       app = g_app_info_get_default_for_type (mime_type, !nautilus_file_is_local (file));
        g_free (mime_type);
 
        if (app == NULL) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]