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

[Andrea Azzarone]

Quit a running application on drag and drop on trash icon.

[Sam Spilsbury (smspillaz)]

52 + BamfLauncherIcon* bamf_icon = dynamic_cast<BamfLauncherIcon*>(_drag_icon);

Ouch. Guess there's no way to work around that ?

review: Needs Information

[Andrea Azzarone (azzar1)]

> 52 + BamfLauncherIcon* bamf_icon =
> dynamic_cast<BamfLauncherIcon*>(_drag_icon);
>
> Ouch. Guess there's no way to work around that ?

Mmm, we can abstract it. I mean we can do something like that:

class LauncherIcon
{
...
virtual void OnDropOnTrash(); // Maybe we can choose a better name :)
}

then
class BamfLauncherIcon : public LauncherIcon
{
...
void OnDropOnTrash() { bla bla bla }
}

and
class DeviceLauncherIcon : public LauncherIcon
{
...
void OnDropOnTrash() { la la la la la la}
}

What do you think?

[Marco Trevisan (Treviño) (3v1n0)]

Good for me.

review: Approve

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-12-14 01:47:53 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-01-07 17:19:24 +0000
@@ -850,10 +850,15 @@
 
 void BamfLauncherIcon::OnQuit(DbusmenuMenuitem* item, int time, BamfLauncherIcon* self)
 {
+  self->Quit();
+}
+
+void BamfLauncherIcon::Quit()
+{
   GList* children, *l;
   BamfView* view;
 
-  children = bamf_view_get_children(BAMF_VIEW(self->m_App));
+  children = bamf_view_get_children(BAMF_VIEW(m_App));
 
   for (l = children; l; l = l->next)
   {

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2011-10-25 17:00:12 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2012-01-07 17:19:24 +0000
@@ -46,6 +46,7 @@
 
   const char* DesktopFile();
   bool IsSticky();
+  void Quit();
   void Stick();
   void UnStick();
 

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-12-19 20:20:22 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-01-07 17:19:24 +0000
@@ -2323,6 +2323,7 @@
       hovered_icon->SetQuirk(LauncherIcon::QUIRK_PULSE_ONCE, true);
 
       launcher_removerequest.emit(_drag_icon);
+
       _drag_window->ShowWindow(false);
       EnsureAnimation();
     }

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2011-12-20 08:35:42 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-01-07 17:19:24 +0000
@@ -272,7 +272,10 @@
       BamfLauncherIcon* bamf_icon = dynamic_cast<BamfLauncherIcon*>(icon);
 
       if (bamf_icon)
+      {
         bamf_icon->UnStick();
+        bamf_icon->Quit();
+      }
 
       break;
     }