Merge lp:~cimi/overlay-scrollbar/fix-region-destroy-on-dispose into lp:overlay-scrollbar

[Andrea Cimitan]

Call cairo_region_destroy only when the glist of scrollbar pointers is NULL

[lp:~cimi/overlay-scrollbar/fix-region-destroy-on-dispose]

252. By Andrea Cimitan on 2011-06-14

help debugging by setting the pointer to NULL after destroying os_workarea

[Ted Gould (ted)]

Woot! Thanks!

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-06-14 15:50:30 +0000
+++ os/os-scrollbar.c	2011-06-14 16:39:28 +0000
@@ -2213,8 +2213,16 @@
   os_root_list = g_list_remove (os_root_list, scrollbar);
 
   if (os_root_list == NULL)
-    gdk_window_remove_filter (gdk_get_default_root_window (),
-                              root_filter_func, NULL);
+    {
+      if (os_workarea != NULL)
+        {
+          cairo_region_destroy (os_workarea);
+          os_workarea = NULL;
+        }
+
+      gdk_window_remove_filter (gdk_get_default_root_window (),
+                                root_filter_func, NULL);
+    }
 
   if (priv->pager != NULL)
     {
@@ -2228,12 +2236,6 @@
       priv->window_group = NULL;
     }
 
-  if (os_workarea != NULL)
-    {
-      cairo_region_destroy (os_workarea);
-      os_workarea = NULL;
-    }
-
   swap_adjustment (scrollbar, NULL);
   swap_thumb (scrollbar, NULL);