Merge lp:~3v1n0/unity/create-local-desktop-file into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: Create a local desktop file when sticking an app that has not

Also make icon sticky only if both the icon itself and the inner app is sticky as well.

When we try to stick an application that has no desktop file (and no URI, in fact) we use bamf to generate the .desktop file. If/When this happens the application get notified with a desktop-file-updated signal that makes unity to update the icon and save it on favorites.

I sometime noticed that a "default icon" is shown instead of the real one, this seems mostly related to something else or a race... There's one line in bamf that can avoid this, but before reverting that I'd like to see if we can find a better solution.

As always, added and updated new unit tests

[Christopher Townsend (townsend)]

I think this is almost working.

However, I ran into one problem where if I start a local app using ./name_of_exe, then the desktop file uses ./name_of_exe and when clicking the Launcher icon, it can't find ./name_of_exe. Is there any way to expand ./ to the full path?

Also, the .desktop file sticks around in .local/share/applications even after unpinning the icon from the Launcher. Is this intended behavior?

After I unpinned the icon, and then restarted the application using the full path, the already existing .desktop file did not get updated with the new full path. Not sure if the .desktop file is supposed to get updated or not.

Another behavior I noticed is that when I start the application using the Launcher icon (when the paths are correct), if I try quitting the application using Quit in the icon quicklist, the application won't quit.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3484
http://jenkins.qa.ubuntu.com/job/unity-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/181
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/179/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/180

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

The last behavior I noted about quiting from the Quicklist seems to only happen the first time I start the app and then try quitting. If I kill the app via the terminal and then open it again via Launcher icon, then Quit works.

[Christopher Townsend (townsend)]

Well, my comments about the Quicklist Quit may be invalid because for some reason, the new bamfdaemon crashed due to a "BadWindow (invalid Window parameter)" X error. Not really sure what caused this, but after starting the new bamfdaemon again, Quit now works as expected.

The other comments still seem valid.

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

> However, I ran into one problem where if I start a local app using
> ./name_of_exe, then the desktop file uses ./name_of_exe and when clicking the
> Launcher icon, it can't find ./name_of_exe. Is there any way to expand ./ to
> the full path?

So, good catch! This lp:~3v1n0/bamf/working-dir-support bamf branch should fix this case by including the working directory path on generated .desktop file.

> Also, the .desktop file sticks around in .local/share/applications even after
> unpinning the icon from the Launcher. Is this intended behavior?

Yes, I thought about removing these .desktop files, but I also think that this is a also a nice way to create .desktop files for applications we only want to show in dash and that don't have a valid launcher (i.e. you stick it and then you unstick it).

> After I unpinned the icon, and then restarted the application using the full
> path, the already existing .desktop file did not get updated with the new full
> path. Not sure if the .desktop file is supposed to get updated or not.

Yeah, that's the wanted behaviour as the .desktop should be generated once and never touched anymore by unity.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3484
http://jenkins.qa.ubuntu.com/job/unity-ci/293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/182
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/180/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/181

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

For some reason, the TestLauncher.DragLauncherIconSavesIconOrderIfPositionHasNotChanged test is failing on armhf, which doesn't seem right...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3486
http://jenkins.qa.ubuntu.com/job/unity-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/186

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

review: Approve (continuous-integration)

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

> For some reason, the
> TestLauncher.DragLauncherIconSavesIconOrderIfPositionHasNotChanged test is
> failing on armhf, which doesn't seem right...

Fixed it...

[Christopher Townsend (townsend)]

I still see the Quicklist Quit issue, but it's probably not related to this branch. I'll open a new bug about that.

This branch looks good, so +1!

review: Approve

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-08-06 09:53:12 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-08-09 12:10:05 +0000
@@ -75,16 +75,6 @@
   , use_custom_bg_color_(false)
   , bg_color_(nux::color::White)
 {
-  app->seen = true;
-
-  tooltip_text = app->title();
-  std::string const& icon = app->icon();
-  icon_name = (icon.empty() ? DEFAULT_ICON : icon);
-
-  SetQuirk(Quirk::VISIBLE, app->visible());
-  SetQuirk(Quirk::ACTIVE, app->active());
-  SetQuirk(Quirk::RUNNING, app->running());
-
   LOG_INFO(logger) << "Created ApplicationLauncherIcon: "
     << tooltip_text()
     << ", icon: " << icon_name()
@@ -95,10 +85,6 @@
 
   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));
@@ -110,28 +96,40 @@
 
 ApplicationLauncherIcon::~ApplicationLauncherIcon()
 {
+  SetApplication(nullptr);
+}
+
+void ApplicationLauncherIcon::SetApplication(ApplicationPtr const& app)
+{
+  if (app_ == app)
+    return;
+
   if (app_)
   {
     app_->sticky = false;
     app_->seen = false;
   }
-}
-
-void ApplicationLauncherIcon::SetApplication(ApplicationPtr const& app)
-{
-  if (app_ == app)
-    return;
 
   signals_conn_.Clear();
 
+  if (!app)
+    return;
+
   app_ = app;
+  app_->seen = true;
   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.
+  // Let's update the icon properties to match the new application ones
   app_->desktop_file.changed.emit(app_->desktop_file());
   app_->title.changed.emit(app_->title());
   app_->icon.changed.emit(app_->icon());
+  app_->visible.changed.emit(app_->visible());
+  app_->active.changed.emit(app_->active());
+  app_->running.changed.emit(app_->running());
+
+  // Make sure we set the LauncherIcon stick bit too...
+  if (app_->sticky())
+    Stick(false); // don't emit the signal
 }
 
 void ApplicationLauncherIcon::SetupApplicationSignalsConnections()
@@ -187,8 +185,7 @@
   }));
 
   signals_conn_.Add(app_->visible.changed.connect([this](bool const& visible) {
-    if (!IsSticky())
-      SetQuirk(Quirk::VISIBLE, visible);
+    SetQuirk(Quirk::VISIBLE, IsSticky() ? true : visible);
   }));
 
   signals_conn_.Add(app_->closed.connect([this]() {
@@ -245,7 +242,8 @@
 bool ApplicationLauncherIcon::IsSticky() const
 {
   if (app_)
-    return app_->sticky();
+    return app_->sticky() && SimpleLauncherIcon::IsSticky();
+
   return false;
 }
 
@@ -511,6 +509,7 @@
   UpdateRemoteUri();
   UpdateDesktopQuickList();
   UpdateBackgroundColor();
+  auto const& new_uri = RemoteUri();
 
   if (!filename.empty())
   {
@@ -547,19 +546,17 @@
       }
     });
 
-    if (IsSticky())
+    if (app_->sticky() && old_uri != new_uri)
     {
-      position_forgot.emit();
-      position_saved.emit();
+      UnStick();
+      Stick();
     }
   }
-  else if (IsSticky())
+  else if (app_->sticky())
   {
     UnStick();
   }
 
-  auto const& new_uri = RemoteUri();
-
   if (old_uri != new_uri)
     uri_changed.emit(new_uri);
 }
@@ -846,18 +843,20 @@
     return;
 
   app_->sticky = true;
-  SimpleLauncherIcon::Stick(save);
+
+  if (RemoteUri().empty())
+    app_->CreateLocalDesktopFile();
+  else
+    SimpleLauncherIcon::Stick(save);
 }
 
 void ApplicationLauncherIcon::UnStick()
 {
+  if (!IsSticky())
+    return;
+
   SimpleLauncherIcon::UnStick();
-
-  if (!IsSticky())
-    return;
-
   SetQuirk(Quirk::VISIBLE, app_->running());
-
   app_->sticky = false;
 
   if (!app_->running())

=== modified file 'launcher/LauncherDragWindow.cpp'
--- launcher/LauncherDragWindow.cpp	2013-07-01 21:20:51 +0000
+++ launcher/LauncherDragWindow.cpp	2013-08-09 12:10:05 +0000
@@ -115,7 +115,7 @@
 }
 
 bool LauncherDragWindow::OnAnimationTimeout()
-{ 
+{
   nux::Geometry const& geo = GetGeometry();
 
   int half_size = geo.width / 2;

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2013-08-05 08:07:09 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2013-08-09 12:10:05 +0000
@@ -217,7 +217,6 @@
     new_app->sticky = IsSticky();
     SetApplication(new_app);
     Stick();
-    position_saved.emit();
 
     _source_manager.AddIdle([this] {
       ShowTooltip();

=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2013-08-01 15:09:26 +0000
+++ tests/mock-application.h	2013-08-09 12:10:05 +0000
@@ -163,6 +163,7 @@
   MOCK_CONST_METHOD1(OwnsWindow, bool(Window));
   MOCK_CONST_METHOD0(GetSupportedMimeTypes, std::vector<std::string>());
   MOCK_CONST_METHOD0(GetFocusableWindow, unity::ApplicationWindowPtr());
+  MOCK_CONST_METHOD0(CreateLocalDesktopFile, bool());
   MOCK_CONST_METHOD2(Focus, void(bool, int));
   MOCK_CONST_METHOD0(Quit, void());
 

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-08-06 09:53:30 +0000
+++ tests/test_application_launcher_icon.cpp	2013-08-09 12:10:05 +0000
@@ -89,7 +89,7 @@
     empty_icon = new NiceMock<MockApplicationLauncherIcon>(empty_app);
     ASSERT_EQ(empty_icon->DesktopFile(), NO_ICON_DESKTOP);
 
-    mock_app = std::make_shared<MockApplication::Nice>("");
+    mock_app = std::make_shared<MockApplication::Nice>();
     mock_icon = new NiceMock<MockApplicationLauncherIcon>(mock_app);
     ASSERT_TRUE(mock_icon->DesktopFile().empty());
   }
@@ -185,7 +185,7 @@
   EXPECT_EQ(mock_icon->icon_name(), DEFAULT_EMPTY_ICON);
 }
 
-TEST_F(TestApplicationLauncherIcon, Stick)
+TEST_F(TestApplicationLauncherIcon, StickDesktopApp)
 {
   bool saved = false;
   usc_icon->position_saved.connect([&saved] {saved = true;});
@@ -200,55 +200,135 @@
   EXPECT_FALSE(saved);
 }
 
-TEST_F(TestApplicationLauncherIcon, StickAndSave)
+TEST_F(TestApplicationLauncherIcon, StickDesktopLessApp)
 {
   bool saved = false;
   mock_icon->position_saved.connect([&saved] {saved = true;});
 
+  mock_icon->Stick(false);
+  EXPECT_TRUE(mock_app->sticky());
+  EXPECT_FALSE(mock_icon->IsSticky());
+  EXPECT_FALSE(mock_icon->IsVisible());
+  EXPECT_FALSE(saved);
+
   mock_icon->Stick(true);
-  EXPECT_TRUE(mock_app->sticky());
-  EXPECT_TRUE(mock_icon->IsSticky());
-  EXPECT_TRUE(mock_icon->IsVisible());
+  EXPECT_FALSE(saved);
+}
+
+TEST_F(TestApplicationLauncherIcon, StickAndSaveDesktopApp)
+{
+  bool saved = false;
+  usc_icon->position_saved.connect([&saved] {saved = true;});
+
+  usc_icon->Stick(true);
+  EXPECT_TRUE(usc_app->sticky());
+  EXPECT_TRUE(usc_icon->IsSticky());
+  EXPECT_TRUE(usc_icon->IsVisible());
   EXPECT_TRUE(saved);
 }
 
-TEST_F(TestApplicationLauncherIcon, StickStickedApplication)
+TEST_F(TestApplicationLauncherIcon, StickAndSaveDesktopLessApp)
+{
+  bool saved = false;
+  mock_icon->position_saved.connect([&saved] {saved = true;});
+
+  mock_icon->Stick(true);
+  EXPECT_TRUE(mock_app->sticky());
+  EXPECT_FALSE(mock_icon->IsSticky());
+  EXPECT_FALSE(mock_icon->IsVisible());
+  EXPECT_FALSE(saved);
+}
+
+TEST_F(TestApplicationLauncherIcon, StickStickedDesktopApp)
 {
   auto app = std::make_shared<MockApplication::Nice>(USC_DESKTOP);
   app->sticky = true;
+  app->desktop_file_ = UM_DESKTOP;
   MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
   ASSERT_TRUE(icon->IsSticky());
   EXPECT_TRUE(icon->LauncherIconIsSticky());
 }
 
+TEST_F(TestApplicationLauncherIcon, StickStickedDesktopLessApp)
+{
+  auto app = std::make_shared<MockApplication::Nice>();
+  app->sticky = true;
+  MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
+  ASSERT_FALSE(icon->IsSticky());
+  EXPECT_FALSE(icon->LauncherIconIsSticky());
+}
+
+TEST_F(TestApplicationLauncherIcon, StickAndSaveDesktopApplication)
+{
+  EXPECT_CALL(*usc_app, CreateLocalDesktopFile()).Times(0);
+  usc_icon->Stick(true);
+
+  EXPECT_TRUE(usc_icon->IsSticky());
+}
+
+TEST_F(TestApplicationLauncherIcon, StickAndSaveDesktopLessApplication)
+{
+  auto app = std::make_shared<MockApplication::Nice>();
+  MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
+
+  EXPECT_CALL(*app, CreateLocalDesktopFile());
+  icon->Stick(true);
+
+  EXPECT_TRUE(app->sticky());
+  EXPECT_FALSE(icon->IsSticky());
+}
+
 TEST_F(TestApplicationLauncherIcon, UnstickNotRunning)
 {
   bool forgot = false;
-  mock_app->running_ = false;
-  mock_icon->position_forgot.connect([&forgot] {forgot = true;});
+  usc_app->running_ = false;
+  usc_icon->position_forgot.connect([&forgot] {forgot = true;});
 
-  mock_icon->Stick();
-  mock_icon->UnStick();
-  EXPECT_FALSE(mock_app->sticky());
-  EXPECT_FALSE(mock_icon->IsSticky());
-  EXPECT_FALSE(mock_icon->IsVisible());
+  usc_icon->Stick();
+  usc_icon->UnStick();
+  EXPECT_FALSE(usc_app->sticky());
+  EXPECT_FALSE(usc_icon->IsSticky());
+  EXPECT_FALSE(usc_icon->IsVisible());
   EXPECT_TRUE(forgot);
 }
 
 TEST_F(TestApplicationLauncherIcon, UnstickRunning)
 {
   bool forgot = false;
-  mock_app->running_ = true;
-  mock_icon->position_forgot.connect([&forgot] {forgot = true;});
+  usc_app->running_ = true;
+  usc_icon->position_forgot.connect([&forgot] {forgot = true;});
 
-  mock_icon->Stick();
-  mock_icon->UnStick();
-  EXPECT_FALSE(mock_app->sticky());
-  EXPECT_FALSE(mock_icon->IsSticky());
-  EXPECT_TRUE(mock_icon->IsVisible());
+  usc_icon->Stick();
+  usc_icon->UnStick();
+  EXPECT_FALSE(usc_app->sticky());
+  EXPECT_FALSE(usc_icon->IsSticky());
+  EXPECT_TRUE(usc_icon->IsVisible());
   EXPECT_TRUE(forgot);
 }
 
+TEST_F(TestApplicationLauncherIcon, VisibleChanged)
+{
+  usc_app->visible_ = true;
+  usc_app->visible.changed(usc_app->visible_);
+  ASSERT_TRUE(usc_icon->IsVisible());
+
+  usc_app->visible_ = false;
+  usc_app->visible.changed(usc_app->visible_);
+  EXPECT_FALSE(usc_icon->IsVisible());
+}
+
+TEST_F(TestApplicationLauncherIcon, VisibleChangedSticky)
+{
+  usc_icon->Stick();
+  usc_app->visible_ = true;
+  usc_app->visible.changed(usc_app->visible_);
+  ASSERT_TRUE(usc_icon->IsVisible());
+
+  usc_app->visible_ = false;
+  usc_app->visible.changed(usc_app->visible_);
+  EXPECT_TRUE(usc_icon->IsVisible());
+}
+
 TEST_F(TestApplicationLauncherIcon, UpdateDesktopFile)
 {
   usc_app->desktop_file_ = UM_DESKTOP;
@@ -613,50 +693,49 @@
 
 TEST_F(TestApplicationLauncherIcon, QuicklistMenuHasLockToLauncher)
 {
-  mock_app->sticky = false;
-  EXPECT_TRUE(HasMenuItemWithLabel(mock_icon, "Lock to Launcher"));
-  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, "Unlock from Launcher"));
+  usc_app->sticky = false;
+  EXPECT_TRUE(HasMenuItemWithLabel(usc_icon, "Lock to Launcher"));
+  EXPECT_FALSE(HasMenuItemWithLabel(usc_icon, "Unlock from Launcher"));
 }
 
 TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemLockToLauncher)
 {
   bool saved = false;
-  mock_app->sticky = false;
-  mock_icon->position_saved.connect([&saved] {saved = true;});
+  usc_icon->position_saved.connect([&saved] {saved = true;});
 
-  auto const& menu_item = GetMenuItemWithLabel(mock_icon, "Lock to Launcher");
+  auto const& menu_item = GetMenuItemWithLabel(usc_icon, "Lock to Launcher");
   ASSERT_NE(menu_item, nullptr);
 
-  EXPECT_CALL(*mock_icon, Stick(true));
+  EXPECT_CALL(*usc_icon, Stick(true));
   dbusmenu_menuitem_handle_event(menu_item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, 0);
 
   EXPECT_TRUE(saved);
-  EXPECT_TRUE(mock_app->sticky());
-  EXPECT_TRUE(mock_icon->IsSticky());
+  EXPECT_TRUE(usc_app->sticky());
+  EXPECT_TRUE(usc_icon->IsSticky());
 }
 
 TEST_F(TestApplicationLauncherIcon, QuicklistMenuHasUnLockToLauncher)
 {
-  mock_app->sticky = true;
-  EXPECT_TRUE(HasMenuItemWithLabel(mock_icon, "Unlock from Launcher"));
-  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, "Lock to Launcher"));
+  usc_icon->Stick();
+  EXPECT_TRUE(HasMenuItemWithLabel(usc_icon, "Unlock from Launcher"));
+  EXPECT_FALSE(HasMenuItemWithLabel(usc_icon, "Lock to Launcher"));
 }
 
 TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemUnLockFromLauncher)
 {
   bool forgot = false;
-  mock_icon->position_forgot.connect([&forgot] {forgot = true;});
-  mock_icon->Stick();
+  usc_icon->position_forgot.connect([&forgot] {forgot = true;});
+  usc_icon->Stick();
 
-  auto const& menu_item = GetMenuItemWithLabel(mock_icon, "Unlock from Launcher");
+  auto const& menu_item = GetMenuItemWithLabel(usc_icon, "Unlock from Launcher");
   ASSERT_NE(menu_item, nullptr);
 
-  EXPECT_CALL(*mock_icon, UnStick());
+  EXPECT_CALL(*usc_icon, UnStick());
   dbusmenu_menuitem_handle_event(menu_item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, 0);
 
   EXPECT_TRUE(forgot);
-  EXPECT_FALSE(mock_app->sticky());
-  EXPECT_FALSE(mock_icon->IsSticky());
+  EXPECT_FALSE(usc_app->sticky());
+  EXPECT_FALSE(usc_icon->IsSticky());
 }
 
 TEST_F(TestApplicationLauncherIcon, QuicklistMenuHasNotQuit)

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2013-06-10 16:10:27 +0000
+++ tests/test_launcher.cpp	2013-08-09 12:10:05 +0000
@@ -205,7 +205,7 @@
       .WillRepeatedly(Return(false));
 
   launcher_->DndStarted("");
-  Utils::WaitForTimeout(1);
+  Utils::WaitPendingEvents();
 
   EXPECT_FALSE(first->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
   EXPECT_FALSE(second->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
@@ -330,7 +330,7 @@
   launcher_->HideDragWindow();
 
   // Let's wait the drag icon animation to be completed
-  Utils::WaitForTimeout(1);
+  Utils::WaitPendingEvents();
   EXPECT_EQ(launcher_->GetDraggedIcon(), nullptr);
 }
 
@@ -367,7 +367,7 @@
   EXPECT_TRUE(model_saved);
 
   // Let's wait the drag icon animation to be completed
-  Utils::WaitForTimeout(1);
+  Utils::WaitUntilMSec([this] { return launcher_->GetDraggedIcon(); }, false, 2000);
   EXPECT_EQ(launcher_->GetDraggedIcon(), nullptr);
 }
 
@@ -411,7 +411,7 @@
   EXPECT_FALSE(model_saved);
 
   // Let's wait the drag icon animation to be completed
-  Utils::WaitForTimeout(1);
+  Utils::WaitUntilMSec([this] { return launcher_->GetDraggedIcon(); }, false, 2000);
   EXPECT_EQ(launcher_->GetDraggedIcon(), nullptr);
 }
 

=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2013-08-05 08:02:47 +0000
+++ tests/test_software_center_launcher_icon.cpp	2013-08-09 12:10:05 +0000
@@ -158,7 +158,7 @@
   bool saved = false;
   usc->sticky = true;
   icon.position_saved.connect([&saved] {saved = true;});
-  ASSERT_TRUE(icon.IsSticky());
+  ASSERT_FALSE(icon.IsSticky());
 
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
   ASSERT_TRUE(icon.IsSticky());

=== modified file 'unity-shared/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	2013-07-31 01:15:14 +0000
+++ unity-shared/ApplicationManager.h	2013-08-09 12:10:05 +0000
@@ -89,6 +89,8 @@
   // Calls quit on all the Windows for this application.
   virtual void Quit() const = 0;
 
+  virtual bool CreateLocalDesktopFile() 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-07-31 01:15:14 +0000
+++ unity-shared/BamfApplicationManager.cpp	2013-08-09 12:10:05 +0000
@@ -454,6 +454,17 @@
   }
 }
 
+bool Application::CreateLocalDesktopFile() const
+{
+  if (!desktop_file().empty())
+    return false;
+
+  glib::Object<BamfControl> control(bamf_control_get_default());
+  bamf_control_create_local_desktop_file(control, bamf_app_);
+
+  return true;
+}
+
 bool Application::GetSeen() const
 {
   return g_object_get_qdata(glib::object_cast<GObject>(bamf_app_),

=== modified file 'unity-shared/BamfApplicationManager.h'
--- unity-shared/BamfApplicationManager.h	2013-07-31 01:15:14 +0000
+++ unity-shared/BamfApplicationManager.h	2013-08-09 12:10:05 +0000
@@ -124,6 +124,8 @@
 
   virtual void Quit() const;
 
+  virtual bool CreateLocalDesktopFile() const;
+
   virtual std::string repr() const;
 
 private: // Property getters and setters

=== modified file 'unity-shared/StandaloneAppManager.cpp'
--- unity-shared/StandaloneAppManager.cpp	2013-01-17 14:09:35 +0000
+++ unity-shared/StandaloneAppManager.cpp	2013-08-09 12:10:05 +0000
@@ -75,28 +75,38 @@
     return;
   }
   std::string app_name = app->title();
-  app->visible.changed.connect([app_name](bool const& value) {
+  app->title.changed.connect([&app_name](std::string const& value) {
+    cout << app_name << " changed name to: " << value << endl;
+    app_name = value;
+  });
+  app->icon.changed.connect([&app_name](std::string const& value) {
+    cout << app_name << " icon changed: " << value << endl;
+  });
+  app->desktop_file.changed.connect([&app_name](std::string const& value) {
+    cout << app_name << " desktop file changed: " << value << endl;
+  });
+  app->visible.changed.connect([&app_name](bool value) {
     cout << app_name << " visibility changed: " << (value ? "yes" : "no") << endl;
   });
-  app->running.changed.connect([app_name](bool const& value) {
+  app->running.changed.connect([&app_name](bool value) {
     cout << app_name << " running changed: " << (value ? "yes" : "no") << endl;
   });
-  app->active.changed.connect([app_name](bool const& value) {
+  app->active.changed.connect([&app_name](bool value) {
     cout << app_name << " active changed: " << (value ? "yes" : "no") << endl;
   });
-  app->urgent.changed.connect([app_name](bool const& value) {
+  app->urgent.changed.connect([&app_name](bool value) {
     cout << app_name << " urgent changed: " << (value ? "yes" : "no") << endl;
   });
-  app->closed.connect([app_name]() {
+  app->closed.connect([&app_name]() {
     cout << app_name << " closed." << endl;
   });
-  app->window_opened.connect([app_name](ApplicationWindow const& window) {
+  app->window_opened.connect([&app_name](ApplicationWindow const& window) {
     cout << "** " << app_name << " window opened: " << window.title() << endl;
   });
-  app->window_closed.connect([app_name]() {
+  app->window_closed.connect([&app_name]() {
     cout << "** " << app_name << " window closed" << endl;
   });
-  app->window_moved.connect([app_name](ApplicationWindow const& window) {
+  app->window_moved.connect([&app_name](ApplicationWindow const& window) {
     cout << "** " << app_name << " window moved: " << window.title() << endl;
   });
   app->seen = true;
@@ -195,7 +205,7 @@
 
   ApplicationList apps = manager.GetRunningApplications();
 
-  for (auto app : apps)
+  for (auto const& app : apps)
   {
     dump_app(app);
     connect_events(app);