Merge lp:~mvo/unity/sc-launcher-integration-fixes into lp:unity

[Michael Vogt]

Software center launcher integration fixes. This will setup the correct desktop file when software-center applications "fly" into the launcher.

This branch adds support for "native" software center unity launcher integration.

This means that when a application is installed via software-center (and soon via the dash) the icon of
that application will "fly" into the launcher and the launcher will track progress. Once the application
is installed the "temp" desktop file is replaced with the "real" desktop file of the installed app.

The reason this swapping needs to be done is to ensure that unity tracks the real application and not
the copy from app-install-data-ubuntu, e.g. to ensure that on uninstall the application is removed.

I would appreciated a initial review and feedback on this as I had to change bit in "ApplicationLauncherIcon"
from private to protected to make it possible to update the data from SoftwareCenterLauncherIcon.

[Michael Vogt (mvo)]

Setting to Needs-review now to get feedback and get it merged if its good. There will be another
branch on top of this one that adds support for installs from software-center-agent.

[Michael Vogt (mvo)]

Trevinho was kind enough to give me some feedback on irc that I want to address here :)

<Trevinho> mvo: another thing.. instead of adding FRIEND_TEST(TestSoftwareCenterLauncherIcon, DesktopFileTransformTrivial); and making unity directly depending on gtest when building, just mock the class in the tests so that you cana ccess to protected members (or, just add a friend class TestSoftwareCenterLauncherIcon; definition in the header)

I looked at this now and gtest_prod.h is very lean and basicly is just the lines:
  #define FRIEND_TEST(test_case_name, test_name) friend class test_case_name##_##test_name##_Test
So it should be fine to include it even in the production code. Plus there is a build-dependency on libgtest-dev already so that should be ok too (as long as I'm not overlooking anything else).

[Michael Vogt (mvo)]

I added another test now and look forward to feedback. From my POV its merge-able now, but of course I'm happy to fix any issues.

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

> I looked at this now and gtest_prod.h is very lean and basicly is just the
> lines:
> #define FRIEND_TEST(test_case_name, test_name) friend class
> test_case_name##_##test_name##_Test
> So it should be fine to include it even in the production code. Plus there is
> a build-dependency on libgtest-dev already so that should be ok too (as long
> as I'm not overlooking anything else).

Yeah, but considering how is defined... I really prefer if you get rid of these macros and you just add at the end of the class a "friend class TestSoftwareCenterLauncherIcon" declaration. It's the same but cleaner (and it's how we're used to do in general) :)

The main thing I'd like to be changed, is the apt daemon to send a desktop-id instead, so that you can simply use DesktopUtilities::GetDesktopPathById in GetActualDesktopFileAfterInstall

review: Needs Fixing

[Michael Vogt (mvo)]

Hi Marco,

thanks for your review!

On Thu, Nov 22, 2012 at 02:14:30PM -0000, Marco Trevisan (Treviño) wrote:
> Review: Needs Fixing
>
> > I looked at this now and gtest_prod.h is very lean and basicly is just the
> > lines:
> > #define FRIEND_TEST(test_case_name, test_name) friend class
> > test_case_name##_##test_name##_Test
> > So it should be fine to include it even in the production code. Plus there is
> > a build-dependency on libgtest-dev already so that should be ok too (as long
> > as I'm not overlooking anything else).
>
> Yeah, but considering how is defined... I really prefer if you get rid of these macros and you just add at the end of the class a "friend class TestSoftwareCenterLauncherIcon" declaration. It's the same but cleaner (and it's how we're used to do in general) :)

Thanks for this explaination. I fixed this now in r2916 to use a Mock
instead of the FRIEND_TEST().

> The main thing I'd like to be changed, is the apt daemon to send a desktop-id instead, so that you can simply use DesktopUtilities::GetDesktopPathById in GetActualDesktopFileAfterInstall

I'm not sure I understand this (but I'm pretty new to unity, so that
is ok I hope :). The daemon will send a temp desktop file at first
because the real desktop file is not installed yet. That might be
/tmp/software-center-agent:dsfdsafdsaf:meep.desktop. So sending the
desktop-id would be sending
application:///tmp/software-center-agent:dsfdsafdsaf:meep.desktop
AIUI? Given that its a temp name and not in the xdg path it would
still send the full path? Or are you suggesting that it should create
the temp desktop file in a xdg .local dir?

Once the app is installed, the GetActualDesktopFileAfterInstall() will
take the rfind(":") part ("meep.desktop") and make that
/usr/share/applications/meep.desktop. At this point it would be
application://meep.desktop. But it needs to be the one in
/usr/share/applications because if its a temp/local one it won't go
away on remove of the application.

Could you please help me understanding how I should use
GetDesktopPathById() or how it will help here?

Thanks!,
 Michael

[Michael Vogt (mvo)]

From irc (just so that its recorded here):

<Trevinho> mvo: gave a look.. Basically I mean that once you've installed the app, then you can make apt to send to unity the desktop id of the new file... So this means "/tmp/software-center-agent:desktop-id.desktop" for instance... At this point you don't need to do all the manual search you're doing to get from it the real path... Just get the id substring and use the utility function
<mvo> Trevinho: ok, so that would mean that there needs to be a new dbus call for unity, right? to replace a existing launcher icon (the temp one that is just valid during the install) with the new one?
<Trevinho> mvo: imho that would be better, so that you can keep all the low level stuff there
<Trevinho> whie unity will be just informed with the actual result
<Trevinho> mvo: or just pass that during the "On-Finished" signal...
<mvo> Trevinho: ok, I will think about it
<Trevinho> mvo: but if you don't want to do that, it's fine to use the current way, but use the utility function for doing the real parsing
<mvo> Trevinho: ok, thanks. I would prefer to leave it as is for now, but I will use the utility function

I started working on this now but so far did not succeed to update the tests as for some reason XDG_DATA_HOME pointing to the local builddir is not quite working, I will keep poking at it.

[Michael Vogt (mvo)]

I figured out why setting XDG_DATA_HOME is not working reliable in my tests. Gio/Glib will setup its internal search path just once (see gio/gdesktopappinfo.c:get_appplications_search_path()) and cache it then.

But DesktopUtilities::GetDataDirectories()/GetSystemDataDirectories() does not do that. Which leads to confusing behaviour, i.e. when using g_desktop_app_info_new_* the dirs are only respected once in the tests, but all other code in the DesktopUtilities is honoring a more dynamic update approach.

[Michael Vogt (mvo)]

I see two ways around this:
- init the XDG_DATA_DIRS env very early globally (and hope that it does not break other stuff)
- reimplement g_desktop_app_info_new() inside GetDesktopPathById() to do the searching manually and then using g_desktop_app_info_new_from_filename()
(simply drop the tests, but that sounds like not exactly a good idea ;)

Feedback welcome.

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

> I see two ways around this:
> - init the XDG_DATA_DIRS env very early globally (and hope that it does not
> break other stuff)

Yeah, probably this is the best solution... I think we already moved the test .desktop files to a proper position, so it should be fine to just init this value in test_main*

[Michael Vogt (mvo)]

Thanks again Marco!

I updated the code now to use DesktopUtilities::GetDesktopPathByID() and updated the tests and moved the init of the XDG_DATA_DIRS into test_main.cpp. Both the automatic tests and manual tests with applications from app-install-data-ubuntu and from purchases in the software-center work for me now with animation, update on finish to the right app and error handling (i.e. removal on cancel etc).

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

35 + if (_desktop_file.find("/usr/share/app-install/desktop") == 0)
136 + {

Wouldn't better to check if it contains "/share/app-install/desktop" avoiding prefixes?

Overall looks good now, but I'm not sure this is still working with the new AppManager in trunk.

[Michael Vogt (mvo)]

Thanks Marco!

I removed the fix for the prefix now and do the check as you suggested.

Now I merged in trunk and resolved the conflicts and indeed, from the look of the code I'm pretty
sure this won't work anymore as the way the application is swapped from the temp desktop file to the
new final desktop file destination has changed completely.

Given that I wonder if maybe the approach reconsidered. I like your original idea of having two dbus calls,
one for setting the "in-progress" app with progress and all and once that is finished, swapping that for the
real one. I will look into that and see how feasible this is, it seems like its a cleaner approach anyway.

Cheers,
 Michael

[Michael Vogt (mvo)]

This is now ready again with the new ApplicationManager framework. The tests are ported too, only the "TEST_F(TestSoftwareCenterLauncherIcon, Animate)" case is missing as DNDCollectionWindow is gone and my naive
approach of replacing it with XndCollectionWindow does not work. I will keep exploring, but would appreciate
a look at the rest of the MP again.

[Michael Vogt (mvo)]

review: Needs Resubmitting

[Andrea Azzarone (azzar1)]

> This is now ready again with the new ApplicationManager framework. The tests
> are ported too, only the "TEST_F(TestSoftwareCenterLauncherIcon, Animate)"
> case is missing as DNDCollectionWindow is gone and my naive
> approach of replacing it with XndCollectionWindow does not work. I will keep
> exploring, but would appreciate
> a look at the rest of the MP again.

  nux::ObjectPtr<DNDCollectionWindow> cwin(new DNDCollectionWindow);
  nux::ObjectPtr<Launcher> launcher(new Launcher(win.GetPointer(), cwin));

just do:

  nux::ObjectPtr<Launcher> launcher(new Launcher(win.GetPointer()));

[Michael Vogt (mvo)]

Thanks Andrea! I updated the code and re-enabled the last test.

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

Ok, now it's fine (sorry for the delays)... :)

Before of general approving (do it yourself when you're ready), remember to set a commit message and it would be also ince if you get rid of the tabs at:
272 + test_static_cairo_text.cpp

Thanks.

review: Approve

[Michael Vogt (mvo)]

Thanks Marco! Excellent news. I fixed the tab in line 272 and set a commit message. I can't approve it myself, but it should be good now. Once this is merged I will upload the corresponding software-center branch.

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2012-11-29 01:50:21 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2012-12-11 15:42:23 +0000
@@ -973,16 +973,21 @@
   return DesktopUtilities::GetDesktopID(desktop_file);
 }
 
-std::string ApplicationLauncherIcon::GetRemoteUri()
+void ApplicationLauncherIcon::UpdateRemoteUri()
 {
-  if (_remote_uri.empty())
-  {
     std::string const& desktop_id = GetDesktopID();
 
     if (!desktop_id.empty())
     {
       _remote_uri = FavoriteStore::URI_PREFIX_APP + desktop_id;
     }
+}
+
+std::string ApplicationLauncherIcon::GetRemoteUri()
+{
+  if (_remote_uri.empty())
+  {
+     UpdateRemoteUri();
   }
 
   return _remote_uri;

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2012-11-27 01:09:26 +0000
+++ launcher/ApplicationLauncherIcon.h	2012-12-11 15:42:23 +0000
@@ -89,6 +89,12 @@
   bool HandlesSpread() { return true; }
   std::string GetName() const;
 
+protected:
+  void UpdateDesktopFile();
+  void UpdateRemoteUri();
+  std::string _desktop_file;
+  ApplicationPtr app_;
+
 private:
   typedef unsigned long int WindowFilterMask;
   enum WindowFilter
@@ -102,7 +108,6 @@
   void EnsureWindowState();
   void EnsureMenuItemsReady();
   void UpdateBackgroundColor();
-  void UpdateDesktopFile();
   void UpdateMenus();
   void UpdateDesktopQuickList();
 
@@ -117,10 +122,8 @@
   const std::set<std::string> GetSupportedTypes();
   std::string GetDesktopID();
 
-  ApplicationPtr app_;
-
   std::string _remote_uri;
-  std::string _desktop_file;
+  std::set<std::string> _supported_types;
   std::map<std::string, glib::Object<DbusmenuClient>> _menu_clients;
   std::map<std::string, glib::Object<DbusmenuMenuitem>> _menu_items;
   std::map<std::string, glib::Object<DbusmenuMenuitem>> _menu_items_extra;

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-12-03 15:34:23 +0000
+++ launcher/LauncherIcon.cpp	2012-12-11 15:42:23 +0000
@@ -1193,14 +1193,16 @@
 
 void LauncherIcon::Stick(bool save)
 {
+  // allow save() even for already "_sticky" icons that may have been
+  // made _sticky without "save" (like SoftwareCenterApplications)
+  if (save)
+    position_saved.emit();
+
   if (_sticky)
     return;
 
   _sticky = true;
 
-  if (save)
-    position_saved.emit();
-
   SetQuirk(Quirk::VISIBLE, true);
 }
 

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2012-11-28 22:05:07 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2012-12-11 15:42:23 +0000
@@ -16,15 +16,19 @@
  *
  * Authored by: Bilal Akhtar <[e-mail]>
  *              Marco Trevisan (Treviño) <[e-mail]>
+ *              Michael Vogt <[e-mail]>
  */
 
+#include "config.h"
+
 #include <NuxCore/Logger.h>
-#include "config.h"
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include "SoftwareCenterLauncherIcon.h"
 #include "Launcher.h"
 #include "LauncherDragWindow.h"
 #include "LauncherModel.h"
+#include "DesktopUtilities.h"
 
 namespace unity
 {
@@ -69,6 +73,14 @@
 {
   launcher_ = launcher;
 
+  // FIXME: this needs testing, if there is no useful coordinates 
+  //        then do not animate
+  if(start_x <= 0 && start_y <= 0)
+  {
+     SetQuirk(Quirk::VISIBLE, true);
+     return;
+  }
+
   icon_texture_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(
     launcher->GetWidth(),
     launcher->GetWidth(),
@@ -118,6 +130,63 @@
   }
 }
 
+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;
+}
+
 void SoftwareCenterLauncherIcon::OnFinished(GVariant *params)
 {
    glib::String exit_state;
@@ -132,6 +201,18 @@
       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
+      app_ = ApplicationManager::Default().GetApplicationForDesktopFile(new_desktop_path);
+
+      UpdateDesktopFile();
+      UpdateRemoteUri();
+
+      // make it permanent
+      Stick(true);
+
       _source_manager.AddIdle([this]()
       {
         ShowTooltip();

=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2012-11-23 04:05:35 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2012-12-11 15:42:23 +0000
@@ -47,11 +47,12 @@
   std::string GetName() const;
 
 protected:
+  std::string GetActualDesktopFileAfterInstall();
   void ActivateLauncherIcon(ActionArg arg);
+  void OnFinished(GVariant *params);
 
 private:
   void OnPropertyChanged(GVariant* params);
-  void OnFinished(GVariant *params);
   void OnDragAnimationFinished();
 
   glib::DBusProxy aptdaemon_trans_;
@@ -61,7 +62,6 @@
   nux::ObjectPtr<Launcher> launcher_;
   bool finished_;
   bool needs_urgent_;
-
   std::string aptdaemon_trans_id_;
   std::string app_title_;
 };

=== modified file 'po/unity.pot'
--- po/unity.pot	2012-11-08 16:49:26 +0000
+++ po/unity.pot	2012-12-11 15:42:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-11-08 12:05+0000\n"
+"POT-Creation-Date: 2012-12-05 10:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-12-11 02:33:06 +0000
+++ tests/CMakeLists.txt	2012-12-11 15:42:23 +0000
@@ -13,6 +13,9 @@
                 ${CMAKE_BINARY_DIR}/tests/data/applications/bzr-handle-patch.desktop)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/no-icon.desktop
                 ${CMAKE_BINARY_DIR}/tests/data/applications/no-icon.desktop)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/kde4/afile.desktop
+                ${CMAKE_BINARY_DIR}/tests/data/applications/kde4/afile.desktop)
+
 #
 # Unit tests
 #
@@ -237,7 +240,8 @@
                  test_single_monitor_launcher_icon.cpp
                  test_expo_launcher_icon.cpp
                  test_showdesktop_handler.cpp
-								 test_static_cairo_text.cpp
+                 test_software_center_launcher_icon.cpp
+                 test_static_cairo_text.cpp
                  test_switcher_controller.cpp
                  test_switcher_model.cpp
                  test_texture_cache.cpp

=== added directory 'tests/data/applications/kde4'
=== added file 'tests/data/applications/kde4/afile.desktop'
--- tests/data/applications/kde4/afile.desktop	1970-01-01 00:00:00 +0000
+++ tests/data/applications/kde4/afile.desktop	2012-12-11 15:42:23 +0000
@@ -0,0 +1,37 @@
+[Desktop Entry]
+X-AppInstall-Package=gedit
+X-AppInstall-Popcon=78622
+X-AppInstall-Section=main
+
+Name=gedit
+GenericName=Text Editor
+Comment=Edit text files
+Exec=gedit %U
+Terminal=false
+Type=Application
+StartupNotify=true
+MimeType=text/plain;
+Icon=accessories-text-editor
+Categories=GNOME;GTK;Utility;TextEditor;
+X-GNOME-DocPath=gedit/gedit.xml
+X-GNOME-FullName=Text Editor
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gedit
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0
+X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gedit/gedit-bugreport
+Actions=Window;Document;
+Keywords=Text;Plaintext;Write;
+
+
+[Desktop Action Window]
+Name=Open a New Window
+Exec=gedit --new-window
+OnlyShowIn=Unity;
+
+[Desktop Action Document]
+Name=Open a New Document
+Exec=gedit --new-document
+OnlyShowIn=Unity;
+
+X-Ubuntu-Gettext-Domain=app-install-data

=== modified file 'tests/test_main.cpp'
--- tests/test_main.cpp	2012-11-28 02:00:04 +0000
+++ tests/test_main.cpp	2012-12-11 15:42:23 +0000
@@ -3,12 +3,20 @@
 #include <gtk/gtk.h>
 #include <NuxCore/Logger.h>
 #include <Nux/Nux.h>
+#include <config.h>
 
 #include "logger_helper.h"
 
 int main(int argc, char** argv)
 {
   ::testing::InitGoogleTest(&argc, argv);
+
+  // init XDG_DATA_DIRS before GTK to point to the local test-dir as 
+  // the environment is only read once by glib and then cached
+  const std::string LOCAL_DATA_DIR = BUILDDIR"/tests/data:/usr/share";
+  g_setenv("XDG_DATA_DIRS", LOCAL_DATA_DIR.c_str(), TRUE);
+
+
   gtk_init(&argc, &argv);
   setlocale(LC_ALL, "C");
 

=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2012-09-18 15:47:49 +0000
+++ tests/test_software_center_launcher_icon.cpp	2012-12-11 15:42:23 +0000
@@ -15,11 +15,16 @@
  * <http://www.gnu.org/licenses/>
  *
  * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ *              Michael Vogt <[e-mail]>
+ *
+ * Run standalone with:
+ * cd build && make test-gtest && ./test-gtest --gtest_filter=TestSoftwareCenterLauncherIcon.*
  */
 
 #include <config.h>
 #include <gmock/gmock.h>
 
+#include "ApplicationManager.h"
 #include "SoftwareCenterLauncherIcon.h"
 #include "Launcher.h"
 #include "PanelStyle.h"
@@ -29,28 +34,88 @@
 using namespace unity;
 using namespace unity::launcher;
 
-namespace
-{
-const std::string USC_DESKTOP = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
+namespace unity
+{
+namespace launcher
+{
+const std::string LOCAL_DATA_DIR = BUILDDIR"/tests/data";
+const std::string USC_DESKTOP = LOCAL_DATA_DIR+"/applications/ubuntu-software-center.desktop";
+
+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)
+   {}
+
+   using SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall;
+   using SoftwareCenterLauncherIcon::_desktop_file;
+   using SoftwareCenterLauncherIcon::GetRemoteUri;
+   using SoftwareCenterLauncherIcon::OnFinished;
+
+};
 
 struct TestSoftwareCenterLauncherIcon : testing::Test
 {
+public:
   TestSoftwareCenterLauncherIcon()
-    : bamf_matcher(bamf_matcher_get_default())
-    , usc(bamf_matcher_get_application_for_desktop_file(bamf_matcher, USC_DESKTOP.c_str(), TRUE), glib::AddRef())
-    , icon(usc, "", "")
+     : usc(ApplicationManager::Default().GetApplicationForDesktopFile(USC_DESKTOP))
+     , icon(usc, "", "")
   {}
 
-  glib::Object<BamfMatcher> bamf_matcher;
-  glib::Object<BamfApplication> usc;
-  SoftwareCenterLauncherIcon icon;
+  ApplicationPtr usc;
+  MockSoftwareCenterLauncherIcon icon;
 };
 
 TEST_F(TestSoftwareCenterLauncherIcon, Construction)
 {
   EXPECT_FALSE(icon.IsVisible());
   EXPECT_EQ(icon.position(), AbstractLauncherIcon::Position::FLOATING);
-  EXPECT_EQ(icon.tooltip_text(), bamf_view_get_name(glib::object_cast<BamfView>(usc)));
+  EXPECT_EQ(icon.tooltip_text(), usc->title());
+}
+
+TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformTrivial)
+{
+   // no transformation needed
+   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");
+}
+
+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);
+}
+
+// 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)
+{
+
+   // simulate desktop file from app-install-data
+   icon._desktop_file = "/usr/share/app-install/desktop/software-center:ubuntu-software-center.desktop";
+   
+   // 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");
+
+   g_variant_unref(params);
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, Animate)
@@ -60,8 +125,7 @@
   Settings settings;
   panel::Style panel;
   nux::ObjectPtr<nux::BaseWindow> win(new nux::BaseWindow(""));
-  nux::ObjectPtr<DNDCollectionWindow> cwin(new DNDCollectionWindow);
-  nux::ObjectPtr<Launcher> launcher(new Launcher(win.GetPointer(), cwin));
+  nux::ObjectPtr<Launcher> launcher(new Launcher(win.GetPointer()));
   launcher->options = Options::Ptr(new Options);
   launcher->SetModel(LauncherModel::Ptr(new LauncherModel));
 
@@ -72,3 +136,5 @@
 }
 
 }
+
+}

=== modified file 'unity-shared/DebugDBusInterface.cpp'
--- unity-shared/DebugDBusInterface.cpp	2012-11-22 11:21:27 +0000
+++ unity-shared/DebugDBusInterface.cpp	2012-12-11 15:42:23 +0000
@@ -21,6 +21,7 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <iostream>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>