Merge lp:~vanvugt/unity/fix-887465-trunk into lp:unity

[Daniel van Vugt]

Fix SIGSEGV after SwitcherController desctruction (LP: #887465)

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

+1

review: Approve

=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2011-12-02 17:51:26 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2011-12-08 09:41:24 +0000
@@ -49,6 +49,7 @@
   bg_color_ = nux::Color(0.0, 0.0, 0.0, 0.5);
 
   UBusServer *ubus = ubus_server_get_default();
+  bg_update_handle_ =
   ubus_server_register_interest(ubus, UBUS_BACKGROUND_COLOR_CHANGED,
                                 (UBusCallback)&Controller::OnBackgroundUpdate,
                                 this);
@@ -56,6 +57,7 @@
 
 Controller::~Controller()
 {
+  ubus_server_unregister_interest(ubus_server_get_default(), bg_update_handle_);
   if (view_window_)
     view_window_->UnReference();
 }

=== modified file 'plugins/unityshell/src/SwitcherController.h'
--- plugins/unityshell/src/SwitcherController.h	2011-12-06 20:13:55 +0000
+++ plugins/unityshell/src/SwitcherController.h	2011-12-08 09:41:24 +0000
@@ -125,6 +125,7 @@
   guint detail_timer_;
   nux::Color bg_color_;
   DetailMode detail_mode_;
+  guint bg_update_handle_;
 
   static gboolean OnShowTimer(gpointer data);
   static gboolean OnDetailTimer(gpointer data);