talons

commit aaef7fdda9d630c029088b0acd48cde8ece0b841
parent 2f2d6ca61414fcf8d53468791539107e0b40171b
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  3 Jan 2012 17:09:55 +0000

2012-01-03 [colin]	3.8.0cvs9

	* src/gtk/gtkcmctree.c
		Fix bug #2566, 'wrapped Subject not bounded'

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

4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-03 [colin]	3.8.0cvs9
+
+	* src/gtk/gtkcmctree.c
+		Fix bug #2566, 'wrapped Subject not bounded'
+
 2011-12-29 [pawel]	3.8.0cvs8
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4325,3 +4325,4 @@
 ( cvs diff -u -r 1.83.2.185 -r 1.83.2.186 src/mimeview.c;  ) > 3.8.0cvs6.patchset
 ( 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
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=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -769,7 +769,6 @@ draw_row (GtkCMCList     *clist,
 	  else
 		gdk_cairo_set_source_color(cr, &style->base[state]);
 	  cairo_fill(cr);
-
 	  layout = create_cell_layout (clist, clist_row, i);
 	  if (layout)
 	    {
@@ -855,9 +854,12 @@ 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;
@@ -923,10 +925,12 @@ 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));
 	}
     }