Merge lp:~azzar1/unity/gs-integration into lp:unity

[Andrea Azzarone]

Gnome-software launcher integration.

Gnome-software launcher integration.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4070
http://jenkins.qa.ubuntu.com/job/unity-ci/1409/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/59/console

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Add libappstream-glib-dev as build dependency on debian/control.

Also, please, ensure that this merges with lp:~robert-ancell/unity/gnome-software

See comments, there might be some room for future optimization.

[Andrea Azzarone (azzar1)]

Done. We can talk more about the icon stuff later on.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4076
http://jenkins.qa.ubuntu.com/job/unity-ci/1415/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/65/console

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Ok, looks good...

It would be nice if we might also get the application icon path instead of the pixbuf, so please keep looking at this for next improvements.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Ok, looks good...

It would be nice if we might also get the application icon path instead of the pixbuf, so please keep looking at this for next improvements.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-09 01:57:51 +0000
+++ CMakeLists.txt	2016-02-23 15:50:24 +0000
@@ -228,6 +228,7 @@
 set(UNITY_PROTOCOL_PRIVATE_DEPS unity-protocol-private>=7.1.0)
 set(UNITY_PLUGIN_SHARED_DEPS
     ${UNITY_PROTOCOL_PRIVATE_DEPS}
+    appstream-glib
     atk
     atk-bridge-2.0
     cairo>=1.13.1
 
=== modified file 'debian/control'
--- debian/control	2016-02-09 12:20:47 +0000
+++ debian/control	2016-02-23 15:50:24 +0000
@@ -13,6 +13,7 @@
                gsettings-desktop-schemas-dev,
                gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219),
                intltool (>= 0.35.0),
+               libappstream-glib-dev,
                libatk1.0-dev,
                libbamf3-dev (>= 0.5.2~bzr0),
                libboost-dev,
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2015-12-17 22:32:37 +0000
+++ launcher/LauncherController.cpp	2016-02-23 15:50:24 +0000
@@ -41,6 +41,7 @@
 #include "ExpoLauncherIcon.h"
 #include "TrashLauncherIcon.h"
 #include "BFBLauncherIcon.h"
+#include "unity-shared/AppStreamApplication.h"
 #include "unity-shared/IconRenderer.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
@@ -61,13 +62,8 @@
   "<node>"
   "  <interface name='com.canonical.Unity.Launcher'>"
   ""
-  "    <method name='AddLauncherItemFromPosition'>"
-  "      <arg type='s' name='title' direction='in'/>"
-  "      <arg type='s' name='icon' direction='in'/>"
-  "      <arg type='i' name='icon_x' direction='in'/>"
-  "      <arg type='i' name='icon_y' direction='in'/>"
-  "      <arg type='i' name='icon_size' direction='in'/>"
-  "      <arg type='s' name='desktop_file' direction='in'/>"
+  "    <method name='AddLauncherItem'>"
+  "      <arg type='s' name='appstream_app_id' direction='in'/>"
   "      <arg type='s' name='aptdaemon_task' direction='in'/>"
   "    </method>"
   ""
@@ -506,44 +502,25 @@
 }
 
 void
-Controller::Impl::OnLauncherAddRequestSpecial(std::string const& path,
-                                              std::string const& aptdaemon_trans_id,
-                                              std::string const& icon_path,
-                                              int icon_x,
-                                              int icon_y,
-                                              int icon_size)
+Controller::Impl::OnLauncherAddRequestSpecial(std::string const& appstream_app_id,
+                                              std::string const& aptdaemon_trans_id)
 {
-  // Check if desktop file was supplied, or if it's set to SC's agent
-  // See https://bugs.launchpad.net/unity/+bug/1002440
-  if (path.empty() || path == local::SOFTWARE_CENTER_AGENT)
+  // Check if desktop file was supplied
+  if (appstream_app_id.empty())
     return;
 
   auto const& icon = std::find_if(model_->begin(), model_->end(),
-    [&path](AbstractLauncherIcon::Ptr const& i) { return (i->DesktopFile() == path); });
+    [&appstream_app_id](AbstractLauncherIcon::Ptr const& i) { return (i->DesktopFile() == appstream_app_id); });
 
   if (icon != model_->end())
     return;
 
-  auto const& result = CreateSCLauncherIcon(path, aptdaemon_trans_id, icon_path);
+  auto const& result = CreateSCLauncherIcon(appstream_app_id, aptdaemon_trans_id);
 
   if (result)
   {
-    // Setting the icon position and adding it to the model, makes the launcher
-    // to compute its center
     RegisterIcon(result, GetLastIconPriority<ApplicationLauncherIcon>("", true));
-
-    if (icon_x > 0 || icon_y > 0)
-    {
-      // This will ensure that the center of the new icon is set, so that
-      // the animation could be done properly.
-      sources_.AddIdle([this, icon_x, icon_y, result] {
-        return !result->Animate(CurrentLauncher(), icon_x, icon_y);
-      });
-    }
-    else
-    {
-      result->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true);
-    }
+    result->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true);
   }
 }
 
@@ -944,22 +921,11 @@
   return AbstractLauncherIcon::Ptr();
 }
 
-SoftwareCenterLauncherIcon::Ptr Controller::Impl::CreateSCLauncherIcon(std::string const& file_path,
-                                                                       std::string const& aptdaemon_trans_id,
-                                                                       std::string const& icon_path)
+SoftwareCenterLauncherIcon::Ptr Controller::Impl::CreateSCLauncherIcon(std::string const& appstream_app_id,
+                                                                       std::string const& aptdaemon_trans_id)
 {
-  SoftwareCenterLauncherIcon::Ptr result;
-
-  ApplicationPtr app = ApplicationManager::Default().GetApplicationForDesktopFile(file_path);
-  if (!app)
-    return result;
-
-  if (app->seen)
-    return result;
-
-  result = new SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path);
-
-  return result;
+  ApplicationPtr app = std::make_shared<appstream::Application>(appstream_app_id);
+  return SoftwareCenterLauncherIcon::Ptr(new SoftwareCenterLauncherIcon(app, aptdaemon_trans_id));
 }
 
 void Controller::Impl::AddRunningApps()
@@ -1548,16 +1514,11 @@
 
 GVariant* Controller::Impl::OnDBusMethodCall(std::string const& method, GVariant *parameters)
 {
-  if (method == "AddLauncherItemFromPosition")
+  if (method == "AddLauncherItem")
   {
-    glib::String icon, icon_title, desktop_file, aptdaemon_task;
-    gint icon_x, icon_y, icon_size;
-
-    g_variant_get(parameters, "(ssiiiss)", &icon_title, &icon, &icon_x, &icon_y,
-                                           &icon_size, &desktop_file, &aptdaemon_task);
-
-    OnLauncherAddRequestSpecial(desktop_file.Str(), aptdaemon_task.Str(),
-                                icon.Str(), icon_x, icon_y, icon_size);
+    glib::String appstream_app_id, aptdaemon_trans_id;
+    g_variant_get(parameters, "(ss)", &appstream_app_id, &aptdaemon_trans_id);
+    OnLauncherAddRequestSpecial(appstream_app_id.Str(), aptdaemon_trans_id.Str());
   }
   else if (method == "UpdateLauncherIconFavoriteState")
   {
 
=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2015-12-07 18:34:41 +0000
+++ launcher/LauncherControllerPrivate.h	2016-02-23 15:50:24 +0000
@@ -69,8 +69,7 @@
   void OnDeviceIconAdded(AbstractLauncherIcon::Ptr const& icon);
 
   void OnLauncherAddRequest(std::string const& icon_uri, AbstractLauncherIcon::Ptr const& before);
-  void OnLauncherAddRequestSpecial(std::string const& path, std::string const& aptdaemon_trans_id,
-                                   std::string const& icon_path, int icon_x, int icon_y, int icon_size);
+  void OnLauncherAddRequestSpecial(std::string const& appstream_app_id, std::string const& aptdaemon_trans_id);
   void OnLauncherUpdateIconStickyState(std::string const& desktop_file, bool sticky);
   void OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr const& icon);
 
@@ -90,7 +89,7 @@
   ApplicationLauncherIcon* CreateAppLauncherIcon(ApplicationPtr const&);
   AbstractLauncherIcon::Ptr CreateFavoriteIcon(std::string const& icon_uri, bool emit_signal = false);
   AbstractLauncherIcon::Ptr GetIconByUri(std::string const& icon_uri);
-  SoftwareCenterLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
+  SoftwareCenterLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& appstream_app_id, std::string const& aptdaemon_trans_id);
 
   void SetupIcons();
   void MigrateFavorites();
 
=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2015-11-25 23:16:11 +0000
+++ launcher/LauncherIcon.cpp	2016-02-23 15:50:24 +0000
@@ -365,6 +365,20 @@
   return _unity_theme;
 }
 
+BaseTexturePtr LauncherIcon::TextureFromPixbuf(GdkPixbuf* pixbuf, int size, bool update_glow_colors)
+{
+  g_return_val_if_fail(GDK_IS_PIXBUF(pixbuf), BaseTexturePtr());
+
+  glib::Object<GdkPixbuf> scaled_pixbuf(gdk_pixbuf_scale_simple(pixbuf, size, size,  GDK_INTERP_BILINEAR));
+
+  if (update_glow_colors)
+    ColorForIcon(scaled_pixbuf, _background_color, _glow_color);
+
+  BaseTexturePtr result;
+  result.Adopt(nux::CreateTexture2DFromPixbuf(scaled_pixbuf, true));
+  return result;
+}
+
 BaseTexturePtr LauncherIcon::TextureFromGtkTheme(std::string icon_name, int size, bool update_glow_colors)
 {
   GtkIconTheme* default_theme;
 
=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2015-11-25 23:16:11 +0000
+++ launcher/LauncherIcon.h	2016-02-23 15:50:24 +0000
@@ -269,6 +269,8 @@
 
   virtual bool HandlesSpread () { return false; }
 
+  BaseTexturePtr TextureFromPixbuf(GdkPixbuf *pixbuf, int size, bool update_glow_colors = true);
+
   BaseTexturePtr TextureFromGtkTheme(std::string name, int size, bool update_glow_colors = true);
 
   BaseTexturePtr TextureFromSpecificGtkTheme(GtkIconTheme* theme, std::string const& name, int size, bool update_glow_colors = true, bool is_default_theme = false);
 
=== modified file 'launcher/SimpleLauncherIcon.cpp'
--- launcher/SimpleLauncherIcon.cpp	2014-07-30 00:49:35 +0000
+++ launcher/SimpleLauncherIcon.cpp	2016-02-23 15:50:24 +0000
@@ -34,6 +34,7 @@
 SimpleLauncherIcon::SimpleLauncherIcon(IconType type)
   : LauncherIcon(type)
   , icon_name("", sigc::mem_fun(this, &SimpleLauncherIcon::SetIconName))
+  , icon_pixbuf(glib::Object<GdkPixbuf>(), sigc::mem_fun(this, &SimpleLauncherIcon::SetIconPixbuf))
 {
   auto* theme = gtk_icon_theme_get_default();
   theme_changed_signal_.Connect(theme, "changed", [this] (GtkIconTheme *) {
@@ -53,17 +54,24 @@
   if (it != texture_map_.end())
     return it->second.GetPointer();
 
-  std::string const& icon_string = icon_name();
-
-  if (icon_string.empty())
-    return nullptr;
-
   BaseTexturePtr texture;
 
-  if (icon_string[0] == '/')
-    texture = TextureFromPath(icon_string, size);
+  if (icon_pixbuf())
+  {
+    texture = TextureFromPixbuf(icon_pixbuf(), size);
+  }
   else
-    texture = TextureFromGtkTheme(icon_string, size);
+  {
+    std::string const& icon_string = icon_name();
+
+    if (icon_string.empty())
+      return nullptr;
+
+    if (icon_string[0] == '/')
+      texture = TextureFromPath(icon_string, size);
+    else
+      texture = TextureFromGtkTheme(icon_string, size);
+  }
 
   if (!texture)
     return nullptr;
@@ -83,6 +91,17 @@
   return true;
 }
 
+bool SimpleLauncherIcon::SetIconPixbuf(glib::Object<GdkPixbuf>& target, glib::Object<GdkPixbuf> const& value)
+{
+  if (target == value)
+    return false;
+
+  target = value;
+  ReloadIcon();
+
+  return true;
+}
+
 void SimpleLauncherIcon::ReloadIcon()
 {
   texture_map_.clear();
 
=== modified file 'launcher/SimpleLauncherIcon.h'
--- launcher/SimpleLauncherIcon.h	2013-09-19 16:44:03 +0000
+++ launcher/SimpleLauncherIcon.h	2016-02-23 15:50:24 +0000
@@ -38,6 +38,7 @@
 
   // Properties
   nux::Property<std::string> icon_name;
+  nux::Property<glib::Object<GdkPixbuf>> icon_pixbuf;
 
 protected:
   std::string GetName() const;
@@ -49,6 +50,7 @@
 private:
   void ReloadIcon();
   bool SetIconName(std::string& target, std::string const& value);
+  bool SetIconPixbuf(glib::Object<GdkPixbuf>& target, glib::Object<GdkPixbuf> const& value);
 
 private:
   std::unordered_map<int, BaseTexturePtr> texture_map_;
 
=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2015-12-07 16:13:42 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2016-02-23 15:50:24 +0000
@@ -44,8 +44,7 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(SoftwareCenterLauncherIcon);
 SoftwareCenterLauncherIcon::SoftwareCenterLauncherIcon(ApplicationPtr const& app,
-                                                       std::string const& aptdaemon_trans_id,
-                                                       std::string const& icon_path)
+                                                       std::string const& aptdaemon_trans_id)
   : WindowedLauncherIcon(IconType::APPLICATION)
   , ApplicationLauncherIcon(app)
   , aptdaemon_trans_(std::make_shared<glib::DBusProxy>("org.debian.apt",
@@ -69,61 +68,13 @@
     SetQuirk(Quirk::PROGRESS, (progress > 0));
   });
 
-  if (!icon_path.empty())
-    icon_name = icon_path;
+  if (app->icon_pixbuf())
+    icon_pixbuf = app->icon_pixbuf();
 
   if (!aptdaemon_trans_id_.empty()) // Application is being installed, or hasn't been installed yet
     tooltip_text = _("Waiting to install");
 }
 
-bool SoftwareCenterLauncherIcon::Animate(nux::ObjectPtr<Launcher> const& launcher, int start_x, int start_y)
-{
-  using namespace std::placeholders;
-
-  if (start_x <= 0 && start_y <= 0)
-  {
-    SetQuirk(Quirk::VISIBLE, true);
-    return true;
-  }
-
-  int monitor = launcher->monitor();
-  auto const& icon_center = GetCenter(monitor);
-
-  if (icon_center.x == 0 && icon_center.y == 0)
-    return false;
-
-  auto* floating_icon = new SimpleLauncherIcon(GetIconType());
-  AbstractLauncherIcon::Ptr floating_icon_ptr(floating_icon);
-  floating_icon->icon_name = icon_name();
-
-  // Transform this in a spacer-icon and make it visible only on launcher's monitor
-  icon_name = "";
-  SetQuirk(Quirk::VISIBLE, true, monitor);
-
-  auto rcb = std::bind(&Launcher::RenderIconToTexture, launcher.GetPointer(), _1, _2, floating_icon_ptr);
-  drag_window_ = new LauncherDragWindow(launcher->GetWidth(), rcb);
-  drag_window_->SetBaseXY(start_x, start_y);
-  drag_window_->SetAnimationTarget(icon_center.x, icon_center.y + (launcher->GetIconSize() / 2));
-
-  launcher->ForceReveal(true);
-  drag_window_->ShowWindow(true);
-
-  auto cb = sigc::bind(sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnDragAnimationFinished), launcher, floating_icon->icon_name());
-  drag_window_->anim_completed.connect(cb);
-  drag_window_->StartSlowAnimation();
-
-  return true;
-}
-
-void SoftwareCenterLauncherIcon::OnDragAnimationFinished(nux::ObjectPtr<Launcher> const& launcher, std::string const& final_icon)
-{
-  icon_name = final_icon;
-  drag_window_->ShowWindow(false);
-  drag_window_.Release();
-  launcher->ForceReveal(false);
-  SetQuirk(Quirk::VISIBLE, true);
-}
-
 void SoftwareCenterLauncherIcon::ActivateLauncherIcon(ActionArg arg)
 {
   if (finished_)
@@ -144,62 +95,7 @@
 
 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
-  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;
+  return DesktopUtilities::GetDesktopPathById(DesktopFile());
 }
 
 void SoftwareCenterLauncherIcon::OnFinished(GVariant *params)
 
=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2013-08-28 16:41:20 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2016-02-23 15:50:24 +0000
@@ -24,7 +24,6 @@
 #include <string>
 #include <UnityCore/GLibDBusProxy.h>
 #include "ApplicationLauncherIcon.h"
-#include "LauncherDragWindow.h"
 
 namespace unity
 {
@@ -39,10 +38,7 @@
   typedef nux::ObjectPtr<SoftwareCenterLauncherIcon> Ptr;
 
   SoftwareCenterLauncherIcon(ApplicationPtr const& app,
-                             std::string const& aptdaemon_trans_id,
-                             std::string const& icon_path);
-
-  bool Animate(nux::ObjectPtr<Launcher> const& launcher, int start_x, int start_y);
+                             std::string const& aptdaemon_trans_id);
 
 protected:
   std::string GetName() const;
@@ -52,10 +48,8 @@
   std::string GetActualDesktopFileAfterInstall();
   void OnFinished(GVariant *params);
   void OnPropertyChanged(GVariant* params);
-  void OnDragAnimationFinished(nux::ObjectPtr<Launcher> const&, std::string const&);
 
   glib::DBusProxy::Ptr aptdaemon_trans_;
-  LauncherDragWindow::Ptr drag_window_;
   bool finished_;
   bool needs_urgent_;
   std::string aptdaemon_trans_id_;
 
=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2016-02-23 15:50:24 +0000
+++ tests/test_launcher_controller.cpp	2016-02-23 15:50:24 +0000
@@ -1321,38 +1321,6 @@
   lc.launcher().remove_request.emit(device_icon);
 }
 
-TEST_F(TestLauncherController, LauncherAddRequestSpecial)
-{
-  std::string desktop = app::BZR_HANDLE_PATCH;
-  std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
-  ASSERT_FALSE(lc.Impl()->GetIconByUri(icon_uri).IsValid());
-  EXPECT_CALL(*unity_app_, LogEvent(_, _)).Times(0);
-
-  lc.Impl()->OnLauncherAddRequestSpecial(desktop, "", "", 0, 0, 32);
-
-  auto const& sw_center_icon = lc.Impl()->GetIconByUri(icon_uri);
-  ASSERT_TRUE(sw_center_icon.IsValid());
-  EXPECT_TRUE(sw_center_icon->IsSticky());
-  EXPECT_NE(dynamic_cast<SoftwareCenterLauncherIcon*>(sw_center_icon.GetPointer()), nullptr);
-}
-
-TEST_F(TestLauncherController, LauncherAddRequestSpecialIgnored)
-{
-  std::string desktop = app::BZR_HANDLE_PATCH;
-  std::string icon_uri = FavoriteStore::URI_PREFIX_APP + 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());
-
-  EXPECT_CALL(*bamf_icon, Stick(false)).Times(0);
-
-  int previous_model_size = lc.Impl()->model_->Size();
-  lc.Impl()->OnLauncherAddRequestSpecial(desktop, "", "", 0, 0, 32);
-
-  EXPECT_EQ(previous_model_size, lc.Impl()->model_->Size());
-}
-
 TEST_F(TestLauncherController, SaveIconsOrder)
 {
   favorite_store.ClearFavorites();
 
=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2016-02-23 15:50:24 +0000
+++ tests/test_software_center_launcher_icon.cpp	2016-02-23 15:50:24 +0000
@@ -42,28 +42,26 @@
 {
 namespace
 {
-const std::string PRE_INSTALL_ICON = "software-launcher-icon";
 const std::string FINAL_ICON = "org.gnome.Software";
 const std::string APP_NAME = "Software";
 const std::string LOCAL_DATA_DIR = BUILDDIR"/tests/data";
 const std::string GS_DESKTOP = LOCAL_DATA_DIR+"/applications/org.gnome.Software.desktop";
-const std::string GS_APP_INSTALL_DESKTOP = "/usr/share/app-install/desktop/software-center:org.gnome.Software.desktop";
+const std::string GS_APP_INSTALL_DESKTOP = "org.gnome.Software.desktop";
 }
 
 struct TestSoftwareCenterLauncherIcon : testmocks::TestUnityAppBase
 {
   TestSoftwareCenterLauncherIcon()
      : gs(std::make_shared<MockApplication::Nice>(GS_APP_INSTALL_DESKTOP, FINAL_ICON, APP_NAME))
-     , icon(gs, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON)
+     , icon(gs, "/com/canonical/unity/test/object/path")
   {}
 
   struct MockSoftwareCenterLauncherIcon : SoftwareCenterLauncherIcon
   {
     MockSoftwareCenterLauncherIcon(ApplicationPtr const& app,
-                                   std::string const& aptdaemon_trans_id,
-                                   std::string const& icon_path)
+                                   std::string const& aptdaemon_trans_id)
       : WindowedLauncherIcon(IconType::APPLICATION)
-      , SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path)
+      , SoftwareCenterLauncherIcon(app, aptdaemon_trans_id)
     {}
 
     void LauncherIconUnstick() { LauncherIcon::UnStick(); }
@@ -71,7 +69,6 @@
     using SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall;
     using SoftwareCenterLauncherIcon::OnFinished;
     using SoftwareCenterLauncherIcon::OnPropertyChanged;
-    using SoftwareCenterLauncherIcon::drag_window_;
     using LauncherIcon::GetRemoteUri;
   };
 
@@ -94,9 +91,7 @@
 {
   EXPECT_FALSE(icon.IsVisible());
   EXPECT_TRUE(icon.IsSticky());
-  EXPECT_EQ(AbstractLauncherIcon::Position::FLOATING, icon.position());
   EXPECT_EQ("Waiting to install", icon.tooltip_text());
-  EXPECT_EQ(PRE_INSTALL_ICON, icon.icon_name());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformTrivial)
@@ -106,28 +101,9 @@
   EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), GS_DESKTOP);
 }
 
-TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformAppInstall)
-{
-  // ensure that tranformation from app-install data desktop files works
-  gs->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 software-center-agent
-  gs->desktop_file_ = "/tmp/software-center-agent:VP2W9M:org.gnome.Software.desktop";
-  EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), GS_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, OnFinishedReplacesDesktopFile)
 {
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
-
   EXPECT_EQ(GS_DESKTOP, icon.DesktopFile());
 }
 
@@ -162,7 +138,7 @@
 {
   // Using an icon ptr, to get the removed signal to be properly emitted
   nux::ObjectPtr<MockSoftwareCenterLauncherIcon> icon_ptr(
-    new MockSoftwareCenterLauncherIcon(gs, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON));
+    new MockSoftwareCenterLauncherIcon(gs, "/com/canonical/unity/test/object/path"));
 
   bool removed = false;
   auto& app_manager = unity::ApplicationManager::Default();
@@ -217,65 +193,15 @@
   EXPECT_EQ(icon.tooltip_text(), gs->title());
 }
 
-TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesIcon)
-{
-  icon.icon_name = "foo-icon";
-  icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
-  EXPECT_EQ(icon.icon_name(), gs->icon());
-}
-
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedLogsEvent)
 {
   EXPECT_CALL(*unity_app_, LogEvent(ApplicationEventType::ACCESS, _));
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
 }
 
-TEST_F(TestSoftwareCenterLauncherIcon, AnimateToInvalidPosition)
-{
-  EXPECT_FALSE(icon.Animate(CreateLauncher(), 1, 2));
-  EXPECT_FALSE(icon.IsVisible());
-  EXPECT_EQ(PRE_INSTALL_ICON, icon.icon_name());
-}
-
-TEST_F(TestSoftwareCenterLauncherIcon, AnimateFromInvalidPosition)
-{
-  EXPECT_TRUE(icon.Animate(CreateLauncher(), 0, 0));
-  EXPECT_TRUE(icon.IsVisible());
-  EXPECT_EQ(PRE_INSTALL_ICON, icon.icon_name());
-}
-
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
-struct MultiMonitor : TestSoftwareCenterLauncherIcon, WithParamInterface<unsigned> {};
-INSTANTIATE_TEST_CASE_P(TestSoftwareCenterLauncherIcon, MultiMonitor, Range<unsigned>(0, monitors::MAX, 1));
-
-TEST_P(/*TestSoftwareCenterLauncherIcon*/MultiMonitor, Animate)
-{
-  auto launcher = CreateLauncher();
-  launcher->monitor = GetParam();
-  icon.SetCenter({1, 1, 0}, launcher->monitor());
-  ASSERT_TRUE(icon.Animate(launcher, 2, 2));
-  EXPECT_FALSE(icon.IsVisible());
-  EXPECT_TRUE(icon.icon_name().empty());
-
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    ASSERT_EQ(static_cast<int>(i) == launcher->monitor(), icon.IsVisibleOnMonitor(i));
-
-  bool animated = false;
-  ASSERT_TRUE(icon.drag_window_);
-  icon.drag_window_->anim_completed.connect([&animated] { animated = true; });
-  Utils::WaitUntilMSec(animated);
-  ASSERT_TRUE(animated);
-
-  EXPECT_EQ(PRE_INSTALL_ICON, icon.icon_name());
-  EXPECT_FALSE(icon.drag_window_);
-
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    ASSERT_TRUE(icon.IsVisibleOnMonitor(i));
-
-  EXPECT_TRUE(icon.IsVisible());
-}
 
 struct InstallProgress : TestSoftwareCenterLauncherIcon, WithParamInterface<int> {};
 INSTANTIATE_TEST_CASE_P(TestSoftwareCenterLauncherIcon, InstallProgress, Range<int>(0, 99, 10));
 
=== added file 'unity-shared/AppStreamApplication.cpp'
--- unity-shared/AppStreamApplication.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/AppStreamApplication.cpp	2016-02-23 15:50:24 +0000
@@ -0,0 +1,104 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include "AppStreamApplication.h"
+
+#include <appstream-glib.h>
+
+#include <iostream>
+
+namespace unity
+{
+namespace appstream
+{
+
+Application::Application(std::string const& appstream_id)
+  : appstream_id_(appstream_id)
+{
+  desktop_file.SetGetterFunction([this](){ return appstream_id_; });
+  title.SetGetterFunction([this](){ return title_; });
+  icon_pixbuf.SetGetterFunction([this](){ return icon_pixbuf_; });
+
+  glib::Object<AsStore> as_store(as_store_new());
+  g_return_if_fail(as_store);
+
+  as_store_load(as_store, AS_STORE_LOAD_FLAG_APP_INFO_SYSTEM, nullptr, nullptr);
+
+  AsApp *as_app = as_store_get_app_by_id(as_store, appstream_id_.c_str());
+  g_return_if_fail(as_app);
+
+  title_ = glib::gchar_to_string(as_app_get_name(as_app, nullptr));
+
+  AsIcon *as_icon = as_app_get_icon_default(as_app);
+  g_return_if_fail(as_icon);
+
+  as_icon_load(as_icon, AS_ICON_LOAD_FLAG_SEARCH_SIZE, nullptr);
+  icon_pixbuf_ = glib::Object<GdkPixbuf>(as_icon_get_pixbuf(as_icon), glib::AddRef());
+}
+
+AppType Application::type() const
+{
+  return AppType::NORMAL;
+}
+
+std::string Application::repr() const
+{
+  std::ostringstream sout;
+  sout << "<AppStream::Application " << appstream_id_ << " >";
+  return sout.str();
+}
+
+WindowList const& Application::GetWindows() const
+{
+  return window_list_;
+}
+
+bool Application::OwnsWindow(Window window_id) const
+{
+  return false;
+}
+
+std::vector<std::string> Application::GetSupportedMimeTypes() const
+{
+  return std::vector<std::string>();
+}
+
+ApplicationWindowPtr Application::GetFocusableWindow() const
+{
+  return nullptr;
+}
+
+void Application::Focus(bool show_on_visible, int monitor) const
+{}
+
+void Application::Quit() const
+{}
+
+bool Application::CreateLocalDesktopFile() const
+{
+  return false;
+}
+
+std::string Application::desktop_id() const
+{
+  return "";
+}
+
+}
+}
 
=== added file 'unity-shared/AppStreamApplication.h'
--- unity-shared/AppStreamApplication.h	1970-01-01 00:00:00 +0000
+++ unity-shared/AppStreamApplication.h	2016-02-23 15:50:24 +0000
@@ -0,0 +1,61 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITYSHARED_APPSTREAM_APPLICATION_H
+#define UNITYSHARED_APPSTREAM_APPLICATION_H
+
+#include "DesktopApplicationManager.h"
+
+namespace unity
+{
+namespace appstream
+{
+
+class Application : public desktop::Application
+{
+public:
+  Application(std::string const& appstream_id);
+
+  AppType type() const override;
+  std::string repr() const override;
+
+  WindowList const& GetWindows() const override;
+  bool OwnsWindow(Window window_id) const override;
+
+  std::vector<std::string> GetSupportedMimeTypes() const override;
+
+  ApplicationWindowPtr GetFocusableWindow() const override;
+  void Focus(bool show_on_visible, int monitor) const override;
+  void Quit() const override;
+
+  bool CreateLocalDesktopFile() const override;
+
+  std::string desktop_id() const override;
+
+private:
+  std::string appstream_id_;
+  std::string title_;
+  glib::Object<_GdkPixbuf> icon_pixbuf_;
+  WindowList window_list_;
+};
+
+}
+}
+
+#endif
 
=== modified file 'unity-shared/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	2015-11-26 00:20:23 +0000
+++ unity-shared/ApplicationManager.h	2016-02-23 15:50:24 +0000
@@ -25,8 +25,10 @@
 
 #include <sigc++/signal.h>
 #include <NuxCore/Property.h>
+#include <UnityCore/GLibWrapper.h>
 #include <unity-shared/WindowManager.h>
 
+struct _GdkPixbuf;
 
 namespace unity
 {
@@ -153,6 +155,7 @@
   nux::ROProperty<std::string> desktop_file;
   nux::ROProperty<std::string> title;
   nux::ROProperty<std::string> icon;
+  nux::ROProperty<glib::Object<_GdkPixbuf>> icon_pixbuf;
 
   // Considering using a property for the "unity-seen" quark
   nux::RWProperty<bool> seen;
 
=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2015-11-06 18:05:38 +0000
+++ unity-shared/CMakeLists.txt	2016-02-23 15:50:24 +0000
@@ -18,6 +18,7 @@
 #
 set (UNITY_SHARED_SOURCES
      ApplicationManager.cpp
+     AppStreamApplication.cpp
      BGHash.cpp
      CoverArt.cpp
      BackgroundEffectHelper.cpp
 
=== modified file 'unity-shared/DesktopApplicationManager.h'
--- unity-shared/DesktopApplicationManager.h	2014-01-15 14:51:10 +0000
+++ unity-shared/DesktopApplicationManager.h	2016-02-23 15:50:24 +0000
@@ -24,7 +24,7 @@
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/GLibSignal.h>
 
-#include "unity-shared/ApplicationManager.h"
+#include "ApplicationManager.h"
 
 namespace unity
 {