? gdk-pango-rounding1.patch
? gdk/.gdkpango.c.swp
Index: gdk/gdkpango.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkpango.c,v
retrieving revision 1.49
diff -u -p -d -r1.49 gdkpango.c
--- gdk/gdkpango.c	10 Jan 2006 16:47:37 -0000	1.49
+++ gdk/gdkpango.c	17 Feb 2006 19:14:53 -0000
@@ -1310,8 +1310,8 @@ gdk_pango_layout_get_clip_region (PangoL
       baseline = pango_layout_iter_get_baseline (iter);      
 
       line_region = gdk_pango_layout_line_get_clip_region (line,
-                                                           x_origin + logical_rect.x / PANGO_SCALE,
-                                                           y_origin + baseline / PANGO_SCALE,
+                                                           x_origin + PANGO_PIXELS (logical_rect.x),
+                                                           y_origin + PANGO_PIXELS (baseline),
                                                            index_ranges,
                                                            n_ranges);
 
Index: gtk/gtklabel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtklabel.c,v
retrieving revision 1.197
diff -u -p -d -r1.197 gtklabel.c
--- gtk/gtklabel.c	3 Feb 2006 05:37:06 -0000	1.197
+++ gtk/gtklabel.c	17 Feb 2006 19:14:53 -0000
@@ -2237,7 +2237,12 @@ get_layout_location (GtkLabel  *label,
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
     x = MAX (x, widget->allocation.x + misc->xpad);
   else
+<<<<<<< gtklabel.c
+    x = MIN (x,
+	     widget->allocation.x + widget->allocation.width - misc->xpad);
+=======
     x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
+>>>>>>> 1.197
 
   y = floor (widget->allocation.y + (gint)misc->ypad 
              + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),