Merge lp:~marcobiscaro2112/unity/fixes-660010 into lp:unity

[Marco Biscaro]

When a volume is added to launcher, it is verified if it has a drive.

If it does, and if this Drive can be stopped, an entry "Safely remove" is added to the launcher entry's menu.

When the "Safely remove" entry is clicked, the method g_drive_stop is called for the volume's drive.

This change fixes LP: #660010

[Neil J. Patel (njpatel)]

Nice work, approved & merged! I removed the g_debug's.

review: Approve

=== modified file 'src/DeviceLauncherIcon.cpp'
--- src/DeviceLauncherIcon.cpp	2011-02-24 14:17:13 +0000
+++ src/DeviceLauncherIcon.cpp	2011-03-06 01:32:55 +0000
@@ -104,6 +104,7 @@
 {
   std::list<DbusmenuMenuitem *>  result;
   DbusmenuMenuitem              *menu_item;
+  GDrive                        *drive;
 
   menu_item = dbusmenu_menuitem_new ();
   dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Open"));
@@ -124,6 +125,19 @@
     result.push_back (menu_item);
   }
 
+  drive = g_volume_get_drive (_volume);
+  if (drive && g_drive_can_stop (drive))
+  {
+    menu_item = dbusmenu_menuitem_new ();
+    dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Safely remove"));
+    dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
+    dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
+    g_signal_connect (menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                      G_CALLBACK (&DeviceLauncherIcon::OnDriveStop), this);
+    result.push_back (menu_item);
+    g_object_unref (drive);
+  }
+
   return result;
 }
 
@@ -262,3 +276,40 @@
 {
   self->Remove ();
 }
+
+void
+DeviceLauncherIcon::OnDriveStop (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self)
+{
+  g_debug ("%s", G_STRLOC);
+  self->StopDrive ();
+  g_debug ("%s", G_STRLOC);
+}
+
+void
+DeviceLauncherIcon::StopDrive ()
+{
+  GDrive *drive;
+
+  drive = g_volume_get_drive (_volume);
+  g_debug ("%s", G_STRLOC);
+  g_drive_stop (drive,
+                (GMountUnmountFlags)0,
+                NULL,
+                NULL,
+                (GAsyncReadyCallback)OnStopDriveReady,
+                this);
+  g_object_unref (drive);
+  g_debug ("%s", G_STRLOC);
+}
+
+void
+DeviceLauncherIcon::OnStopDriveReady (GObject *object,
+                                      GAsyncResult *result,
+                                      DeviceLauncherIcon *self)
+{
+  GDrive *drive;
+
+  drive = g_volume_get_drive (self->_volume);
+  g_drive_stop_finish (drive, result, NULL);
+  g_object_unref (drive);
+}

=== modified file 'src/DeviceLauncherIcon.h'
--- src/DeviceLauncherIcon.h	2011-02-22 13:46:36 +0000
+++ src/DeviceLauncherIcon.h	2011-03-06 01:32:55 +0000
@@ -43,11 +43,14 @@
   void ActivateLauncherIcon ();
   void ShowMount (GMount *mount);
   void Eject ();
+  void StopDrive ();
   static void OnOpen (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);
   static void OnEject (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);
   static void OnRemoved (GVolume *volume, DeviceLauncherIcon *self);
   static void OnMountReady (GObject *object, GAsyncResult *result, DeviceLauncherIcon *self);
   static void OnEjectReady (GObject *object, GAsyncResult *result, DeviceLauncherIcon *self);
+  static void OnDriveStop (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);
+  static void OnStopDriveReady (GObject *object, GAsyncResult *result, DeviceLauncherIcon *self);
 
 private:
   GVolume *_volume;