overlay-scrollbar

Merge lp://qastaging/~charlesk/overlay-scrollbar/lp-1199144 into lp://qastaging/overlay-scrollbar

lp-1199144
Merge into trunk

Proposed by Charles Kerr on 2013-07-08

Status:

Merged

Approved by:

Ted Gould on 2013-07-11

Approved revision:

375

Merged at revision:

375

Proposed branch:

lp://qastaging/~charlesk/overlay-scrollbar/lp-1199144

Merge into:

lp://qastaging/overlay-scrollbar

Diff against target:

99 lines (+36/-18)

1 file modified

os/os-bar.c (+36/-18)

To merge this branch:

bzr merge lp://qastaging/~charlesk/overlay-scrollbar/lp-1199144

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2013-07-08	Approve on 2013-07-11
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-08
Review via email: mp+173596@code.qastaging.launchpad.net

Commit message

in os/os-bar.c, don't leak pango_region_t and GdkRegion structs when calling gdk_window_shape_combine_region().

Description of the change

In os/os-bar.c, SHAPE_REGION is a macro that allocates a new cairo_region_t or GdkRegion (depending on gtk3 or gtk2 build). This is always used as an argument passed to gdk_window_shape_combine_region(), which does not take ownership of the region and so the temporary region structs are leaked.

This patch wraps the call in a private function os_bar_window_shape_combine_region() which frees the temporary region after calling gdk_window_shape_combine_region().