Merge lp:~gordallott/unity/fixes-18-04-11 into lp:unity

[Gord Allott]

fixes linked bugs

[Didier Roche-Tolomelli (didrocks)]

Approved!

review: Approve

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-04-14 14:29:40 +0000
+++ src/LauncherIcon.cpp	2011-04-18 17:37:35 +0000
@@ -138,6 +138,9 @@
     _superkey_label->UnReference ();
 
   // clean up the whole signal-callback mess
+  if (needs_redraw_connection.connected ())
+    needs_redraw_connection.disconnect ();
+    
   if (on_icon_added_connection.connected ())
     on_icon_added_connection.disconnect ();
 
 
=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-04-15 09:49:41 +0000
+++ src/PlacesView.cpp	2011-04-18 17:37:35 +0000
@@ -147,6 +147,9 @@
 PlacesView::~PlacesView ()
 {
   UBusServer* ubus = ubus_server_get_default ();
+  if (_home_button_hover > 0)
+  	ubus_server_unregister_interest (ubus, _home_button_hover);
+  	
   for (unsigned int i = 0; i < G_N_ELEMENTS (_ubus_handles); i++)
   {
     if (_ubus_handles[i] != 0)