Merge lp:~bilalakhtar/unity/sd-card-stop-device-960910 into lp:unity

[Bilal Akhtar]

SD cards can now be stopped if their DeviceLauncherIcon is dragged into Trash. Fixes bug #960910 .

[Tim Penhey (thumper)]

Test? I think a manual test would be needed here.

review: Needs Fixing

=== modified file 'launcher/DeviceLauncherIcon.cpp'
--- launcher/DeviceLauncherIcon.cpp	2012-06-21 06:55:53 +0000
+++ launcher/DeviceLauncherIcon.cpp	2012-08-08 15:14:22 +0000
@@ -119,6 +119,12 @@
   return g_volume_can_eject(volume_);
 }
 
+bool
+DeviceLauncherIcon::CanStop()
+{
+  return g_drive_can_stop(g_volume_get_drive(volume_));
+}
+
 std::list<DbusmenuMenuitem*> DeviceLauncherIcon::GetMenus()
 {
   std::list<DbusmenuMenuitem*> result;
 
=== modified file 'launcher/DeviceLauncherIcon.h'
--- launcher/DeviceLauncherIcon.h	2012-07-18 16:06:32 +0000
+++ launcher/DeviceLauncherIcon.h	2012-08-08 15:14:22 +0000
@@ -40,7 +40,9 @@
 
   void OnRemoved();
   bool CanEject();
+  bool CanStop();
   void Eject();
+  void StopDrive();
 
 protected:
   std::list<DbusmenuMenuitem*> GetMenus();
@@ -52,7 +54,6 @@
   void ActivateLauncherIcon(ActionArg arg);
   void ShowMount(GMount* mount);
   void Unmount();
-  void StopDrive();
   static void OnTogglePin(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
   static void OnOpen(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
   static void OnEject(DbusmenuMenuitem* item, int time, DeviceLauncherIcon* self);
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-08-03 11:58:29 +0000
+++ launcher/LauncherController.cpp	2012-08-08 15:14:22 +0000
@@ -428,6 +428,8 @@
 
       if (device_icon && device_icon->CanEject())
         device_icon->Eject();
+      else if (device_icon && device_icon->CanStop())
+        device_icon->StopDrive();
 
       break;
     }
 
=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-08-03 13:43:50 +0000
+++ manual-tests/Launcher.txt	2012-08-08 15:14:22 +0000
@@ -679,3 +679,19 @@
  * No icon flickers near the top panel.
  * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.
 
+
+Stop SD card by dragging it's icon to trash
+---------------------------------------------------
+
+Setup:
+ * Have an SD Card reader and an SD Card
+
+Actions:
+ * Insert the SD card into the SD card reader.
+ * Wait for the SD card to mount.
+ * Drag and drop the SD card icon into the trash.
+
+Expected result:
+ * The SD card launcher icon appears in the launcher after the SD card is mounted
+ * After the icon is dragged into the trash, the SD card is "stopped"
+ * A notification appears, stating that the SD card has been stopped.