Merge lp:~cimi/overlay-scrollbar/unref-window-group-only-once into lp:overlay-scrollbar

[Andrea Cimitan]

As in the comment

[Ted Gould (ted)]

I'm sure this fixes the bug. But as we're starting to collect a bunch of these global variables we might start looking to put them in their own object that we could ref in each instance of the scrollbar.

review: Approve

[Andrea Cimitan (cimi)]

Makes sense Ted!
(patches are welcome :-D)

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-06-15 16:03:30 +0000
+++ os/os-scrollbar.c	2011-06-17 02:40:16 +0000
@@ -2197,6 +2197,12 @@
           os_workarea = NULL;
         }
 
+      if (priv->window_group != NULL)
+        {
+          g_object_unref (priv->window_group);
+          priv->window_group = NULL;
+        }
+
       gdk_window_remove_filter (gdk_get_default_root_window (),
                                 root_filter_func, NULL);
     }
@@ -2207,12 +2213,6 @@
       priv->pager = NULL;
     }
 
-  if (priv->window_group != NULL)
-    {
-      g_object_unref (priv->window_group);
-      priv->window_group = NULL;
-    }
-
   swap_adjustment (scrollbar, NULL);
   swap_thumb (scrollbar, NULL);