Merge lp:~vanvugt/unity/fix-773946 into lp:unity

[Daniel van Vugt]

Added missing Unmount option to devices in the Launcher which don't have Eject or Remove options (LP: #773946)

Added missing Unmount option to devices in the Launcher. This is especially important for eSATA mounts which don't have Eject or Remove options (LP: #773946)

[Sam Spilsbury (smspillaz)]

The code for this branch looks fine.

Random question: It looks as though this would add an "unmount" option to every single drive that was in the launcher. That might need some design feedback. I understand that "unmount" is relevant to eSATA, but it's not relevant to other external mass storage devices where "unmount" and "eject" basically do the same thing for the user.

Might be worth adding a check for whether or not the drive can eject, and if not, whether or not it can unmount.

[Sam Spilsbury (smspillaz)]

review: Needs Information

[Daniel van Vugt (vanvugt)]

I thought exactly the same thing Sam and predicted that response :)

Then I realized Unmount without eject was actually useful for other drives like USB. At least useful to power-users who want to do things like unmount an auto-mounted filesystem to repartition/reformat. Then again, Disk Utility already has a button for that.

But there is the design argument that users should not be confused by being given so many options. That's understandable and I expected to be questioned on that.

[Daniel van Vugt (vanvugt)]

Hid the Unmount option in cases where Eject is available.

Avoids confusing users and makes the menu options identical to those in Nautilus.

[Gord Allott (gordallott)]

+1

review: Approve

=== modified file 'src/DeviceLauncherIcon.cpp'
--- src/DeviceLauncherIcon.cpp	2011-04-11 08:40:32 +0000
+++ src/DeviceLauncherIcon.cpp	2011-05-25 08:25:59 +0000
@@ -137,9 +137,31 @@
     g_signal_connect (menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                       G_CALLBACK (&DeviceLauncherIcon::OnDriveStop), this);
     result.push_back (menu_item);
+  }
+  if (drive)
+  {
     g_object_unref (drive);
   }
 
+  if (!g_volume_can_eject (_volume))  // Don't need Unmount if can Eject
+  {
+    GMount *mount = g_volume_get_mount (_volume);
+    if (mount && g_mount_can_unmount (mount))
+    {
+      menu_item = dbusmenu_menuitem_new ();
+      dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Unmount"));
+      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::OnUnmount), this);
+      result.push_back (menu_item);
+    }
+    if (mount)
+    {
+      g_object_unref (mount);
+    }
+  }
+
   return result;
 }
 
@@ -276,6 +298,41 @@
 }
 
 void
+DeviceLauncherIcon::OnUnmountReady (GObject            *object,
+                                    GAsyncResult       *result,
+                                    DeviceLauncherIcon *self)
+{
+  if (G_IS_MOUNT (object))
+  {
+    g_mount_unmount_with_operation_finish (G_MOUNT(object), result, NULL);
+  }
+}
+
+void
+DeviceLauncherIcon::Unmount ()
+{
+  GMount *mount = g_volume_get_mount (_volume);
+  if (mount)
+  {
+    GMountOperation *op = gtk_mount_operation_new (NULL);
+    g_mount_unmount_with_operation (mount,
+                                   (GMountUnmountFlags)0,
+                                   op,
+                                   NULL,
+                                   (GAsyncReadyCallback)OnUnmountReady,
+                                   this);
+    g_object_unref (op);
+    g_object_unref (mount);
+  }
+}
+
+void
+DeviceLauncherIcon::OnUnmount (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self)
+{
+  self->Unmount ();
+}
+
+void
 DeviceLauncherIcon::OnRemoved (GVolume *volume, DeviceLauncherIcon *self)
 {
   self->_volume = NULL;

=== modified file 'src/DeviceLauncherIcon.h'
--- src/DeviceLauncherIcon.h	2011-04-09 23:40:50 +0000
+++ src/DeviceLauncherIcon.h	2011-05-25 08:25:59 +0000
@@ -44,13 +44,16 @@
   void ActivateLauncherIcon ();
   void ShowMount (GMount *mount);
   void Eject ();
+  void Unmount ();
   void StopDrive ();
   static void OnOpen (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);
   static void OnEject (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);
+  static void OnUnmount (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);
   static void OnRemoved (GVolume *volume, DeviceLauncherIcon *self);
   static void OnChanged (GVolume *volume, DeviceLauncherIcon *self);
   static void OnMountReady (GObject *object, GAsyncResult *result, DeviceLauncherIcon *self);
   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 void OnStopDriveReady (GObject *object, GAsyncResult *result, DeviceLauncherIcon *self);
   void OnSettingsChanged (DevicesSettings *settings);