Merge lp:~jeremywootten/pantheon-files/fix-1467568-do-not-offer-to-bookmark-certain-locations into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Do not offer to bookmark if already a place in sidebar

The view context menu no longer shows the "Bookmark" option when there is already a bookmark or shortcut to the same uri in the sidebar (including builtins, mounted devices and network locations).

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-05-13 21:06:02 +0000
+++ src/View/AbstractDirectoryView.vala	2016-05-15 10:13:37 +0000
@@ -1094,7 +1094,7 @@
             else
                 location = slot.directory.file.get_target_location ();
 
-            window.sidebar.add_uri (location.get_uri (), null);
+            window.bookmark_uri (location.get_uri (), null);
         }
 
         /** Background actions */
@@ -1906,8 +1906,8 @@
                 }
 
                 if (common_actions.get_action_enabled ("bookmark")) {
-                    /* Do  not offer to bookmark if the home folder is selected */
-                    if (!(file_location_is_builtin (selected_files.data))) {
+                    /* Do  not offer to bookmark if location is already bookmarked */
+                    if (window.can_bookmark_uri (selected_files.data.uri)) {
                         menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
                     }
                 }
@@ -1962,8 +1962,8 @@
             }
 
             if (common_actions.get_action_enabled ("bookmark")) {
-                /* Do not insert bookmark for home or filesystem root (already have builtins) */
-                if (!(file_location_is_builtin (slot.directory.file))) {
+                /* Do  not offer to bookmark if location is already bookmarked */
+                if (window.can_bookmark_uri (slot.directory.file.uri)) {
                     menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
                 }
             }
@@ -3444,11 +3444,6 @@
                     unselect_path (p);
             }
         }
-        /** Check whether gof_file represents the user home directory or the root filesystem **/
-        protected bool file_location_is_builtin (GOF.File gof_file) {
-            var path = gof_file.location.get_path ();
-            return (path == Environment.get_home_dir () || path == Path.DIR_SEPARATOR_S);
-        }
 
         public virtual void sync_selection () {}
         public virtual void highlight_path (Gtk.TreePath? path) {}

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2016-05-13 19:51:34 +0000
+++ src/View/Sidebar.vala	2016-05-15 10:13:37 +0000
@@ -421,6 +421,25 @@
             return iter;
         }
 
+        public bool has_place (string uri) {
+            bool found = false;
+
+            store.@foreach ((model, path, iter) => {
+                string u;
+                model.@get (iter, Column.URI, out u);
+                if (u == null) { /* Category entries etc have null uri, for example */
+                    return false;
+                } else if (u == uri) {
+                    found = true;
+                    return true;
+                } else {
+                    return false;
+                }
+            });
+
+            return found;
+        }
+
         private bool recent_is_supported () {
             string [] supported;
 
@@ -1057,7 +1076,7 @@
         }
 
         private  bool can_accept_file_as_bookmark (GLib.File file) {
-            return file.query_exists (null);
+            return file.query_exists (null) && window.can_bookmark_uri (file.get_uri ());
         }
 
         private bool can_accept_files_as_bookmarks (List<GLib.File> items) {

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-05-06 17:39:08 +0000
+++ src/View/Window.vala	2016-05-15 10:13:37 +0000
@@ -471,6 +471,14 @@
             tabs.current = tab;
         }
 
+        public void bookmark_uri (string uri, string? name = null) {
+            sidebar.add_uri (uri, name);
+        }
+
+        public bool can_bookmark_uri (string uri) {
+            return !sidebar.has_place (uri);
+        }
+
         public void remove_tab (ViewContainer view_container) {
             actual_remove_tab (tabs.get_tab_by_widget (view_container as Gtk.Widget));
         }