Merge lp:~uriboni/unity-2d/launcher-eject-with-ui-if-blocked into lp:unity-2d/3.0

[Ugo Riboni]

[launcher] Make sure that when unmounting/ejecting a device Gnome pops up the dialog informing the user about which applications are holding the device busy preventing the eject.

Make sure that when unmounting/ejecting a device Gnome pops up the dialog informing the user about which applications are holding the device busy preventing the eject.

Note for the reviewer: there are two code paths inside LauncherDevice::eject(), but it always seems to use the first one (true), so I couldn't test with the second one, but given the docs it should work exactly in the same way.

[lp:~uriboni/unity-2d/launcher-eject-with-ui-if-blocked]

432. By Ugo Riboni on 2011-03-09

Merge changes from trunk

[Florian Boucault (fboucault)]

Looks good!

Do not use the 'mount_op' abbreviation, prefer 'mount_operation' instead. Thanks.

review: Needs Fixing (code)

[lp:~uriboni/unity-2d/launcher-eject-with-ui-if-blocked]

433. By Ugo Riboni on 2011-03-10

Rename variable to not be an abbreviation.

=== modified file 'launcher/UnityApplications/launcherdevice.cpp'
--- launcher/UnityApplications/launcherdevice.cpp	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/launcherdevice.cpp	2011-03-10 12:35:43 +0000
@@ -25,6 +25,12 @@
 #include <QDebug>
 #include <QAction>
 
+#undef signals
+extern "C" {
+    #include <gtk/gtk.h>
+}
+
+
 LauncherDevice::LauncherDevice() :
     m_volume(NULL)
 {
@@ -175,8 +181,11 @@
         return;
     }
 
+    GMountOperation *mountOperation;
+    mountOperation = gtk_mount_operation_new(NULL);
+
     if (g_volume_can_eject(m_volume)) {
-        g_volume_eject_with_operation(m_volume, G_MOUNT_UNMOUNT_NONE, NULL,
+        g_volume_eject_with_operation(m_volume, G_MOUNT_UNMOUNT_NONE, mountOperation,
             NULL, (GAsyncReadyCallback) LauncherDevice::onVolumeEjected, NULL);
     } else {
         GMount* mount = g_volume_get_mount(m_volume);
@@ -186,13 +195,15 @@
         }
 
         if (g_mount_can_unmount(mount)) {
-            g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE, NULL,
+            g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE, mountOperation,
                 NULL, (GAsyncReadyCallback) LauncherDevice::onMountUnmounted,
                 NULL);
         } else {
             g_object_unref(mount);
         }
     }
+
+    g_object_unref(mountOperation);
 }
 
 void