Merge lp:~unity-team/unity/unity.fix_743390 into lp:unity

[Sam Spilsbury]

Remove timeout when window is destroyed

[Didier Roche-Tolomelli (didrocks)]

Approved!
If you ensure _timer_handle is set to 0 in the constructor and reset to 0 in the callback as well :)

review: Approve

=== modified file 'utouch/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
--- utouch/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2011-04-13 06:19:52 +0000
+++ utouch/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2011-04-17 07:31:22 +0000
@@ -907,6 +907,9 @@
 
 UnityMTGrabHandlesWindow::~UnityMTGrabHandlesWindow ()
 {
+    if (_timer_handle)
+	g_source_remove (_timer_handle);
+
     if (mHandles)
     {
 	UnityMTGrabHandlesScreen::get (screen)->removeHandles (mHandles);

=== modified file 'utouch/unity-mt-grab-handles/src/unity-mt-grab-handles.h'
--- utouch/unity-mt-grab-handles/src/unity-mt-grab-handles.h	2011-04-05 09:28:19 +0000
+++ utouch/unity-mt-grab-handles/src/unity-mt-grab-handles.h	2011-04-17 07:31:22 +0000
@@ -119,12 +119,11 @@
 			  CompAction::State  state,
 			  CompOption::Vector &options);
 
-  
-  bool showHandles (CompAction         *action,
+  	bool showHandles (CompAction         *action,
 			  CompAction::State  state,
 			  CompOption::Vector &options);  
 
-  bool hideHandles (CompAction         *action,
+	bool hideHandles (CompAction         *action,
 			  CompAction::State  state,
 			  CompOption::Vector &options);  
 
@@ -191,16 +190,17 @@
 		     const CompRegion &,
 		     unsigned int);
 
-  bool    handlesVisible ();
+ 	bool    handlesVisible ();
 	void    hideHandles ();
 	void    showHandles (bool use_timer);
 	void    restackHandles ();
 
-  void resetTimer ();
-  void disableTimer ();
+	void resetTimer ();
+	void disableTimer ();
+
     private:
   
-  static gboolean onHideTimeout (gpointer data);
+	static gboolean onHideTimeout (gpointer data);
 
 	Unity::MT::GrabHandleGroup *mHandles;
 	UnityMTGrabHandlesScreen *_mt_screen;