Merge lp:~cimi/overlay-scrollbar/fix-907111 into lp:overlay-scrollbar

[Andrea Cimitan]

Fix 907111 by removing the timeout on dispose, how come I didn't notice this before?

[Charles Kerr (charlesk)]

Looks good.

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-03-21 13:12:10 +0000
+++ os/os-scrollbar.c	2012-03-21 13:37:18 +0000
@@ -3191,6 +3191,12 @@
       priv->source_hide_thumb_id = 0;
     }
 
+  if (priv->source_show_thumb_id != 0)
+    {
+      g_source_remove (priv->source_show_thumb_id);
+      priv->source_show_thumb_id = 0;
+    }
+
   if (priv->source_unlock_thumb_id != 0)
     {
       g_source_remove (priv->source_unlock_thumb_id);