Merge lp:~unity-team/unity/unity.fix-742110 into lp:unity

[Mirco Müller]

Storing connection-objects for all sigc-signal-handers being connected in constructor, so they the can be cleanly disconnected upon object destruction.

[Mikkel Kamstrup Erlandsen (kamstrup)]

 review approve

review: Approve

=== modified file 'src/SimpleLauncherIcon.cpp'
--- src/SimpleLauncherIcon.cpp	2011-03-24 10:16:40 +0000
+++ src/SimpleLauncherIcon.cpp	2011-03-28 10:08:32 +0000
@@ -30,12 +30,12 @@
 {
   m_Icon = 0;
   m_IconName = 0;
-  
-  LauncherIcon::MouseDown.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseDown));
-  LauncherIcon::MouseUp.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseUp));
-  LauncherIcon::MouseClick.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseClick));
-  LauncherIcon::MouseEnter.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseEnter));
-  LauncherIcon::MouseLeave.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseLeave));
+
+  _on_mouse_down_connection = (sigc::connection) LauncherIcon::MouseDown.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseDown));
+  _on_mouse_up_connection = (sigc::connection) LauncherIcon::MouseUp.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseUp));
+  _on_mouse_click_connection = (sigc::connection) LauncherIcon::MouseClick.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseClick));
+  _on_mouse_enter_connection = (sigc::connection) LauncherIcon::MouseEnter.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseEnter));
+  _on_mouse_leave_connection = (sigc::connection) LauncherIcon::MouseLeave.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseLeave));
 
   _theme_changed_id = g_signal_connect (gtk_icon_theme_get_default (), "changed",
                                         G_CALLBACK (SimpleLauncherIcon::OnIconThemeChanged), this);
@@ -43,6 +43,12 @@
 
 SimpleLauncherIcon::~SimpleLauncherIcon()
 {
+  _on_mouse_down_connection.disconnect ();
+  _on_mouse_up_connection.disconnect ();
+  _on_mouse_click_connection.disconnect ();
+  _on_mouse_enter_connection.disconnect ();
+  _on_mouse_leave_connection.disconnect ();
+
   if (m_Icon)
     m_Icon->UnReference ();
 

=== modified file 'src/SimpleLauncherIcon.h'
--- src/SimpleLauncherIcon.h	2011-03-24 10:16:40 +0000
+++ src/SimpleLauncherIcon.h	2011-03-28 10:08:32 +0000
@@ -43,12 +43,18 @@
     virtual void OnMouseLeave ();
 
 private:
-    
+
     char *m_IconName;
     nux::BaseTexture *m_Icon;
     void ActivateLauncherIcon ();
     static void OnIconThemeChanged (GtkIconTheme* icon_theme, gpointer data);
     guint32 _theme_changed_id;
+
+    sigc::connection _on_mouse_down_connection;
+    sigc::connection _on_mouse_up_connection;
+    sigc::connection _on_mouse_click_connection;
+    sigc::connection _on_mouse_enter_connection;
+    sigc::connection _on_mouse_leave_connection;
 };
 
 #endif // SIMPLELAUNCHERICON_H