Merge lp:~azzar1/unity/fix-764905 into lp:unity

[Andrea Azzarone]

Ejects a usb pen drive using the drag and drop to the trash. Shows a osd notification too.

[Mirco Müller (macslow)]

The strings used for the notification need to be translated. Using these hard-coded strings makes this impossible. Please fix it by using the typical _("") macro.

review: Needs Fixing

[Mirco Müller (macslow)]

Despite the needed fix the patch looks ok, works and will be approved once the requested update is committed.

[Mirco Müller (macslow)]

Sweet, thanks... approved!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-08 10:49:42 +0000
+++ CMakeLists.txt	2011-07-12 16:27:38 +0000
@@ -118,7 +118,7 @@
 #
 # Compiz Plugins
 #
-set (UNITY_PLUGIN_DEPS "compiz;nux-1.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0;sigc++-2.0")
+set (UNITY_PLUGIN_DEPS "compiz;nux-1.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0;sigc++-2.0;libnotify")
 
 find_package (Compiz REQUIRED)
 include (CompizPlugin)

=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.cpp'
--- plugins/unityshell/src/DeviceLauncherIcon.cpp	2011-05-25 08:22:35 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.cpp	2011-07-12 16:27:38 +0000
@@ -23,6 +23,7 @@
 #include "UBusMessages.h"
 
 #include <glib/gi18n-lib.h>
+#include <libnotify/notify.h>
 
 #define DEFAULT_ICON "drive-removable-media"
 
@@ -77,7 +78,7 @@
 
     icon = g_volume_get_icon (_volume);
     icon_string = g_icon_to_string (icon);
-
+    
     SetIconName (icon_string);
 
     g_object_unref (icon);
@@ -101,6 +102,12 @@
   return nux::Color (0xFF333333);
 }
 
+bool
+DeviceLauncherIcon::CanEject ()
+{
+  return g_volume_can_eject (_volume);
+}
+
 std::list<DbusmenuMenuitem *>
 DeviceLauncherIcon::GetMenus ()
 {
@@ -257,6 +264,8 @@
                name,
                error ? error->message : "Mount operation failed");
     g_error_free (error);
+    
+    g_free (name);
   }
 }
 
@@ -264,8 +273,20 @@
 DeviceLauncherIcon::OnEjectReady (GObject            *object,
                                   GAsyncResult       *result,
                                   DeviceLauncherIcon *self)
-{
-  g_volume_eject_with_operation_finish (self->_volume, result, NULL);
+{  
+  if (g_volume_eject_with_operation_finish (self->_volume, result, NULL))
+  {
+    NotifyNotification* notification;
+    gchar  *name = g_volume_get_name (self->_volume);
+    
+    notification = notify_notification_new (name,
+                                            _("The drive has been successfully ejected"),
+                                            "drive-removable-media-usb");
+  
+    notify_notification_show (notification, NULL);
+  
+    g_free (name);
+  }
 }
 
 void

=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.h'
--- plugins/unityshell/src/DeviceLauncherIcon.h	2011-05-17 06:23:36 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.h	2011-07-12 16:27:38 +0000
@@ -35,6 +35,8 @@
   virtual nux::Color BackgroundColor ();
   virtual nux::Color GlowColor ();
   void UpdateVisibility ();
+  bool CanEject ();
+  void Eject ();
 
 protected:
   std::list<DbusmenuMenuitem *> GetMenus ();
@@ -43,7 +45,6 @@
 private:
   void ActivateLauncherIcon ();
   void ShowMount (GMount *mount);
-  void Eject ();
   void Unmount ();
   void StopDrive ();
   static void OnOpen (DbusmenuMenuitem *item, int time, DeviceLauncherIcon *self);

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2011-07-10 09:53:43 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2011-07-12 16:27:38 +0000
@@ -17,6 +17,7 @@
  * Authored by: Jason Smith <[e-mail]>
  */
 
+#include "DeviceLauncherIcon.h"
 #include "FavoriteStore.h"
 #include "LauncherController.h"
 #include "LauncherIcon.h"
@@ -150,13 +151,29 @@
 void
 LauncherController::OnLauncherRemoveRequest (LauncherIcon *icon)
 {
-  BamfLauncherIcon *bamf_icon = dynamic_cast<BamfLauncherIcon *> (icon);
-  
-  // we only handle bamf Icon removal request for now.
-  if (!bamf_icon)
-    return;
-    
-  bamf_icon->UnStick ();
+  switch (icon->Type ())
+  {
+    case LauncherIcon::TYPE_APPLICATION:
+    {
+      BamfLauncherIcon *bamf_icon = dynamic_cast<BamfLauncherIcon *> (icon);
+      
+      if (bamf_icon)
+        bamf_icon->UnStick ();
+      
+      break;
+    }
+    case LauncherIcon::TYPE_DEVICE:
+    {
+      DeviceLauncherIcon *device_icon = dynamic_cast<DeviceLauncherIcon *> (icon);
+      
+      if (device_icon && device_icon->CanEject ())
+        device_icon->Eject ();
+      
+      break;
+    }
+    default:
+      break;
+  }
 }
 
 void

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-07-01 11:31:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-07-12 16:27:38 +0000
@@ -40,6 +40,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <libnotify/notify.h>
 
 #include <core/atoms.h>
 
@@ -91,6 +92,8 @@
   int (*old_handler) (Display *, XErrorEvent *);
   old_handler = XSetErrorHandler (NULL);
 
+  notify_init ("unityshell");
+
   g_thread_init (NULL);
   dbus_g_thread_init ();
 
@@ -187,6 +190,8 @@
   delete controller;
   launcher->UnReference ();
   launcherWindow->UnReference ();
+  
+  notify_uninit ();
 
   unity_a11y_finalize ();