Merge lp:~marcobiscaro2112/unity/fixes-748299 into lp:unity

[Marco Biscaro]

Since commit 1032, the method ActivateLauncherIcon is called from LauncherIcon.cpp (so, there is no need to call it again on DeviceLauncherIcon.cpp).

[Didier Roche-Tolomelli (didrocks)]

Approved! code looks good

review: Approve

=== modified file 'src/DeviceLauncherIcon.cpp'
--- src/DeviceLauncherIcon.cpp	2011-03-29 15:24:14 +0000
+++ src/DeviceLauncherIcon.cpp	2011-04-09 23:55:46 +0000
@@ -104,17 +104,6 @@
   return nux::Color (0xFF333333);
 }
 
-void
-DeviceLauncherIcon::OnMouseClick (int button)
-{
-  SimpleLauncherIcon::OnMouseClick (button);
-
-  if (button == 1)
-  {
-    ActivateLauncherIcon ();
-  }
-}
-
 std::list<DbusmenuMenuitem *>
 DeviceLauncherIcon::GetMenus ()
 {
 
=== modified file 'src/DeviceLauncherIcon.h'
--- src/DeviceLauncherIcon.h	2011-03-29 14:36:45 +0000
+++ src/DeviceLauncherIcon.h	2011-04-09 23:55:46 +0000
@@ -37,7 +37,6 @@
   void UpdateVisibility ();
 
 protected:
-  void OnMouseClick (int button);
   std::list<DbusmenuMenuitem *> GetMenus ();
   void UpdateDeviceIcon ();