diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gdk/gdkwindow.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gdk/gdkwindow.c')
| -rw-r--r-- | gdk/gdkwindow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 0853375316..236be0a1ca 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -3661,7 +3661,7 @@ setup_backing_rect (GdkWindow *window, GdkWindowPaint *paint, int x_offset_cairo { GdkWindowObject *private = (GdkWindowObject *) window; GdkWindowObject *bg_private; - cairo_pattern_t *pattern; + cairo_pattern_t *pattern = NULL; int x_offset = 0, y_offset = 0; cairo_t *cr; |