Merge lp:~azzar1/unity/fix-unpinned-nautilus into lp:unity

[Andrea Azzarone]

Make sure file manager icon is not removed when unpinned.

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

Thanks a lot!

review: Approve

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2016-01-20 15:12:49 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2016-07-01 12:15:20 +0000
@@ -42,7 +42,6 @@
 DECLARE_LOGGER(logger, "unity.launcher.icon.application");
 
 // We use the "application-" prefix since the manager is protected, to avoid name clash
-const std::string ICON_REMOVE_TIMEOUT = "application-icon-remove";
 const std::string DEFAULT_ICON = "application-default-icon";
 
 enum MenuItemType

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2015-12-07 18:04:33 +0000
+++ launcher/ApplicationLauncherIcon.h	2016-07-01 12:15:20 +0000
@@ -54,6 +54,9 @@
   void UnStick() override;
 
 protected:
+  // This must be defined here as it's used both in ApplicationLauncherIcon and in FileManagerLauncherIcon.
+  static constexpr const char* ICON_REMOVE_TIMEOUT = "application-icon-remove";
+
   void SetApplication(ApplicationPtr const& app);
   ApplicationPtr GetApplication() const;
 

=== modified file 'launcher/FileManagerLauncherIcon.cpp'
--- launcher/FileManagerLauncherIcon.cpp	2016-02-09 10:43:42 +0000
+++ launcher/FileManagerLauncherIcon.cpp	2016-07-01 12:15:20 +0000
@@ -67,6 +67,14 @@
     icon_name = (icon.empty() ? DEFAULT_ICON : icon);
   }));
 
+  signals_conn_.Add(app_->running.changed.connect([this](bool running) {
+    LOG_DEBUG(logger) << tooltip_text() << " running now " << (running ? "true" : "false");
+
+    if (running)
+      _source_manager.Remove(ICON_REMOVE_TIMEOUT);
+  }));
+
+
   UpdateStorageWindows();
 }