Merge lp:~unity-team/unity/unity.fix-weird-favourite-paths into lp:unity

[Gord Allott]

changes favourites loading so we don't care about the path, we just accept whatever the path is with no questions asked. fixes lp:645835

[Mikkel Kamstrup Erlandsen (kamstrup)]

When setting fav_id please just do:

  _fav_id = "app-" + Path.get_basename (filepath);

Otherwise looks good!

review: Approve

=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-09-19 15:26:13 +0000
+++ unity-private/launcher/application-controller.vala	2010-09-24 12:50:55 +0000
@@ -37,6 +37,20 @@
     private Dbusmenu.Client menu_client;
     private Dbusmenu.Menuitem cached_menu;
     private int menu_items_realized_counter;
+    private string _fav_id = "";
+    public string fav_id {
+      get
+        {
+          if (_fav_id == "" || _fav_id == null &&
+              desktop_file != "" && desktop_file != null)
+            {
+              var filepath = desktop_file.split ("/");
+              _fav_id = "app-" + filepath[filepath.length - 1];
+            }
+          return _fav_id;
+        }
+      set { _fav_id = value; }
+    }
 
     public bool is_favorite = false;
 
@@ -90,22 +104,15 @@
 
       var favorites = Unity.Favorites.get_default ();
 
-      string uid = favorites.find_uid_for_desktop_file (desktop_file);
-      if (uid == "" || uid == null)
-        {
-          var filepath = desktop_file.split ("/");
-          uid = "app-" + filepath[filepath.length - 1];
-        }
-
       if (is_sticky)
         {
-          favorites.set_string (uid, "type", "application");
-          favorites.set_string (uid, "desktop_file", desktop_file);
-          favorites.add_favorite (uid);
+          favorites.set_string (fav_id, "type", "application");
+          favorites.set_string (fav_id, "desktop_file", desktop_file);
+          favorites.add_favorite (fav_id);
         }
       else
         {
-          favorites.remove_favorite (uid);
+          favorites.remove_favorite (fav_id);
         }
     }
 
@@ -115,11 +122,7 @@
         return false;
 
       var favorites = Unity.Favorites.get_default ();
-      string uid = favorites.find_uid_for_desktop_file (desktop_file);
-      if (uid == null || uid == "")
-        return false;
-      else
-        return true;
+      return favorites.is_favorite (fav_id);
     }
 
     public void close_windows ()
@@ -136,9 +139,8 @@
       if (desktop_file == "" || desktop_file == null)
         return;
 
-      string uid = "app-" + Path.get_basename (desktop_file);
       var favorites = Unity.Favorites.get_default ();
-      favorites.set_float (uid, "priority", priority);
+      favorites.set_float (fav_id, "priority", priority);
     }
 
     public float get_priority () throws AppTypeError
@@ -146,17 +148,14 @@
       if (desktop_file == "" || desktop_file == null)
         throw new AppTypeError.NO_DESKTOP_FILE("There is no desktop file for this app, can't get priority");
 
-      string uid = "app-" + Path.get_basename (desktop_file);
       var favorites = Unity.Favorites.get_default ();
-      return favorites.get_float (uid, "priority");
+      return favorites.get_float (fav_id, "priority");
     }
 
     private void on_favorite_added (string uid)
     {
       //check to see if we are the favorite
-      var favorites = Unity.Favorites.get_default ();
-      var desktop_filename = favorites.get_string (uid, "desktop_file");
-      if (desktop_filename == desktop_file)
+      if (uid == fav_id)
         {
           is_favorite = true;
           child.pin_type = PinType.PINNED;
@@ -165,15 +164,13 @@
 
     private void on_favorite_removed (string uid)
     {
-      var favorites = Unity.Favorites.get_default ();
-      var desktop_filename = favorites.get_string (uid, "desktop_file");
-      if (desktop_filename == desktop_file)
+      if (uid == fav_id)
         {
           is_favorite = false;
           child.pin_type = PinType.UNPINNED;
           closed ();
-          if (".local" in desktop_filename)
-           FileUtils.remove (desktop_filename);
+          if (".local" in desktop_file)
+           FileUtils.remove (desktop_file);
         }
     }
 

=== modified file 'unity-private/launcher/scroller-controller.vala'
--- unity-private/launcher/scroller-controller.vala	2010-09-22 13:49:14 +0000
+++ unity-private/launcher/scroller-controller.vala	2010-09-24 12:50:55 +0000
@@ -218,10 +218,6 @@
 
       foreach (string uid in favorites.get_favorites ())
         {
-          var type = favorites.get_string (uid, "type");
-          if (type != "application")
-            continue;
-
           string desktop_file = favorites.get_string (uid, "desktop_file");
           if (!FileUtils.test (desktop_file, FileTest.EXISTS))
             {
@@ -240,6 +236,7 @@
               childcontrollers.add (controller);
               controller.request_removal.connect (on_scroller_controller_closed);
             }
+          controller.fav_id = uid;
         }
 
       // need to sort the list now