[nautilus/189-recent-can-be-bookmarked] bookmark-list: Tidy up can_bookmark_location



commit ef6068adf444ffe7ea8d92db0419f6688f1a6ec5
Author: António Fernandes <antoniof gnome org>
Date:   Thu Jan 4 17:20:12 2018 +0000

    bookmark-list: Tidy up can_bookmark_location
    
    Make it shorter, reorder as per sidebar, and add comments.
    
    No logical changes.

 src/nautilus-bookmark-list.c | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 1cae8f628..4585fc742 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -625,11 +625,7 @@ nautilus_bookmark_list_can_bookmark_location (NautilusBookmarkList *list,
 
     if (nautilus_bookmark_list_item_with_location (list, location, NULL))
     {
-        return FALSE;
-    }
-
-    if (nautilus_is_home_directory (location))
-    {
+        /* Already bookmarked */
         return FALSE;
     }
 
@@ -638,23 +634,13 @@ nautilus_bookmark_list_can_bookmark_location (NautilusBookmarkList *list,
         return FALSE;
     }
 
-    if (nautilus_is_other_locations_directory (location))
-    {
-        return FALSE;
-    }
-
-    if (nautilus_is_recent_directory (location))
-    {
-        return FALSE;
-    }
-
-    if (nautilus_is_trash_directory (location))
-    {
-        return FALSE;
-    }
-
-    if (nautilus_is_favorite_directory (location))
+    if (nautilus_is_recent_directory (location) ||
+        nautilus_is_favorite_directory (location) ||
+        nautilus_is_home_directory (location) ||
+        nautilus_is_trash_directory (location) ||
+        nautilus_is_other_locations_directory (location))
     {
+        /* Already in the sidebar */
         return FALSE;
     }
 


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