talons

commit 0eb623897eb20efb61fd2de03a8bab3818066dba
parent 2a4accc81da5f080fa09b9786f8704d2c1b3cf1f
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 25 Oct 2011 16:52:00 +0000

2011-10-25 [colin]	3.7.10cvs51

	* src/stock_pixmap.c
		Fix build with gtk + 2.20

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/stock_pixmap.c
 | 
8
--------

4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-25 [colin]	3.7.10cvs51
+
+	* src/stock_pixmap.c
+		Fix build with gtk + 2.20
+
 2011-10-25 [colin]	3.7.10cvs50
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4254,3 +4254,4 @@
 ( cvs diff -u -r 1.25.2.70 -r 1.25.2.71 src/stock_pixmap.c;  ) > 3.7.10cvs48.patchset
 ( cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/gtkcmclist.c;  ) > 3.7.10cvs49.patchset
 ( cvs diff -u -r 1.382.2.587 -r 1.382.2.588 src/compose.c;  cvs diff -u -r 1.94.2.220 -r 1.94.2.221 src/messageview.c;  cvs diff -u -r 1.150.2.118 -r 1.150.2.119 src/procmsg.c;  cvs diff -u -r 1.60.2.56 -r 1.60.2.57 src/procmsg.h;  ) > 3.7.10cvs50.patchset
+( cvs diff -u -r 1.25.2.71 -r 1.25.2.72 src/stock_pixmap.c;  ) > 3.7.10cvs51.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=50
+EXTRA_VERSION=51
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -600,14 +600,6 @@ static gboolean do_pix_draw(GtkWidget *widget, cairo_t *cr,
 	} else {
 		cm_return_val_if_fail(data->base_pixbuf != NULL, FALSE);
 	}
-	cairo_pattern_t *pattern = gdk_window_get_background_pattern(drawable);
-	if (pattern == NULL)
-		pattern = gdk_window_get_background_pattern(gdk_window_get_parent(drawable));
-	
-	cairo_pattern_reference(pattern);
-	cairo_set_source(cr, pattern);
-	cairo_fill(cr);
-	cairo_pattern_destroy(pattern);
 
 	if (data->highlight) {
 		MainWindow *mw = NULL;