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

Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 252
Merged at revision: 251
Proposed branch: lp:~cimi/overlay-scrollbar/fix-region-destroy-on-dispose
Merge into: lp:overlay-scrollbar
Diff against target: 34 lines (+10/-8)
1 file modified
os/os-scrollbar.c (+10/-8)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/fix-region-destroy-on-dispose
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+64569@code.launchpad.net

Description of the change

Call cairo_region_destroy only when the glist of scrollbar pointers is NULL

To post a comment you must log in.
252. By Andrea Cimitan

help debugging by setting the pointer to NULL after destroying os_workarea

Revision history for this message
Ted Gould (ted) wrote :

Woot! Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2011-06-14 15:50:30 +0000
3+++ os/os-scrollbar.c 2011-06-14 16:39:28 +0000
4@@ -2213,8 +2213,16 @@
5 os_root_list = g_list_remove (os_root_list, scrollbar);
6
7 if (os_root_list == NULL)
8- gdk_window_remove_filter (gdk_get_default_root_window (),
9- root_filter_func, NULL);
10+ {
11+ if (os_workarea != NULL)
12+ {
13+ cairo_region_destroy (os_workarea);
14+ os_workarea = NULL;
15+ }
16+
17+ gdk_window_remove_filter (gdk_get_default_root_window (),
18+ root_filter_func, NULL);
19+ }
20
21 if (priv->pager != NULL)
22 {
23@@ -2228,12 +2236,6 @@
24 priv->window_group = NULL;
25 }
26
27- if (os_workarea != NULL)
28- {
29- cairo_region_destroy (os_workarea);
30- os_workarea = NULL;
31- }
32-
33 swap_adjustment (scrollbar, NULL);
34 swap_thumb (scrollbar, NULL);
35

Subscribers

People subscribed via source and target branches