Merge lp:~jeremywootten/pantheon-files/fix-1467571-do-not-bookmark-home-directory into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Do not allow creation of personal bookmarks for user home and filesystem root as these have builtins.

This branch does not allow inserting a bookmark representing the user home directory or the root of the filesystem into the personal bookmark list, because there are already builtin bookmarks for these. The context menus also do not show the "bookmark" option for these directories.

=== modified file 'libcore/BookmarkList.vala'
--- libcore/BookmarkList.vala	2016-01-08 19:31:54 +0000
+++ libcore/BookmarkList.vala	2016-04-14 16:22:00 +0000
@@ -206,8 +206,14 @@
         }
 
         private void insert_item_internal (Marlin.Bookmark bm, uint index) {
-            if (this.contains (bm))
-                return;
+            if (this.contains (bm)) {
+                return;
+            }
+            /* Do not insert bookmark for home or filesystem root (already have builtins) */
+            var path = bm.gof_file.location.get_path ();
+            if ((path == Environment.get_home_dir () || path == Path.DIR_SEPARATOR_S)) {
+                return;
+            }
 
             list.insert (bm, (int)index);
             start_monitoring_bookmark (bm);

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-04-07 17:53:16 +0000
+++ src/View/AbstractDirectoryView.vala	2016-04-14 16:22:00 +0000
@@ -1885,9 +1885,12 @@
                     menu.append_section (null, builder.get_object ("rename") as GLib.MenuModel);
                 }
 
-                if (common_actions.get_action_enabled ("bookmark"))
-                    menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
-
+                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))) {
+                        menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
+                    }
+                }
                 menu.append_section (null, builder.get_object ("properties") as GLib.MenuModel);
             }
 
@@ -1935,8 +1938,12 @@
                 menu.append_section (null, builder.get_object ("sort-by") as GLib.MenuModel);
             }
 
-            if (common_actions.get_action_enabled ("bookmark"))
-                menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
+            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))) {
+                    menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
+                }
+            }
 
             menu.append_section (null, builder.get_object ("hidden") as GLib.MenuModel);
 
@@ -3379,6 +3386,11 @@
                     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) {}