Merge lp:~3v1n0/unity/desktop-file-updated-support into lp:unity

[Marco Trevisan (Treviño)]

BamfApplicationManager: add support for desktop-file-updated signal and use in AppIcon

Now an ApplicationLauncherIcon can have its .desktop file updated and when this happens
it reloads the infos it needs and updates the FavoriteStore accordingly.

Added support to desktop-file-updated signal added to libbamf (this happens on
lp:~3v1n0/bamf/create-local-desktop), in case an icon changes its .desktop.
This needs to update the favorite store or to firstly save the icon there if
it was sticked but not saved.

Added unit tests, updated some of them and increased the libbamf requirements.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3478
http://jenkins.qa.ubuntu.com/job/unity-ci/290/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/178/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/290/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Merges and compiles cleanly and tests pass. Code looks code.

review: Approve

[Christopher Townsend (townsend)]

Err, I meant to say "code looks good" in my last comment. Need more coffee...

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-24 18:40:42 +0000
+++ CMakeLists.txt	2013-08-06 10:06:28 +0000
@@ -226,7 +226,7 @@
     gtk+-3.0>=3.1
     indicator3-0.4>=0.4.90
     json-glib-1.0
-    libbamf3>=0.4.0
+    libbamf3>=0.5.0
     libnotify
     libstartup-notification-1.0
     nux-4.0>=4.0.1

=== modified file 'debian/control'
--- debian/control	2013-07-21 14:53:37 +0000
+++ debian/control	2013-08-06 10:06:28 +0000
@@ -13,7 +13,7 @@
                gsettings-desktop-schemas-dev,
                intltool (>= 0.35.0),
                libatk1.0-dev,
-               libbamf3-dev (>= 0.5.0+13.10.20130626),
+               libbamf3-dev (>= 0.5.0+13.10.20130731),
                libboost-dev,
                libboost-serialization-dev,
                libcairo2-dev,

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2013-07-29 16:59:04 +0000
+++ launcher/AbstractLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -195,7 +195,7 @@
 
   virtual IconType GetIconType() const = 0;
 
-  virtual std::string RemoteUri() = 0;
+  virtual std::string RemoteUri() const = 0;
 
   virtual MenuItemsVector Menus() = 0;
 
@@ -212,7 +212,7 @@
   virtual void InsertEntryRemote(LauncherEntryRemote::Ptr const& remote) = 0;
   virtual void RemoveEntryRemote(LauncherEntryRemote::Ptr const& remote) = 0;
 
-  virtual std::string DesktopFile() = 0;
+  virtual std::string DesktopFile() const = 0;
 
   virtual bool IsSticky() const = 0;
 
@@ -247,6 +247,7 @@
   sigc::signal<void> visibility_changed;
   sigc::signal<void> position_saved;
   sigc::signal<void> position_forgot;
+  sigc::signal<void, std::string const&> uri_changed;
 
   connection::Wrapper on_icon_removed_connection;
 };

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-07-29 17:17:43 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-08-06 10:06:28 +0000
@@ -84,9 +84,6 @@
   SetQuirk(Quirk::VISIBLE, app->visible());
   SetQuirk(Quirk::ACTIVE, app->active());
   SetQuirk(Quirk::RUNNING, app->running());
-  // Make sure we set the LauncherIcon stick bit too...
-  if (app->sticky())
-    SimpleLauncherIcon::Stick(false); // don't emit the signal
 
   LOG_INFO(logger) << "Created ApplicationLauncherIcon: "
     << tooltip_text()
@@ -98,6 +95,10 @@
 
   SetApplication(app);
 
+  // Make sure we set the LauncherIcon stick bit too...
+  if (app->sticky())
+    SimpleLauncherIcon::Stick(false); // don't emit the signal
+
   WindowManager& wm = WindowManager::Default();
   wm.window_minimized.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::OnWindowMinimized));
   wm.window_moved.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::OnWindowMoved));
@@ -105,12 +106,6 @@
   wm.terminate_expo.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState));
 
   EnsureWindowState();
-  UpdateMenus();
-  UpdateDesktopFile();
-  UpdateBackgroundColor();
-
-  // hack
-  SetProgress(0.0f);
 }
 
 ApplicationLauncherIcon::~ApplicationLauncherIcon()
@@ -127,9 +122,16 @@
   if (app_ == app)
     return;
 
+  signals_conn_.Clear();
+
   app_ = app;
-  signals_conn_.Clear();
   SetupApplicationSignalsConnections();
+
+  // It's very likely that application desktop file has been changed, we need to
+  // inform the icon to make sure that it reloads the informations from it.
+  app_->desktop_file.changed.emit(app_->desktop_file());
+  app_->title.changed.emit(app_->title());
+  app_->icon.changed.emit(app_->icon());
 }
 
 void ApplicationLauncherIcon::SetupApplicationSignalsConnections()
@@ -138,7 +140,6 @@
   // is only ever removed when the application is closed.
   signals_conn_.Add(app_->window_opened.connect([this](ApplicationWindow const&) {
     EnsureWindowState();
-    UpdateMenus();
     UpdateIconGeometries(GetCenters());
   }));
 
@@ -155,6 +156,11 @@
     SetQuirk(Quirk::ACTIVE, active);
   }));
 
+  signals_conn_.Add(app_->desktop_file.changed.connect([this](std::string const& desktop_file) {
+    LOG_DEBUG(logger) << tooltip_text() << " desktop_file now " << desktop_file;
+    UpdateDesktopFile();
+  }));
+
   signals_conn_.Add(app_->title.changed.connect([this](std::string const& name) {
     LOG_DEBUG(logger) << tooltip_text() << " name now " << name;
     if (_menu_items.size() == MenuItemType::SIZE)
@@ -217,13 +223,7 @@
     // Sometimes BAMF is not fast enough to update the active application
     // while quickly switching between apps, so we double check that the
     // real active window is part of the selection (see bug #1111620)
-    Window active = WindowManager::Default().GetActiveWindow();
-
-    for (auto& window : app_->GetWindows())
-      if (window->window_id() == active)
-        return true;
-
-    return false;
+    return app_->OwnsWindow(WindowManager::Default().GetActiveWindow());
   }
 
   return SimpleLauncherIcon::GetQuirk(quirk);
@@ -301,7 +301,7 @@
       bool any_on_monitor = (arg.monitor < 0);
       int active_monitor = arg.monitor;
 
-      for (auto& window : app_->GetWindows())
+      for (auto const& window : app_->GetWindows())
       {
         Window xid = window->window_id();
 
@@ -504,17 +504,20 @@
 {
   std::string const& filename = app_->desktop_file();
 
-  if (!filename.empty() && _desktop_file != filename)
+  if (_desktop_file_monitor)
+    _gsignals.Disconnect(_desktop_file_monitor, "changed");
+
+  auto old_uri = RemoteUri();
+  UpdateRemoteUri();
+  UpdateDesktopQuickList();
+  UpdateBackgroundColor();
+
+  if (!filename.empty())
   {
-    _desktop_file = filename;
-
     // add a file watch to the desktop file so that if/when the app is removed
     // we can remove ourself from the launcher and when it's changed
     // we can update the quicklist.
-    if (_desktop_file_monitor)
-      _gsignals.Disconnect(_desktop_file_monitor, "changed");
-
-    glib::Object<GFile> desktop_file(g_file_new_for_path(_desktop_file.c_str()));
+    glib::Object<GFile> desktop_file(g_file_new_for_path(filename.c_str()));
     _desktop_file_monitor = g_file_monitor_file(desktop_file, G_FILE_MONITOR_NONE,
                                                 nullptr, nullptr);
     g_file_monitor_set_rate_limit(_desktop_file_monitor, 2000);
@@ -543,13 +546,27 @@
           break;
       }
     });
-  }
+
+    if (IsSticky())
+    {
+      position_forgot.emit();
+      position_saved.emit();
+    }
+  }
+  else if (IsSticky())
+  {
+    UnStick();
+  }
+
+  auto const& new_uri = RemoteUri();
+
+  if (old_uri != new_uri)
+    uri_changed.emit(new_uri);
 }
 
-std::string ApplicationLauncherIcon::DesktopFile()
+std::string ApplicationLauncherIcon::DesktopFile() const
 {
-  UpdateDesktopFile();
-  return _desktop_file;
+  return app_->desktop_file();
 }
 
 void ApplicationLauncherIcon::AddProperties(GVariantBuilder* builder)
@@ -687,17 +704,19 @@
 {
   std::string const& desktop_file = DesktopFile();
 
-  if (desktop_file.empty())
-    return;
-
   if (_menu_desktop_shortcuts)
   {
     for (GList *l = dbusmenu_menuitem_get_children(_menu_desktop_shortcuts); l; l = l->next)
     {
       _gsignals.Disconnect(l->data, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED);
     }
+
+    _menu_desktop_shortcuts = nullptr;
   }
 
+  if (desktop_file.empty())
+    return;
+
   _menu_desktop_shortcuts = dbusmenu_menuitem_new();
   dbusmenu_menuitem_set_root(_menu_desktop_shortcuts, TRUE);
 
@@ -709,8 +728,8 @@
   // any or they're filtered for the environment we're in
   const gchar** nicks = indicator_desktop_shortcuts_get_nicks(_desktop_shortcuts);
 
-  int index = 0;
-  while (nicks[index])
+  
+  for (int index = 0; nicks[index]; ++index)
   {
     // Build a dbusmenu item for each nick that is the desktop
     // file that is built from it's name and includes a callback
@@ -721,7 +740,7 @@
     dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
     dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
     dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-    std::string nick(nicks[index]);
+    auto nick = glib::gchar_to_string(nicks[index]);
 
     _gsignals.Add<void, DbusmenuMenuitem*, gint>(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
     [this, nick] (DbusmenuMenuitem* item, unsigned timestamp) {
@@ -733,7 +752,6 @@
     });
 
     dbusmenu_menuitem_child_append(_menu_desktop_shortcuts, item);
-    index++;
   }
 }
 
@@ -751,7 +769,9 @@
 
   if (last_use_custom_bg_color != use_custom_bg_color_ ||
       last_bg_color != bg_color_)
+  {
     EmitNeedsRedraw();
+  }
 }
 
 void ApplicationLauncherIcon::EnsureMenuItemsWindowsReady()
@@ -764,17 +784,19 @@
   // We only add quicklist menu-items for windows if we have more than one window
   if (windows.size() < 2)
     return;
-   
+
   Window active = WindowManager::Default().GetActiveWindow();
 
   // add menu items for all open windows
   for (auto const& w : windows)
   {
-    if (w->title().empty())
+    auto const& title = w->title();
+
+    if (title.empty())
       continue;
 
     glib::Object<DbusmenuMenuitem> menu_item(dbusmenu_menuitem_new());
-    dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_LABEL, w->title().c_str());
+    dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_LABEL, title.c_str());
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
     dbusmenu_menuitem_property_set_bool(menu_item, QuicklistMenuItem::MARKUP_ACCEL_DISABLED_PROPERTY, true);
@@ -787,7 +809,7 @@
         wm.Activate(xid);
         wm.Raise(xid);
     });
-    
+
     if (xid == active)
     {
       dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_RADIO);
@@ -798,7 +820,7 @@
   }
 }
 
-void ApplicationLauncherIcon::UpdateMenus()
+void ApplicationLauncherIcon::EnsureMenuItemsStaticQuicklist()
 {
   // make a client for desktop file actions
   if (!_menu_desktop_shortcuts.IsType(DBUSMENU_TYPE_MENUITEM))
@@ -901,7 +923,7 @@
   bool separator_needed = false;
 
   EnsureMenuItemsDefaultReady();
-  UpdateMenus();
+  EnsureMenuItemsStaticQuicklist();
 
   for (auto const& menus : {GetRemoteMenus(), _menu_desktop_shortcuts})
   {
@@ -1041,21 +1063,20 @@
 
 void ApplicationLauncherIcon::UpdateRemoteUri()
 {
-    std::string const& desktop_id = GetDesktopID();
+  std::string const& desktop_id = GetDesktopID();
 
-    if (!desktop_id.empty())
-    {
-      _remote_uri = FavoriteStore::URI_PREFIX_APP + desktop_id;
-    }
+  if (!desktop_id.empty())
+  {
+    _remote_uri = FavoriteStore::URI_PREFIX_APP + desktop_id;
+  }
+  else
+  {
+    _remote_uri.clear();
+  }
 }
 
-std::string ApplicationLauncherIcon::GetRemoteUri()
+std::string ApplicationLauncherIcon::GetRemoteUri() const
 {
-  if (_remote_uri.empty())
-  {
-     UpdateRemoteUri();
-  }
-
   return _remote_uri;
 }
 

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-07-03 23:45:17 +0000
+++ launcher/ApplicationLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -45,7 +45,7 @@
 
   virtual void ActivateLauncherIcon(ActionArg arg);
 
-  std::string DesktopFile();
+  std::string DesktopFile() const;
 
   bool IsSticky() const;
   bool IsActive() const;
@@ -92,7 +92,7 @@
   MenuItemsVector GetMenus();
   std::set<std::string> ValidateUrisForLaunch(DndData const& dnd_data);
 
-  std::string GetRemoteUri();
+  std::string GetRemoteUri() const;
 
   bool HandlesSpread() { return true; }
   std::string GetName() const;
@@ -115,8 +115,8 @@
   void EnsureWindowState();
   void EnsureMenuItemsWindowsReady();
   void EnsureMenuItemsDefaultReady();
+  void EnsureMenuItemsStaticQuicklist();
   void UpdateBackgroundColor();
-  void UpdateMenus();
   void UpdateDesktopQuickList();
 
   void OpenInstanceWithUris(std::set<std::string> const& uris, Time timestamp);

=== modified file 'launcher/DesktopLauncherIcon.cpp'
--- launcher/DesktopLauncherIcon.cpp	2012-10-18 11:45:32 +0000
+++ launcher/DesktopLauncherIcon.cpp	2013-08-06 10:06:28 +0000
@@ -51,7 +51,7 @@
   return "DesktopLauncherIcon";
 }
 
-std::string DesktopLauncherIcon::GetRemoteUri()
+std::string DesktopLauncherIcon::GetRemoteUri() const
 {
   return FavoriteStore::URI_PREFIX_UNITY + "desktop-icon";
 }

=== modified file 'launcher/DesktopLauncherIcon.h'
--- launcher/DesktopLauncherIcon.h	2012-08-17 10:54:33 +0000
+++ launcher/DesktopLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -38,7 +38,7 @@
 protected:
   void ActivateLauncherIcon(ActionArg arg);
   std::string GetName() const;
-  std::string GetRemoteUri();
+  std::string GetRemoteUri() const;
 
 private:
   bool show_in_switcher_;

=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp	2013-07-01 21:20:51 +0000
+++ launcher/ExpoLauncherIcon.cpp	2013-08-06 10:06:28 +0000
@@ -106,7 +106,7 @@
   return "ExpoLauncherIcon";
 }
 
-std::string ExpoLauncherIcon::GetRemoteUri()
+std::string ExpoLauncherIcon::GetRemoteUri() const
 {
   return FavoriteStore::URI_PREFIX_UNITY + "expo-icon";
 }

=== modified file 'launcher/ExpoLauncherIcon.h'
--- launcher/ExpoLauncherIcon.h	2013-07-01 21:20:51 +0000
+++ launcher/ExpoLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -37,7 +37,7 @@
 protected:
   void ActivateLauncherIcon(ActionArg arg);
   std::string GetName() const;
-  std::string GetRemoteUri();
+  std::string GetRemoteUri() const;
 
 private:
   void OnViewportLayoutChanged(int hsize, int vsize);

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-07-01 21:20:51 +0000
+++ launcher/LauncherController.cpp	2013-08-06 10:06:28 +0000
@@ -533,7 +533,7 @@
     }
     else
     {
-      result->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true); 
+      result->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true);
     }
   }
 }
@@ -760,8 +760,13 @@
     ResetIconPriorities();
   });
 
-  icon->position_forgot.connect([this, icon_uri] {
-    FavoriteStore::Instance().RemoveFavorite(icon_uri);
+  auto uri_ptr = std::make_shared<std::string>(icon_uri);
+  icon->position_forgot.connect([this, uri_ptr] {
+    FavoriteStore::Instance().RemoveFavorite(*uri_ptr);
+  });
+
+  icon->uri_changed.connect([this, uri_ptr] (std::string const& new_uri) {
+    *uri_ptr = new_uri;
   });
 
   if (icon->GetIconType() == AbstractLauncherIcon::IconType::APPLICATION)

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-07-29 17:17:43 +0000
+++ launcher/LauncherIcon.cpp	2013-08-06 10:06:28 +0000
@@ -77,7 +77,7 @@
   , _sticky(false)
   , _remote_urgent(false)
   , _present_urgency(0)
-  , _progress(0)
+  , _progress(0.0f)
   , _sort_priority(DefaultPriority(type))
   , _last_monitor(0)
   , _background_color(nux::color::White)

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2013-07-29 16:58:49 +0000
+++ launcher/LauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -139,7 +139,7 @@
 
   virtual nux::Color GlowColor();
 
-  std::string RemoteUri()
+  std::string RemoteUri() const
   {
     return GetRemoteUri();
   }
@@ -180,7 +180,7 @@
     OnDndLeave();
   }
 
-  virtual std::string DesktopFile() { return std::string(""); }
+  virtual std::string DesktopFile() const { return std::string(); }
 
   virtual bool IsSticky() const { return _sticky; }
 
@@ -231,7 +231,7 @@
 
   virtual void OnCenterStabilized(std::vector<nux::Point3> center) {}
 
-  virtual std::string GetRemoteUri()
+  virtual std::string GetRemoteUri() const
   {
     return "";
   }

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2013-06-26 17:24:06 +0000
+++ launcher/MockLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -265,7 +265,7 @@
     return nux::Color(0xFFAAAAAA);
   }
 
-  std::string RemoteUri()
+  std::string RemoteUri() const
   {
     return remote_uri_;
   }
@@ -309,7 +309,7 @@
 
   void SendDndLeave() {}
 
-  std::string DesktopFile() { return std::string(""); }
+  std::string DesktopFile() const { return std::string(""); }
 
   bool IsSticky() const { return false; }
 

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2013-07-23 15:23:34 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2013-08-06 10:06:28 +0000
@@ -39,8 +39,8 @@
 
 namespace
 {
-#define SOURCE_SHOW_TOOLTIP "ShowTooltip"
-#define SOURCE_HIDE_TOOLTIP "HideTooltip"
+const std::string SOURCE_SHOW_TOOLTIP = "ShowTooltip";
+const std::string SOURCE_HIDE_TOOLTIP = "HideTooltip";
 const int INSTALL_TIP_DURATION = 1500;
 }
 
@@ -58,7 +58,6 @@
   , finished_(true)
   , needs_urgent_(false)
   , aptdaemon_trans_id_(aptdaemon_trans_id)
-  , app_title_(app->title())
 {
   SetQuirk(Quirk::VISIBLE, false);
   aptdaemon_trans_.Connect("PropertyChanged", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnPropertyChanged));
@@ -79,10 +78,10 @@
 
   // FIXME: this needs testing, if there is no useful coordinates 
   //        then do not animate
-  if(start_x <= 0 && start_y <= 0)
+  if (start_x <= 0 && start_y <= 0)
   {
-     SetQuirk(Quirk::VISIBLE, true);
-     return;
+    SetQuirk(Quirk::VISIBLE, true);
+    return;
   }
 
   icon_texture_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(
@@ -138,103 +137,102 @@
 
 std::string SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall()
 {
-   // Fixup the _desktop_file because the one we get from software-center
-   // is not the final one, e.g. the s-c-agent does send a temp one and
-   // app-install-data points to the "wrong" one in /usr/share/app-install
-   //
-   // So:
-   // - if there is a desktop file already and it startswith 
-   //   /usr/share/app-install/desktop, then transform to 
-   //   /usr/share/application
-   // - if there is a desktop file with prefix /tmp/software-center-agent:
-   //   transform to /usr/share/application
-   //   (its using "/tmp/software-center-agent:$random:$pkgname.desktop")
-   // maybe:
-   // - and search in /var/lib/apt/lists/$pkgname.list
-   //   for a desktop file that roughly matches what we want
-   std::string filename = _desktop_file;
-
-   // take /usr/share/app-install/desktop/foo:subdir__bar.desktop
-   // and tranform it
-   if (_desktop_file.find("/share/app-install/desktop/") != std::string::npos)
-   {
-      filename = filename.substr(filename.rfind(":") + 1, 
-                                 filename.length() - filename.rfind(":"));
-      // the app-install-data package encodes subdirs in a funny way, once
-      // that is fixed, this code can be dropped
-      if (filename.find("__") != std::string::npos)
-      {
-         int pos = filename.find("__");
-         filename = filename.replace(pos, 2, "-");
-      }
-      filename = DesktopUtilities::GetDesktopPathById(filename);
-      return filename;
-   } 
-   else if (_desktop_file.find("/tmp/software-center-agent:") == 0)
-   {
-      // by convention the software-center-agent uses 
-      //   /usr/share/applications/$pkgname.desktop
-      // or
-      //   /usr/share/applications/extras-$pkgname.desktop
-      std::string desktopf = filename.substr(filename.rfind(":") + 1, 
-                                             filename.length() - filename.rfind(":"));
-      filename = DesktopUtilities::GetDesktopPathById(desktopf);
-      if (filename.size() > 0)
-         return filename;
-      // now try extras-$pkgname.desktop
-      filename = DesktopUtilities::GetDesktopPathById(std::string("extras-") + desktopf);
-      if (filename.size() > 0)
-         return filename;
-
-      // FIXME: test if there is a file now and if not, search
-      //        /var/lib/dpkg/info/$pkgname.list for a desktop file
-   }
-
-   return _desktop_file;
+  // Fixup the _desktop_file because the one we get from software-center
+  // is not the final one, e.g. the s-c-agent does send a temp one and
+  // app-install-data points to the "wrong" one in /usr/share/app-install
+  //
+  // So:
+  // - if there is a desktop file already and it startswith 
+  //   /usr/share/app-install/desktop, then transform to 
+  //   /usr/share/application
+  // - if there is a desktop file with prefix /tmp/software-center-agent:
+  //   transform to /usr/share/application
+  //   (its using "/tmp/software-center-agent:$random:$pkgname.desktop")
+  // maybe:
+  // - and search in /var/lib/apt/lists/$pkgname.list
+  //   for a desktop file that roughly matches what we want
+  auto const& desktop_file = DesktopFile();
+
+  // take /usr/share/app-install/desktop/foo:subdir__bar.desktop
+  // and tranform it
+  if (desktop_file.find("/share/app-install/desktop/") != std::string::npos)
+  {
+    auto colon_pos = desktop_file.rfind(":");
+    auto filename = desktop_file.substr(colon_pos + 1, desktop_file.length() - colon_pos);
+    // the app-install-data package encodes subdirs in a funny way, once
+    // that is fixed, this code can be dropped
+    if (filename.find("__") != std::string::npos)
+    {
+       int pos = filename.find("__");
+       filename = filename.replace(pos, 2, "-");
+    }
+    filename = DesktopUtilities::GetDesktopPathById(filename);
+    return filename;
+  } 
+  else if (desktop_file.find("/tmp/software-center-agent:") == 0)
+  {
+    // by convention the software-center-agent uses 
+    //   /usr/share/applications/$pkgname.desktop
+    // or
+    //   /usr/share/applications/extras-$pkgname.desktop
+    auto colon_pos = desktop_file.rfind(":");
+    auto desktopf = desktop_file.substr(colon_pos + 1, desktop_file.length() - colon_pos);
+
+    auto filename = DesktopUtilities::GetDesktopPathById(desktopf);
+
+    if (!filename.empty())
+      return filename;
+
+    // now try extras-$pkgname.desktop
+    filename = DesktopUtilities::GetDesktopPathById("extras-" + desktopf);
+    if (!filename.empty())
+      return filename;
+
+    // FIXME: test if there is a file now and if not, search
+    //        /var/lib/dpkg/info/$pkgname.list for a desktop file
+  }
+
+  return desktop_file;
 }
 
 void SoftwareCenterLauncherIcon::OnFinished(GVariant *params)
 {
-   glib::String exit_state;
-   g_variant_get_child(params, 0, "s", &exit_state);
-
-   if (exit_state.Str() == "exit-success")
-   {
-      tooltip_text = app_title_;
-      SetQuirk(Quirk::PROGRESS, false);
-      SetQuirk(Quirk::URGENT, true);
-      SetProgress(0.0f);
-      finished_ = true;
-      needs_urgent_ = true;
-
-      // find and update to  the real desktop file
-      std::string new_desktop_path = GetActualDesktopFileAfterInstall();
-
-      // exchange the temp Application with the real one
-      SetApplication(ApplicationManager::Default().GetApplicationForDesktopFile(new_desktop_path));
-
-      UpdateDesktopFile();
-      UpdateRemoteUri();
-
-      Stick();
-      position_saved.emit();
-
-      _source_manager.AddIdle([this]()
-      {
-        ShowTooltip();
-        _source_manager.AddTimeout(INSTALL_TIP_DURATION, [this]()
-        {
-          HideTooltip();
-          return false;
-        }, SOURCE_HIDE_TOOLTIP);
+  glib::String exit_state;
+  g_variant_get_child(params, 0, "s", &exit_state);
+
+  if (exit_state.Str() == "exit-success")
+  {
+    SetQuirk(Quirk::PROGRESS, false);
+    SetQuirk(Quirk::URGENT, true);
+    SetProgress(0.0f);
+    finished_ = true;
+    needs_urgent_ = true;
+
+    // find and update to the real desktop file
+    std::string const& new_desktop_path = GetActualDesktopFileAfterInstall();
+
+    // exchange the temp Application with the real one
+    auto& app_manager = ApplicationManager::Default();
+    auto const& new_app = app_manager.GetApplicationForDesktopFile(new_desktop_path);
+    new_app->sticky = IsSticky();
+    SetApplication(new_app);
+    Stick();
+    position_saved.emit();
+
+    _source_manager.AddIdle([this] {
+      ShowTooltip();
+      _source_manager.AddTimeout(INSTALL_TIP_DURATION, [this] {
+        HideTooltip();
         return false;
-      }, SOURCE_SHOW_TOOLTIP);
-   }
-   else
-   {
-      // failure condition, remove icon again
-      UnStick();
-   }
+      }, SOURCE_HIDE_TOOLTIP);
+      return false;
+    }, SOURCE_SHOW_TOOLTIP);
+  }
+  else
+  {
+    // failure condition, remove icon again
+    UnStick();
+  }
 };
 
 void SoftwareCenterLauncherIcon::OnPropertyChanged(GVariant* params)

=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2013-07-17 18:35:09 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -63,7 +63,6 @@
   bool finished_;
   bool needs_urgent_;
   std::string aptdaemon_trans_id_;
-  std::string app_title_;
 };
 
 }

=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2013-07-01 17:07:00 +0000
+++ launcher/VolumeLauncherIcon.cpp	2013-08-06 10:06:28 +0000
@@ -264,7 +264,7 @@
     menu.push_back(menu_item);
   }
 
-  std::string GetRemoteUri()
+  std::string GetRemoteUri() const
   {
     auto const& identifier = volume_->GetIdentifier();
 
@@ -334,7 +334,7 @@
   return pimpl_->GetMenus();
 }
 
-std::string VolumeLauncherIcon::GetRemoteUri()
+std::string VolumeLauncherIcon::GetRemoteUri() const
 {
   return pimpl_->GetRemoteUri();
 }

=== modified file 'launcher/VolumeLauncherIcon.h'
--- launcher/VolumeLauncherIcon.h	2012-11-27 01:09:26 +0000
+++ launcher/VolumeLauncherIcon.h	2013-08-06 10:06:28 +0000
@@ -48,7 +48,7 @@
   void Stick(bool save = true);
   void UnStick();
   MenuItemsVector GetMenus();
-  std::string GetRemoteUri();
+  std::string GetRemoteUri() const;
 
 protected:
   virtual void ActivateLauncherIcon(ActionArg arg);

=== modified file 'tests/data/applications/update-manager.desktop'
--- tests/data/applications/update-manager.desktop	2013-03-25 18:22:32 +0000
+++ tests/data/applications/update-manager.desktop	2013-08-06 10:06:28 +0000
@@ -8,3 +8,9 @@
 Type=Application
 Categories=System;Settings;
 X-Ubuntu-Gettext-Domain=update-manager
+Actions=UpdateAction;
+
+[Desktop Action UpdateAction]
+Name=Update Action
+Exec=/bin/true
+OnlyShowIn=Unity
\ No newline at end of file

=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2013-06-28 09:41:06 +0000
+++ tests/mock-application.h	2013-08-06 10:06:28 +0000
@@ -22,6 +22,8 @@
 
 #include <map>
 #include <gmock/gmock.h>
+#include <gio/gdesktopappinfo.h>
+#include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/ApplicationManager.h"
 #include "unity-shared/WindowManager.h"
@@ -32,6 +34,7 @@
 {
 struct MockApplicationWindow : unity::ApplicationWindow
 {
+  typedef std::shared_ptr<MockApplicationWindow> Ptr;
   typedef NiceMock<MockApplicationWindow> Nice;
 
   MockApplicationWindow(Window xid)
@@ -102,16 +105,17 @@
 
 struct MockApplication : unity::Application
 {
+  typedef std::shared_ptr<MockApplication> Ptr;
   typedef NiceMock<MockApplication> Nice;
 
   MockApplication()
     : MockApplication("")
   {}
 
-  MockApplication(std::string const& desktop_file,
+  MockApplication(std::string const& desktop_file_path,
                   std::string const& icon_name = "",
                   std::string const& title_str = "")
-    : desktop_file_(desktop_file)
+    : desktop_file_(desktop_file_path)
     , icon_(icon_name)
     , title_(title_str)
     , seen_(false)
@@ -131,10 +135,10 @@
       active.SetGetterFunction([this] { return active_; });
       running.SetGetterFunction([this] { return running_; });
       urgent.SetGetterFunction([this] { return urgent_; });
+      desktop_file.SetGetterFunction([this] { return desktop_file_; });
       title.SetGetterFunction([this] { return title_; });
       icon.SetGetterFunction([this] { return icon_; });
 
-      ON_CALL(*this, desktop_file()).WillByDefault(Invoke([this] { return desktop_file_; }));
       ON_CALL(*this, type()).WillByDefault(Invoke([this] { return type_; }));
       ON_CALL(*this, repr()).WillByDefault(Invoke([this] { return "MockApplication"; }));
       ON_CALL(*this, GetWindows()).WillByDefault(Invoke([this] { return windows_; }));
@@ -153,7 +157,6 @@
   unity::WindowList windows_;
   std::string type_;
 
-  MOCK_CONST_METHOD0(desktop_file, std::string());
   MOCK_CONST_METHOD0(type, std::string());
   MOCK_CONST_METHOD0(repr, std::string());
   MOCK_CONST_METHOD0(GetWindows, unity::WindowList());
@@ -173,7 +176,7 @@
   void SetRunState(bool state) {
     running_ = state;
     running.changed.emit(state);
-    }
+  }
 
   bool SetSeen(bool const& param) {
     if (param != seen_) {
@@ -249,7 +252,17 @@
     AppMap::iterator iter = app_map_.find(desktop_file);
     if (iter == app_map_.end())
     {
-      auto app = std::make_shared<NiceMock<MockApplication>>(desktop_file);
+      std::string title;
+      std::string icon;
+      std::shared_ptr<GKeyFile> key_file(g_key_file_new(), g_key_file_free);
+
+      if (g_key_file_load_from_file(key_file.get(), desktop_file.c_str(), G_KEY_FILE_NONE, nullptr))
+      {
+        title = unity::glib::String(g_key_file_get_string(key_file.get(), G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NAME, nullptr)).Str();
+        icon = unity::glib::String(g_key_file_get_string(key_file.get(), G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, nullptr)).Str();
+      }
+
+      auto app = std::make_shared<MockApplication::Nice>(desktop_file, icon, title);
       app_map_.insert(AppMap::value_type(desktop_file, app));
       return app;
     }

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-06-28 13:58:07 +0000
+++ tests/test_application_launcher_icon.cpp	2013-08-06 10:06:28 +0000
@@ -40,6 +40,7 @@
 {
 const std::string DEFAULT_EMPTY_ICON = "application-default-icon";
 const std::string USC_DESKTOP = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
+const std::string UM_DESKTOP = BUILDDIR"/tests/data/applications/update-manager.desktop";
 const std::string NO_ICON_DESKTOP = BUILDDIR"/tests/data/applications/no-icon.desktop";
 
 struct MockApplicationLauncherIcon : ApplicationLauncherIcon
@@ -61,6 +62,8 @@
   MOCK_METHOD0(UnStick, void());
   MOCK_CONST_METHOD0(GetRemoteMenus, glib::Object<DbusmenuMenuitem>());
 
+  bool LauncherIconIsSticky() const { return LauncherIcon::IsSticky(); }
+
   using ApplicationLauncherIcon::IsFileManager;
 };
 
@@ -209,6 +212,15 @@
   EXPECT_TRUE(saved);
 }
 
+TEST_F(TestApplicationLauncherIcon, StickStickedApplication)
+{
+  auto app = std::make_shared<MockApplication::Nice>(USC_DESKTOP);
+  app->sticky = true;
+  MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
+  ASSERT_TRUE(icon->IsSticky());
+  EXPECT_TRUE(icon->LauncherIconIsSticky());
+}
+
 TEST_F(TestApplicationLauncherIcon, UnstickNotRunning)
 {
   bool forgot = false;
@@ -237,6 +249,95 @@
   EXPECT_TRUE(forgot);
 }
 
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopFile)
+{
+  usc_app->desktop_file_ = UM_DESKTOP;
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_EQ(UM_DESKTOP, usc_icon->DesktopFile());
+}
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopFileRemoteUri)
+{
+  usc_app->desktop_file_ = UM_DESKTOP;
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_EQ(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(UM_DESKTOP), usc_icon->RemoteUri());
+}
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopStaticQuicklistEmpty)
+{
+  usc_app->desktop_file_ = NO_ICON_DESKTOP;
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_FALSE(HasMenuItemWithLabel(usc_icon, "Test Action"));
+}
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopStaticQuicklist)
+{
+  usc_app->desktop_file_ = UM_DESKTOP;
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_FALSE(HasMenuItemWithLabel(usc_icon, "Test Action"));
+  EXPECT_TRUE(HasMenuItemWithLabel(usc_icon, "Update Action"));
+}
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopReSavesIconPosition)
+{
+  mock_icon->Stick(true);
+
+  bool saved = false;
+  mock_icon->position_saved.connect([&saved] {saved = true;});
+  mock_app->desktop_file_ = UM_DESKTOP;
+  mock_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_TRUE(mock_app->sticky());
+  EXPECT_TRUE(mock_icon->IsSticky());
+  EXPECT_TRUE(saved);
+}
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopEmptyForgetsIconPosition)
+{
+  usc_icon->Stick(true);
+
+  bool forgot = false;
+  usc_icon->position_forgot.connect([&forgot] {forgot = true;});
+  usc_app->desktop_file_ = "";
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_FALSE(mock_app->sticky());
+  EXPECT_FALSE(mock_icon->IsSticky());
+  EXPECT_TRUE(forgot);
+}
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopUpdatesIconUri)
+{
+  bool updated = false;
+  usc_icon->uri_changed.connect([this, &updated] (std::string const& new_uri) {
+    updated = true;
+    EXPECT_EQ(usc_icon->RemoteUri(), new_uri);
+  });
+
+  usc_app->desktop_file_ = "";
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+  EXPECT_TRUE(updated);
+
+  updated = false;
+  usc_app->desktop_file_ = UM_DESKTOP;
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+  EXPECT_TRUE(updated);
+}
+
+
+TEST_F(TestApplicationLauncherIcon, UpdateDesktopDoesntUpdatesIconUri)
+{
+  bool updated = false;
+  usc_icon->uri_changed.connect([&updated] (std::string const& new_uri) { updated = true; });
+  usc_app->desktop_file.changed.emit(usc_app->desktop_file_);
+
+  EXPECT_FALSE(updated);
+}
+
 TEST_F(TestApplicationLauncherIcon, RemoteUri)
 {
   EXPECT_EQ(usc_icon->RemoteUri(), FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(USC_DESKTOP));

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2013-07-29 17:17:43 +0000
+++ tests/test_launcher_controller.cpp	2013-08-06 10:06:28 +0000
@@ -133,49 +133,43 @@
   FavoriteList fav_list_;
 };
 
-struct MockApplicationLauncherIcon : public ApplicationLauncherIcon
+struct MockApplicationLauncherIcon : ApplicationLauncherIcon
 {
-  typedef nux::ObjectPtr<MockApplicationLauncherIcon> Ptr;
+  typedef NiceMock<MockApplicationLauncherIcon> Nice;
+  typedef nux::ObjectPtr<MockApplicationLauncherIcon::Nice> Ptr;
   typedef bool Fake;
 
   MockApplicationLauncherIcon(Fake = true, std::string const& remote_uri = "")
-    : ApplicationLauncherIcon(std::make_shared<MockApplication::Nice>())
-    , remote_uri_(remote_uri)
+    : MockApplicationLauncherIcon(std::make_shared<MockApplication::Nice>())
   {
-    InitMock();
     SetQuirk(Quirk::VISIBLE, true);
+
+    if (!remote_uri.empty())
+    {
+      ON_CALL(*this, GetRemoteUri()).WillByDefault(Invoke([this, remote_uri] {
+        return FavoriteStore::URI_PREFIX_APP + remote_uri;
+      }));
+    }
   }
 
   explicit MockApplicationLauncherIcon(ApplicationPtr const& app)
     : ApplicationLauncherIcon(app)
   {
-    InitMock();
+    ON_CALL(*this, Stick(_)).WillByDefault(Invoke([this] (bool save) { ApplicationLauncherIcon::Stick(save); }));
+    ON_CALL(*this, UnStick()).WillByDefault(Invoke([this] { ApplicationLauncherIcon::UnStick(); }));
+    ON_CALL(*this, GetRemoteUri()).WillByDefault(Invoke([this] { return ReallyGetRemoteUri(); }));
   }
 
   MockApplicationLauncherIcon(std::string const& desktop_file)
-    : ApplicationLauncherIcon(std::make_shared<MockApplication::Nice>(desktop_file))
-  {
-    InitMock();
-  }
-
-  void InitMock()
-  {
-    ON_CALL(*this, Stick(_)).WillByDefault(Invoke([this] (bool save) { ApplicationLauncherIcon::Stick(save); }));
-  }
-
-  std::string GetRemoteUri()
-  {
-    if (remote_uri_.empty())
-      return ApplicationLauncherIcon::GetRemoteUri();
-    else
-      return FavoriteStore::URI_PREFIX_APP + remote_uri_;
-  }
-
+    : MockApplicationLauncherIcon(std::make_shared<MockApplication::Nice>(desktop_file))
+  {}
+
+  std::string ReallyGetRemoteUri() const { return ApplicationLauncherIcon::GetRemoteUri(); }
+
+  MOCK_CONST_METHOD0(GetRemoteUri, std::string());
   MOCK_METHOD1(Stick, void(bool));
   MOCK_METHOD0(UnStick, void());
   MOCK_METHOD0(Quit, void());
-
-  std::string remote_uri_;
 };
 
 struct MockVolumeLauncherIcon : public VolumeLauncherIcon
@@ -482,7 +476,7 @@
 TEST_F(TestLauncherController, OnlyUnstickIconOnFavoriteRemoval)
 {
   const std::string desktop = app::BZR_HANDLE_PATCH;
-  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon(desktop));
+  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon::Nice(desktop));
   lc.Impl()->model_->AddIcon(bamf_icon);
 
   EXPECT_CALL(*bamf_icon, UnStick());
@@ -720,7 +714,7 @@
 
 TEST_F(TestLauncherController, RegisteredIconSavesPosition)
 {
-  MockApplicationLauncherIcon::Ptr app_icon(new NiceMock<MockApplicationLauncherIcon>(true, "normal-icon.desktop"));
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(true, "normal-icon.desktop"));
   lc.Impl()->RegisterIcon(app_icon);
   ASSERT_FALSE(favorite_store.IsFavorite(app_icon->RemoteUri()));
 
@@ -729,6 +723,23 @@
   EXPECT_TRUE(favorite_store.IsFavorite(app_icon->RemoteUri()));
 }
 
+TEST_F(TestLauncherController, RegisteredIconWithNoDesktopSavesPositionOnDesktopUpdated)
+{
+  auto app = std::make_shared<MockApplication::Nice>();
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(app));
+  lc.Impl()->RegisterIcon(app_icon);
+  app_icon->Stick(true);
+
+  ASSERT_TRUE(app_icon->RemoteUri().empty());
+  ASSERT_FALSE(favorite_store.IsFavorite(app_icon->RemoteUri()));
+
+  app->desktop_file_ = "brand-new-desktop-file.desktop";
+  app->desktop_file.changed.emit(app->desktop_file_);
+
+  EXPECT_FALSE(app_icon->RemoteUri().empty());
+  EXPECT_TRUE(favorite_store.IsFavorite(app_icon->RemoteUri()));
+}
+
 TEST_F(TestLauncherController, RegisteredIconForgetsPosition)
 {
   auto const& fav = lc.Impl()->GetIconByUri(favorite_store.GetFavorites().front());
@@ -738,6 +749,41 @@
   EXPECT_FALSE(favorite_store.IsFavorite(fav->RemoteUri()));
 }
 
+TEST_F(TestLauncherController, RegisteredIconWithNoDesktopForgetsPositionOnDesktopUpdated)
+{
+  auto app = std::make_shared<MockApplication::Nice>();
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(app));
+  lc.Impl()->RegisterIcon(app_icon);
+  app_icon->Stick(true);
+
+  app->desktop_file_ = "brand-new-desktop-file.desktop";
+  app->desktop_file.changed.emit(app->desktop_file_);
+  ASSERT_TRUE(favorite_store.IsFavorite(app_icon->RemoteUri()));
+
+  app_icon->UnStick();
+  EXPECT_FALSE(favorite_store.IsFavorite(app_icon->RemoteUri()));
+}
+
+TEST_F(TestLauncherController, RegisteredIconUpdatesPositionOnDesktopUpdated)
+{
+  auto app = std::make_shared<MockApplication::Nice>("awesome-app.desktop");
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(app));
+  lc.Impl()->RegisterIcon(app_icon);
+  auto old_uri = app_icon->RemoteUri();
+  app_icon->Stick(true);
+  ASSERT_TRUE(favorite_store.IsFavorite(old_uri));
+
+  app->desktop_file_ = "even_more_awesome_app.desktop";
+  app->desktop_file.changed.emit(app->desktop_file_);
+  ASSERT_NE(app_icon->RemoteUri(), old_uri);
+
+  EXPECT_FALSE(favorite_store.IsFavorite(old_uri));
+  ASSERT_TRUE(favorite_store.IsFavorite(app_icon->RemoteUri()));
+
+  app_icon->UnStick();
+  EXPECT_FALSE(favorite_store.IsFavorite(app_icon->RemoteUri()));
+}
+
 TEST_F(TestLauncherController, GetIconByUriDesktop)
 {
   lc.Impl()->RegisterIcon(lc.Impl()->desktop_icon_);
@@ -1126,7 +1172,7 @@
   std::string desktop = app::BZR_HANDLE_PATCH;
   std::string icon_uri = FavoriteStore::URI_PREFIX_FILE + desktop;
 
-  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon(desktop));
+  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon::Nice(desktop));
   lc.Impl()->RegisterIcon(bamf_icon, std::numeric_limits<int>::max());
 
   auto app_icons = model->GetSublist<ApplicationLauncherIcon>();
@@ -1178,7 +1224,7 @@
 
 TEST_F(TestLauncherController, LauncherRemoveRequestApplicationUnStickAndQuit)
 {
-  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon());
+  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon::Nice());
 
   EXPECT_CALL(*bamf_icon, UnStick());
   EXPECT_CALL(*bamf_icon, Quit());
@@ -1233,7 +1279,7 @@
   std::string desktop = app::BZR_HANDLE_PATCH;
   std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
 
-  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon(desktop));
+  MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon::Nice(desktop));
   lc.Impl()->RegisterIcon(bamf_icon, std::numeric_limits<int>::max());
   ASSERT_TRUE(lc.Impl()->GetIconByUri(icon_uri).IsValid());
 
@@ -1252,11 +1298,11 @@
   lc.DisconnectSignals();
   int priority = 0;
 
-  MockApplicationLauncherIcon::Ptr sticky_app(new NiceMock<MockApplicationLauncherIcon>(true, "sticky-app"));
+  MockApplicationLauncherIcon::Ptr sticky_app(new MockApplicationLauncherIcon::Nice(true, "sticky-app"));
   sticky_app->Stick(false);
   lc.Impl()->RegisterIcon(sticky_app, ++priority);
 
-  MockApplicationLauncherIcon::Ptr invisible_app(new NiceMock<MockApplicationLauncherIcon>(true, "invisible-app"));
+  MockApplicationLauncherIcon::Ptr invisible_app(new MockApplicationLauncherIcon::Nice(true, "invisible-app"));
   invisible_app->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false);
   lc.Impl()->RegisterIcon(invisible_app, ++priority);
 
@@ -1267,7 +1313,7 @@
   MockVolumeLauncherIcon::Ptr device(new MockVolumeLauncherIcon());
   lc.Impl()->RegisterIcon(device, ++priority);
 
-  MockApplicationLauncherIcon::Ptr running_app(new MockApplicationLauncherIcon(true, "running-app"));
+  MockApplicationLauncherIcon::Ptr running_app(new MockApplicationLauncherIcon::Nice(true, "running-app"));
   lc.Impl()->RegisterIcon(running_app, ++priority);
 
   lc.Impl()->SaveIconsOrder();
@@ -1287,7 +1333,7 @@
   lc.ClearModel();
   int priority = 0;
 
-  MockApplicationLauncherIcon::Ptr sticky_app(new NiceMock<MockApplicationLauncherIcon>(true, "sticky-app"));
+  MockApplicationLauncherIcon::Ptr sticky_app(new MockApplicationLauncherIcon::Nice(true, "sticky-app"));
   sticky_app->Stick(false);
   lc.Impl()->RegisterIcon(sticky_app, ++priority);
 
@@ -1316,7 +1362,7 @@
                                FavoriteStore::URI_PREFIX_APP + "bar.desktop", places::APPS_URI,
                                FavoriteStore::URI_PREFIX_APP + "foobar.desktop"});
 
-  MockApplicationLauncherIcon::Ptr sticky_app(new NiceMock<MockApplicationLauncherIcon>(true, "sticky-app"));
+  MockApplicationLauncherIcon::Ptr sticky_app(new MockApplicationLauncherIcon::Nice(true, "sticky-app"));
   sticky_app->Stick(false);
   lc.Impl()->RegisterIcon(sticky_app, ++priority);
 
@@ -1341,7 +1387,7 @@
   lc.ClearModel();
   int priority = 0;
 
-  MockApplicationLauncherIcon::Ptr sticky_app(new NiceMock<MockApplicationLauncherIcon>(true, "sticky-app"));
+  MockApplicationLauncherIcon::Ptr sticky_app(new MockApplicationLauncherIcon::Nice(true, "sticky-app"));
   sticky_app->Stick(false);
   lc.Impl()->RegisterIcon(sticky_app, ++priority);
 
@@ -1370,7 +1416,7 @@
 
   for (int i = 0; i < 15; ++i)
   {
-    MockApplicationLauncherIcon::Ptr app(new MockApplicationLauncherIcon());
+    MockApplicationLauncherIcon::Ptr app(new MockApplicationLauncherIcon::Nice());
     app->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, (i % 5) != 0);
     lc.Impl()->RegisterIcon(app, 0);
   }
@@ -1439,7 +1485,7 @@
   std::string desktop = app::BZR_HANDLE_PATCH;
   std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
 
-  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon(desktop));
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(desktop));
   lc.Impl()->RegisterIcon(app_icon, std::numeric_limits<int>::max());
 
   EXPECT_CALL(*app_icon, Stick(false));
@@ -1453,7 +1499,7 @@
   std::string desktop = app::BZR_HANDLE_PATCH;
   std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
 
-  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon(desktop));
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(desktop));
   lc.Impl()->RegisterIcon(app_icon, std::numeric_limits<int>::max());
 
   auto app_icons = model->GetSublist<ApplicationLauncherIcon>();
@@ -1473,7 +1519,7 @@
   std::string desktop = app::BZR_HANDLE_PATCH;
   std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
 
-  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon(desktop));
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(desktop));
   lc.Impl()->RegisterIcon(app_icon, std::numeric_limits<int>::max());
 
   auto const& app_icons = model->GetSublist<ApplicationLauncherIcon>();
@@ -1516,7 +1562,7 @@
 
 TEST_F(TestLauncherController, OnFavoriteStoreFavoriteRemovedApplication)
 {
-  MockApplicationLauncherIcon::Ptr app_icon(new NiceMock<MockApplicationLauncherIcon>(true, "sticky-icon"));
+  MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon::Nice(true, "sticky-icon"));
   lc.Impl()->RegisterIcon(app_icon);
   app_icon->Stick(false);
 
@@ -1695,7 +1741,7 @@
 {
   const char * desktop_file = "normal-icon.desktop";
   MockApplicationLauncherIcon::Ptr
-    app_icon(new NiceMock<MockApplicationLauncherIcon>(true, desktop_file));
+    app_icon(new MockApplicationLauncherIcon::Nice(true, desktop_file));
   lc.Impl()->RegisterIcon(app_icon);
   ASSERT_FALSE(favorite_store.IsFavorite(app_icon->RemoteUri()));
 
@@ -1710,7 +1756,7 @@
 {
   const char * desktop_file = "normal-icon.desktop";
   MockApplicationLauncherIcon::Ptr
-    app_icon(new NiceMock<MockApplicationLauncherIcon>(true, desktop_file));
+    app_icon(new MockApplicationLauncherIcon::Nice(true, desktop_file));
   lc.Impl()->RegisterIcon(app_icon);
   ASSERT_FALSE(favorite_store.IsFavorite(app_icon->RemoteUri()));
   app_icon->Stick(true);

=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2013-07-23 15:23:34 +0000
+++ tests/test_software_center_launcher_icon.cpp	2013-08-06 10:06:28 +0000
@@ -23,8 +23,10 @@
 
 #include <config.h>
 #include <gmock/gmock.h>
+#include <UnityCore/Variant.h>
 
 #include "mock-application.h"
+#include "FavoriteStore.h"
 #include "SoftwareCenterLauncherIcon.h"
 #include "Launcher.h"
 #include "PanelStyle.h"
@@ -46,28 +48,26 @@
 class MockSoftwareCenterLauncherIcon : public SoftwareCenterLauncherIcon
 {
 public:
-   MockSoftwareCenterLauncherIcon(ApplicationPtr const& app,
-                                  std::string const& aptdaemon_trans_id,
-                                  std::string const& icon_path)
-      : SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path)
-   {}
+  MockSoftwareCenterLauncherIcon(ApplicationPtr const& app,
+                                std::string const& aptdaemon_trans_id,
+                                std::string const& icon_path)
+    : SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path)
+  {}
 
-   using SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall;
-   using SoftwareCenterLauncherIcon::_desktop_file;
-   using SoftwareCenterLauncherIcon::GetRemoteUri;
-   using SoftwareCenterLauncherIcon::OnFinished;
-   using SoftwareCenterLauncherIcon::OnPropertyChanged;
+  using SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall;
+  using SoftwareCenterLauncherIcon::GetRemoteUri;
+  using SoftwareCenterLauncherIcon::OnFinished;
+  using SoftwareCenterLauncherIcon::OnPropertyChanged;
 };
 
 struct TestSoftwareCenterLauncherIcon : testing::Test
 {
-public:
   TestSoftwareCenterLauncherIcon()
-     : usc(std::make_shared<MockApplication::Nice>(USC_APP_INSTALL_DESKTOP, "softwarecenter"))
+     : usc(std::make_shared<MockApplication::Nice>(USC_APP_INSTALL_DESKTOP, "softwarecenter", "Ubuntu Software Center"))
      , icon(usc, "/com/canonical/unity/test/object/path", "")
   {}
 
-  ApplicationPtr usc;
+  MockApplication::Ptr usc;
   MockSoftwareCenterLauncherIcon icon;
 };
 
@@ -80,42 +80,103 @@
 
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformTrivial)
 {
-   // no transformation needed
-  icon._desktop_file = USC_DESKTOP;
+  // no transformation needed
+  usc->desktop_file_ = USC_DESKTOP;
   EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformAppInstall)
 {
-   // ensure that tranformation from app-install data desktop files works
-   icon._desktop_file = "/usr/share/app-install/desktop/pkgname:kde4__afile.desktop";
-   EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), 
-             BUILDDIR"/tests/data/applications/kde4/afile.desktop");
+  // ensure that tranformation from app-install data desktop files works
+  usc->desktop_file_ = "/usr/share/app-install/desktop/pkgname:kde4__afile.desktop";
+   EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(),
+             LOCAL_DATA_DIR+"/applications/kde4/afile.desktop");
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformSCAgent)
 {
-   // now simualte data coming from the sc-agent
-   icon._desktop_file = "/tmp/software-center-agent:VP2W9M:ubuntu-software-center.desktop";
-   EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
+  // now simualte data coming from the sc-agent
+  usc->desktop_file_ = "/tmp/software-center-agent:VP2W9M:ubuntu-software-center.desktop";
+  EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
 }
 
 // simulate a OnFinished signal from a /usr/share/app-install location
 // and ensure that the remote uri is updated from temp location to
 // the real location
-TEST_F(TestSoftwareCenterLauncherIcon, OnFinished)
-{   
-   // now simulate that the install was successful
-   GVariant *params = g_variant_new("(s)", "exit-success");
-   icon.OnFinished(params);
-
-   // and verify that both the desktop file and the remote uri gets updated
-
-   EXPECT_EQ(icon._desktop_file, USC_DESKTOP);
-   EXPECT_EQ(icon.GetRemoteUri(), "application://ubuntu-software-center.desktop");
-   EXPECT_TRUE(usc->closed.empty());
-
-   g_variant_unref(params);
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedReplacesDesktopFile)
+{
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+
+  EXPECT_EQ(USC_DESKTOP, icon.DesktopFile());
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesRemoteURI)
+{
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+
+  ASSERT_EQ(USC_DESKTOP, icon.DesktopFile());
+  EXPECT_EQ(FavoriteStore::URI_PREFIX_APP + "ubuntu-software-center.desktop", icon.GetRemoteUri());
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, DisconnectsOldAppSignals)
+{
+  ASSERT_FALSE(usc->closed.empty());
+
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+
+  EXPECT_TRUE(usc->closed.empty());
+  EXPECT_TRUE(usc->window_opened.empty());
+  EXPECT_TRUE(usc->window_moved.empty());
+  EXPECT_TRUE(usc->window_closed.empty());
+  EXPECT_TRUE(usc->visible.changed.empty());
+  EXPECT_TRUE(usc->active.changed.empty());
+  EXPECT_TRUE(usc->running.changed.empty());
+  EXPECT_TRUE(usc->urgent.changed.empty());
+  EXPECT_TRUE(usc->desktop_file.changed.empty());
+  EXPECT_TRUE(usc->title.changed.empty());
+  EXPECT_TRUE(usc->icon.changed.empty());
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedSticksIcon)
+{
+  ASSERT_FALSE(icon.IsSticky());
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+  EXPECT_TRUE(icon.IsSticky());
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedSavesIconPosition)
+{
+  bool saved = false;
+  icon.position_saved.connect([&saved] {saved = true;});
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+  ASSERT_TRUE(icon.IsSticky());
+  EXPECT_TRUE(saved);
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedKeepsStickyStatus)
+{
+  bool saved = false;
+  usc->sticky = true;
+  icon.position_saved.connect([&saved] {saved = true;});
+  ASSERT_TRUE(icon.IsSticky());
+
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+  ASSERT_TRUE(icon.IsSticky());
+  EXPECT_TRUE(saved);
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesTooltip)
+{
+  icon.tooltip_text = "FooText";
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+  EXPECT_EQ("Ubuntu Software Center", icon.tooltip_text());
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesIcon)
+{
+  icon.icon_name = "foo-icon";
+  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+  EXPECT_EQ("softwarecenter", icon.icon_name());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, Animate)
@@ -135,16 +196,21 @@
   EXPECT_TRUE(icon.IsVisible());
 }
 
-TEST_F(TestSoftwareCenterLauncherIcon, TooltipInstalling)
+struct InstallProgress : TestSoftwareCenterLauncherIcon, testing::WithParamInterface<int> {};
+INSTANTIATE_TEST_CASE_P(TestSoftwareCenterLauncherIcon, InstallProgress, testing::Range<int>(0, 99, 10));
+
+TEST_P(/*TestSoftwareCenterLauncherIcon*/InstallProgress, InstallEmblems)
 {
   ASSERT_EQ(icon.tooltip_text(), "Waiting to install");
 
-  GVariant *progress = g_variant_new("i", 10);
+  GVariant *progress = g_variant_new("i", GetParam());
   GVariant *params = g_variant_new("(sv)", "Progress", progress);
 
   icon.OnPropertyChanged(params);
 
-  EXPECT_EQ(icon.tooltip_text(), "Installing…");
+  EXPECT_EQ("Installing…", icon.tooltip_text());
+  EXPECT_TRUE(icon.GetQuirk(AbstractLauncherIcon::Quirk::PROGRESS));
+  EXPECT_FLOAT_EQ(GetParam()/100.0f, icon.GetProgress());
 
   g_variant_unref(params);
 }

=== modified file 'unity-shared/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	2013-06-26 16:51:30 +0000
+++ unity-shared/ApplicationManager.h	2013-08-06 10:06:28 +0000
@@ -74,7 +74,6 @@
 public:
   virtual ~Application() {}
 
-  virtual std::string desktop_file() const = 0;
   virtual std::string type() const = 0;
 
   // A string representation of the object.
@@ -90,6 +89,7 @@
   // Calls quit on all the Windows for this application.
   virtual void Quit() const = 0;
 
+  nux::ROProperty<std::string> desktop_file;
   nux::ROProperty<std::string> title;
   nux::ROProperty<std::string> icon;
 

=== modified file 'unity-shared/BamfApplicationManager.cpp'
--- unity-shared/BamfApplicationManager.cpp	2013-06-27 11:36:51 +0000
+++ unity-shared/BamfApplicationManager.cpp	2013-08-06 10:06:28 +0000
@@ -55,8 +55,7 @@
 
 std::string View::type() const
 {
-  const gchar* t = bamf_view_get_view_type(bamf_view_);
-  return (t ? t : "");
+  return glib::gchar_to_string(bamf_view_get_view_type(bamf_view_));
 }
 
 bool View::GetVisible() const
@@ -241,6 +240,7 @@
 {
   // Hook up the property set/get functions
   using namespace std::placeholders;
+  desktop_file.SetGetterFunction(std::bind(&Application::GetDesktopFile, this));
   title.SetGetterFunction(std::bind(&View::GetTitle, this));
   icon.SetGetterFunction(std::bind(&View::GetIcon, this));
   seen.SetGetterFunction(std::bind(&Application::GetSeen, this));
@@ -252,7 +252,10 @@
   running.SetGetterFunction(std::bind(&View::GetRunning, this));
   urgent.SetGetterFunction(std::bind(&View::GetUrgent, this));
 
-  // Use signals_.Add....
+  signals_.Add<void, BamfApplication*, const char*>(bamf_app_, "desktop-file-updated",
+  [this] (BamfApplication*, const char* new_desktop_file) {
+    this->desktop_file.changed.emit(glib::gchar_to_string(new_desktop_file));
+  });
   signals_.Add<void, BamfView*, const char*, const char*>(bamf_view_, "name-changed",
   [this] (BamfView*, const char*, const char* new_name) {
     this->title.changed.emit(glib::gchar_to_string(new_name));
@@ -309,10 +312,9 @@
   });
 }
 
-std::string Application::desktop_file() const
+std::string Application::GetDesktopFile() const
 {
-  const gchar* file = bamf_application_get_desktop_file(bamf_app_);
-  return file ? file : "";
+  return glib::gchar_to_string(bamf_application_get_desktop_file(bamf_app_));
 }
 
 std::string Application::type() const

=== modified file 'unity-shared/BamfApplicationManager.h'
--- unity-shared/BamfApplicationManager.h	2013-06-27 11:11:19 +0000
+++ unity-shared/BamfApplicationManager.h	2013-08-06 10:06:28 +0000
@@ -112,7 +112,6 @@
   Application(ApplicationManager const& manager,
               glib::Object<BamfView> const& app);
 
-  virtual std::string desktop_file() const;
   virtual std::string type() const;
 
   virtual WindowList GetWindows() const;
@@ -130,6 +129,8 @@
 private: // Property getters and setters
   void HookUpEvents();
 
+  std::string GetDesktopFile() const;
+
   bool GetSeen() const;
   bool SetSeen(bool const& param);
 
@@ -137,7 +138,7 @@
   bool SetSticky(bool const& param);
 
 private:
-  glib::Object< ::BamfApplication> bamf_app_;
+  glib::Object<::BamfApplication> bamf_app_;
   glib::SignalManager signals_;
   std::string type_;
 };