Merge lp:~azzar1/unity/fix-994163-5.0 into lp:unity/5.0

[Andrea Azzarone]

Backport lp:~andyrock/unity/fix-994163

== Problem ==
Unity launcher shows internal partitions after they have been unmounted

== Fix ==
Use "changed" signal instead of "mount-added"/"mount-removed".

== Test ==
Manual test

[Łukasz Zemczak (sil2100)]

Works for me.

review: Approve

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-04-26 05:56:55 +0000
+++ manual-tests/Launcher.txt	2012-06-22 17:27:18 +0000
@@ -540,3 +540,19 @@
 
 Expected Results:
  * Terminal window will be raised to the top of the stack (over the GIMP window)
+
+
+Test launcher removes device icons
+------------------------------------------------------------
+This test makes sure that Unity doesn't shows internal partitions after
+they have been unmounted.
+
+Actions:
+ * Open Nautilus
+ * Mount an internal partition using the sidebar
+ * Make sure the launcher has the launcher icon for the partition
+ * Unmount that partition using Nautilus
+
+Expected Results:
+ * The device launcher icon has been removed.
+
 
=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.cpp'
--- plugins/unityshell/src/DeviceLauncherIcon.cpp	2012-04-24 18:22:48 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.cpp	2012-06-22 17:27:18 +0000
@@ -40,6 +40,7 @@
 nux::logging::Logger logger("unity.launcher");
 
 GduDevice* get_device_for_device_file (const gchar *device_file);
+const unsigned int volume_changed_timeout =  500;
 
 }
 
@@ -49,6 +50,8 @@
   , device_file_(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE))
   , gdu_device_(get_device_for_device_file(device_file_))
 {
+  signal_volume_changed_.Connect(volume, "changed", sigc::mem_fun(this, &DeviceLauncherIcon::OnVolumeChanged));
+
   DevicesSettings::GetDefault().changed.connect(sigc::mem_fun(this, &DeviceLauncherIcon::OnSettingsChanged));
 
   // Checks if in favourites!
@@ -62,6 +65,55 @@
   UpdateVisibility();
 }
 
+DeviceLauncherIcon::~DeviceLauncherIcon()
+{
+  if (changed_timeout_ > 0)
+    g_source_remove(changed_timeout_);
+}
+
+void DeviceLauncherIcon::OnVolumeChanged(GVolume* volume)
+{
+  if (!G_IS_VOLUME(volume))
+    return;
+
+  if (changed_timeout_ > 0)
+    g_source_remove(changed_timeout_);
+  changed_timeout_ = g_timeout_add(volume_changed_timeout, &DeviceLauncherIcon::OnVolumeChangedTimeout, this);
+}
+
+gboolean DeviceLauncherIcon::OnVolumeChangedTimeout(gpointer data)
+{
+  DeviceLauncherIcon* self = static_cast<DeviceLauncherIcon*>(data);
+
+  self->UpdateDeviceIcon();
+  self->UpdateVisibility();
+  return FALSE;
+}
+
+void DeviceLauncherIcon::UpdateVisibility()
+{
+  switch (DevicesSettings::GetDefault().GetDevicesOption())
+  {
+    case DevicesSettings::NEVER:
+      SetQuirk(QUIRK_VISIBLE, false);
+      break;
+    case DevicesSettings::ONLY_MOUNTED:
+      if (keep_in_launcher_)
+      {
+        SetQuirk(QUIRK_VISIBLE, true);
+      }
+      else
+      {
+        glib::Object<GMount> mount(g_volume_get_mount(volume_));
+        SetQuirk(QUIRK_VISIBLE, mount);
+      }
+      break;
+    case DevicesSettings::ALWAYS:
+      SetQuirk(QUIRK_VISIBLE, true);
+      break;
+  }
+}
+
 void DeviceLauncherIcon::UpdateDeviceIcon()
 {
   name_ = glib::String(g_volume_get_name(volume_)).Str();
@@ -440,34 +492,6 @@
                NULL);
 }
 
-void DeviceLauncherIcon::UpdateVisibility(int visibility)
-{
-  switch (DevicesSettings::GetDefault().GetDevicesOption())
-  {
-    case DevicesSettings::NEVER:
-      SetQuirk(QUIRK_VISIBLE, false);
-      break;
-    case DevicesSettings::ONLY_MOUNTED:
-      if (keep_in_launcher_)
-      {
-        SetQuirk(QUIRK_VISIBLE, true);
-      }
-      else if (visibility < 0)
-      {
-        glib::Object<GMount> mount(g_volume_get_mount(volume_));
-        SetQuirk(QUIRK_VISIBLE, mount.RawPtr() != NULL);
-      }
-      else
-      {
-        SetQuirk(QUIRK_VISIBLE, visibility);
-      }
-      break;
-    case DevicesSettings::ALWAYS:
-      SetQuirk(QUIRK_VISIBLE, true);
-      break;
-  }
-}
-
 void DeviceLauncherIcon::OnSettingsChanged()
 {
   // Checks if in favourites!
 
=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.h'
--- plugins/unityshell/src/DeviceLauncherIcon.h	2012-04-24 18:22:48 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.h	2012-06-22 17:27:18 +0000
@@ -25,6 +25,8 @@
 G_BEGIN_DECLS
 #include <gdu/gdu.h>
 #include <UnityCore/GLibWrapper.h>
+#include <UnityCore/GLibSignal.h>
+
 #include "SimpleLauncherIcon.h"
 
 namespace unity
@@ -37,18 +39,19 @@
 
 public:
   DeviceLauncherIcon(glib::Object<GVolume> const& volume);
+  ~DeviceLauncherIcon();
 
-  void UpdateVisibility(int visibility = -1);
   void OnRemoved();
   bool CanEject();
   void Eject();
 
 protected:
   std::list<DbusmenuMenuitem*> GetMenus();
+  std::string GetName() const;
+
+private:
+  void UpdateVisibility();
   void UpdateDeviceIcon();
-  std::string GetName() const;
-
-private:
   void ActivateLauncherIcon(ActionArg arg);
   void ShowMount(GMount* mount);
   void Unmount();
@@ -63,10 +66,14 @@
   static void OnEjectReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
   static void OnUnmountReady(GObject* object, GAsyncResult* result, DeviceLauncherIcon* self);
   static void OnDriveStop(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
+  static gboolean OnVolumeChangedTimeout(gpointer data);
+  void OnVolumeChanged(GVolume* volume);
   void OnSettingsChanged();
   void ShowNotification(std::string const&, unsigned, GdkPixbuf*, std::string const&);
 
 private:
+  glib::Signal<void, GVolume*> signal_volume_changed_;
+  guint changed_timeout_;
   glib::Object<GVolume> volume_;
   glib::String device_file_;
   std::string name_;
 
=== modified file 'plugins/unityshell/src/DeviceLauncherSection.cpp'
--- plugins/unityshell/src/DeviceLauncherSection.cpp	2012-04-24 18:46:07 +0000
+++ plugins/unityshell/src/DeviceLauncherSection.cpp	2012-06-22 17:27:18 +0000
@@ -30,10 +30,6 @@
   sig_manager_.Add(new VolumeSignal(monitor_, "volume-added", sigc::mem_fun(this, &DeviceLauncherSection::OnVolumeAdded)));
   sig_manager_.Add(new VolumeSignal(monitor_, "volume-removed", sigc::mem_fun(this, &DeviceLauncherSection::OnVolumeRemoved)));
 
-  typedef glib::Signal<void, GVolumeMonitor*, GMount*> MountSignal;
-  sig_manager_.Add(new MountSignal(monitor_, "mount-added", sigc::mem_fun(this, &DeviceLauncherSection::OnMountAdded)));
-  sig_manager_.Add(new MountSignal(monitor_, "mount-pre-unmount", sigc::mem_fun(this, &DeviceLauncherSection::OnMountPreUnmount)));
-
   on_device_populate_entry_id_ = g_idle_add([] (gpointer data) {
     auto self = static_cast<DeviceLauncherSection*>(data);
     self->PopulateEntries();
@@ -96,31 +92,5 @@
   }
 }
 
-/* Keep in mind: we could have a GMount without a related GVolume
- * so check everything to avoid unwanted behaviors.
- */
-void DeviceLauncherSection::OnMountAdded(GVolumeMonitor* monitor, GMount* mount)
-{
-  glib::Object<GVolume> volume(g_mount_get_volume(mount));
-
-  auto volume_it = map_.find(volume);
-
-  if (volume_it != map_.end())
-    volume_it->second->UpdateVisibility(1);
-}
-
-/* We don't use "mount-removed" signal since it is received after "volume-removed"
- * signal. You should read also the comment above.
- */
-void DeviceLauncherSection::OnMountPreUnmount(GVolumeMonitor* monitor, GMount* mount)
-{
-  glib::Object<GVolume> volume(g_mount_get_volume(mount));
-
-  auto volume_it = map_.find(volume);
-
-  if (volume_it != map_.end())
-    volume_it->second->UpdateVisibility(0);
-}
-
 } // namespace launcher
 } // namespace unity
 
=== modified file 'plugins/unityshell/src/DeviceLauncherSection.h'
--- plugins/unityshell/src/DeviceLauncherSection.h	2012-04-24 18:46:07 +0000
+++ plugins/unityshell/src/DeviceLauncherSection.h	2012-06-22 17:27:18 +0000
@@ -50,8 +50,6 @@
 
   void OnVolumeAdded(GVolumeMonitor* monitor, GVolume* volume);
   void OnVolumeRemoved(GVolumeMonitor* monitor, GVolume* volume);
-  void OnMountAdded(GVolumeMonitor* monitor, GMount* mount);
-  void OnMountPreUnmount(GVolumeMonitor* monitor, GMount* mount);
 
 private:
   glib::SignalManager sig_manager_;