[nautilus] file: reduce the amount of directory state poking

[Ernestas Kulik <ernestask src gnome org>]

commit 97cb7961131990d47d2b03020c8ff486c79d3bce
Author: Ernestas Kulik <ernestask gnome org>
Date:   Thu Aug 24 15:56:54 2017 +0300

    file: reduce the amount of directory state poking
    
    This commit refactors some functions to use the public NautilusDirectory
    API.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=786760

 src/nautilus-file.c |   50 +++++++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 2d668c1..536f835 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -1616,16 +1616,17 @@ nautilus_file_poll_for_media (NautilusFile *file)
 gboolean
 nautilus_file_is_desktop_directory (NautilusFile *file)
 {
-    GFile *dir;
+    g_autoptr (GFile) location = NULL;
 
-    dir = file->details->directory->details->location;
+    g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-    if (dir == NULL)
+    location = nautilus_directory_get_location (file->details->directory);
+    if (location == NULL)
     {
         return FALSE;
     }
 
-    return nautilus_is_desktop_directory_file (dir, eel_ref_str_peek (file->details->name));
+    return nautilus_is_desktop_directory_file (location, eel_ref_str_peek (file->details->name));
 }
 
 /**
@@ -1640,16 +1641,15 @@ nautilus_file_is_desktop_directory (NautilusFile *file)
 gboolean
 nautilus_file_is_child_of_desktop_directory (NautilusFile *file)
 {
-    GFile *dir;
-
-    dir = file->details->directory->details->location;
+    g_autoptr (GFile) location = NULL;
 
-    if (dir == NULL)
+    location = nautilus_directory_get_location (file->details->directory);
+    if (location == NULL)
     {
         return FALSE;
     }
 
-    return nautilus_is_desktop_directory (dir);
+    return nautilus_is_desktop_directory (location);
 }
 
 static gboolean
@@ -1766,18 +1766,18 @@ nautilus_file_can_trash (NautilusFile *file)
 GFile *
 nautilus_file_get_location (NautilusFile *file)
 {
-    GFile *dir;
+    g_autoptr (GFile) location = NULL;
 
     g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
-    dir = file->details->directory->details->location;
+    location = nautilus_directory_get_location (file->details->directory);
 
     if (nautilus_file_is_self_owned (file))
     {
-        return g_object_ref (dir);
+        return g_object_ref (location);
     }
 
-    return g_file_get_child (dir, eel_ref_str_peek (file->details->name));
+    return g_file_get_child (location, eel_ref_str_peek (file->details->name));
 }
 
 /* Return the actual uri associated with the passed-in file. */
@@ -1799,20 +1799,22 @@ nautilus_file_get_uri (NautilusFile *file)
 char *
 nautilus_file_get_uri_scheme (NautilusFile *file)
 {
-    GFile *loc;
+    g_autoptr (GFile) location = NULL;
     char *scheme;
 
     g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
-    if (file->details->directory == NULL ||
-        file->details->directory->details->location == NULL)
+    if (file->details->directory == NULL)
     {
         return NULL;
     }
 
-    loc = nautilus_directory_get_location (file->details->directory);
-    scheme = g_file_get_uri_scheme (loc);
-    g_object_unref (loc);
+    location = nautilus_directory_get_location (file->details->directory);
+    if (location == NULL)
+    {
+        return NULL;
+    }
+    scheme = g_file_get_uri_scheme (location);
 
     return scheme;
 }
@@ -4112,15 +4114,17 @@ nautilus_file_should_show (NautilusFile *file,
 gboolean
 nautilus_file_is_home (NautilusFile *file)
 {
-    GFile *dir;
+    g_autoptr (GFile) location = NULL;
+
+    g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-    dir = file->details->directory->details->location;
-    if (dir == NULL)
+    location = nautilus_directory_get_location (file->details->directory);
+    if (location == NULL)
     {
         return FALSE;
     }
 
-    return nautilus_is_home_directory_file (dir,
+    return nautilus_is_home_directory_file (location,
                                             eel_ref_str_peek (file->details->name));
 }