talons

commit e023845d7d4aec699f995eb72c93812a53785fd0
parent aaef7fdda9d630c029088b0acd48cde8ece0b841
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  3 Jan 2012 19:43:51 +0000

2012-01-03 [colin]	3.8.0cvs10

	* src/gtk/gtkcmctree.c
		Revert previous patch, it's buggy on headers

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkcmctree.c
 | 
6
------

4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-03 [colin]	3.8.0cvs10
+
+	* src/gtk/gtkcmctree.c
+		Revert previous patch, it's buggy on headers
+
 2012-01-03 [colin]	3.8.0cvs9
 
 	* src/gtk/gtkcmctree.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4326,3 +4326,4 @@
 ( cvs diff -u -r 1.105.2.171 -r 1.105.2.172 src/prefs_account.c;  ) > 3.8.0cvs7.patchset
 ( cvs diff -u -r 1.382.2.597 -r 1.382.2.598 src/compose.c;  cvs diff -u -r 1.50.2.64 -r 1.50.2.65 src/compose.h;  cvs diff -u -r 1.115.2.244 -r 1.115.2.245 src/main.c;  cvs diff -u -r 1.83.2.186 -r 1.83.2.187 src/mimeview.c;  ) > 3.8.0cvs8.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs9.patchset
+( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs10.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -854,12 +854,9 @@ draw_row (GtkCMCList     *clist,
 		  if (layout)
 		    {
 		      gint row_center_offset = (clist->row_height - logical_rect.height) / 2;
-		      gdk_cairo_rectangle(cr, &clip_rectangle);
-		      cairo_clip(cr);
 		      gdk_cairo_set_source_color(cr, fgcolor);
 		      cairo_move_to(cr, offset, row_rectangle.y + row_center_offset + clist_row->cell[i].vertical);
 		      pango_cairo_show_layout(cr, layout);
-		      cairo_reset_clip(cr);
 		      g_object_unref (G_OBJECT (layout));
 		    }
 		  break;
@@ -925,12 +922,9 @@ draw_row (GtkCMCList     *clist,
 		offset += GTK_CMCELL_PIXTEXT (clist_row->cell[i])->spacing;
 	    }
 	  
-	  gdk_cairo_rectangle(cr, &clip_rectangle);
-	  cairo_clip(cr);
 	  cairo_move_to(cr, offset, row_rectangle.y + row_center_offset + clist_row->cell[i].vertical);
 	  gdk_cairo_set_source_color(cr, fgcolor);
 	  pango_cairo_show_layout(cr, layout);
-	  cairo_reset_clip(cr);
           g_object_unref (G_OBJECT (layout));
 	}
     }