Merge lp:~thumper/unity/decaymulator-destructor into lp:unity

[Tim Penhey]

Make sure the decay function callback is removed on object destruction.

== The problem ==

Unity seg faults if you unplug a monitor while the pointer barrier is still decaying it's values.

== The solution ==

Add a destructor that removes the source if there is one.

== Tests ==

Not really easy to test. Not sure a manual test would help here.

UNBLOCK

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

+1

review: Approve

=== modified file 'plugins/unityshell/src/Decaymulator.cpp'
--- plugins/unityshell/src/Decaymulator.cpp	2012-01-26 03:41:33 +0000
+++ plugins/unityshell/src/Decaymulator.cpp	2012-03-23 01:00:28 +0000
@@ -21,13 +21,19 @@
 
 namespace unity {
 namespace ui {
-  
+
 Decaymulator::Decaymulator()
 {
   on_decay_handle = 0;
   value.changed.connect(sigc::mem_fun(this, &Decaymulator::OnValueChanged));
 }
 
+Decaymulator::~Decaymulator()
+{
+  if (on_decay_handle)
+    g_source_remove(on_decay_handle);
+}
+
 void Decaymulator::OnValueChanged(int value)
 {
   if (!on_decay_handle && value > 0)
@@ -49,10 +55,9 @@
     return FALSE;
   }
 
-
   self->value = self->value - partial_decay;
   return TRUE;
 }
 
 }
-}
\ No newline at end of file
+}

=== modified file 'plugins/unityshell/src/Decaymulator.h'
--- plugins/unityshell/src/Decaymulator.h	2012-01-26 03:41:33 +0000
+++ plugins/unityshell/src/Decaymulator.h	2012-03-23 01:00:28 +0000
@@ -37,6 +37,7 @@
   nux::Property<int> value;
 
   Decaymulator();
+  ~Decaymulator();
 
 private:
   void OnValueChanged(int value);
@@ -48,4 +49,4 @@
 }
 }
 
-#endif
\ No newline at end of file
+#endif