Merge lp:~mhr3/unity-lens-files/fix-837810 into lp:unity-lens-files

[Michal Hruby]

Added desktop to favourites as requested by design

Added desktop to favourites as requested by design.

Updated the 'folders' manual test.

[Gord Allott (gordallott)]

Looks good, +1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/folder.vala'
--- src/folder.vala	2012-03-05 09:36:13 +0000
+++ src/folder.vala	2012-04-05 15:02:22 +0000
@@ -52,6 +52,11 @@
     {
       bookmarks = new List<Bookmark> ();
       string contents;
+      string desktop_uri;
+      bool has_desktop_in_favourites = false;
+
+      File desktop_file = File.new_for_path (Environment.get_user_special_dir (UserDirectory.DESKTOP));
+      desktop_uri = desktop_file.get_uri ();
       
       try {
         FileUtils.get_contents (bookmarks_file, out contents);
@@ -64,11 +69,12 @@
       string[] favorites = contents.split ("\n");
       string mimetype = "inode/directory";
       
-      
       foreach (var uri in favorites)
       {
         if (uri == "")
           continue;
+          
+        if (uri == desktop_uri) has_desktop_in_favourites = true;
               
         string[] parts = uri.split (" ", 2);
         string display_name;
@@ -93,6 +99,14 @@
         var bookmark = new Bookmark (uri, mimetype, display_name);
         bookmarks.append (bookmark);
       }
+      
+      /* Add desktop statically */
+      if (!has_desktop_in_favourites)
+      {
+        var desktop_display_name = Path.get_basename (desktop_file.get_parse_name ());
+        var desktop_bookmark = new Bookmark (desktop_uri, mimetype, desktop_display_name);
+        bookmarks.append (desktop_bookmark);
+      }
     }
 
     /* makes sure the uris exist on the filesystem (checks only native uris) */

=== modified file 'tests/manual/folders.txt'
--- tests/manual/folders.txt	2012-04-04 10:10:09 +0000
+++ tests/manual/folders.txt	2012-04-05 15:02:22 +0000
@@ -6,5 +6,5 @@
 #. Perform a generic search in the home view. (for example 'd')
 
 Outcome
-  You should see "Files and Folders" category with both folders starting with 'd', followed by files containing 'd' or residing in a folder with 'd' in name.
+  You should see "Files and Folders" category with both folders starting with 'd' (including "Desktop"), followed by files containing 'd' or residing in a folder with 'd' in name.