[gtk+/extended-layout-jhs: 4/64] Remove some late hacking crack.

[Johannes Schmid <jhs src gnome org>]

commit bba0a5682b614e092e6da3ad5184f6ed6c337666
Author: Mathias Hasselmann <mathias hasselmann gmx de>
Date:   Wed Jun 20 05:58:35 2007 +0000

    Remove some late hacking crack.
    
    2007-06-20  Mathias Hasselmann  <mathias hasselmann gmx de>
    
    	* gtk/gtklabel.c: Remove some late hacking crack.
    
    svn path=/branches/extended-layout/; revision=18201

 ChangeLog.gtk-extended-layout |    4 ++++
 gtk/gtklabel.c                |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog.gtk-extended-layout b/ChangeLog.gtk-extended-layout
index 4e8f5fa..29ec248 100644
--- a/ChangeLog.gtk-extended-layout
+++ b/ChangeLog.gtk-extended-layout
@@ -1,5 +1,9 @@
 2007-06-20  Mathias Hasselmann  <mathias hasselmann gmx de>
 
+	* gtk/gtklabel.c: Remove some late hacking crack.
+
+2007-06-20  Mathias Hasselmann  <mathias hasselmann gmx de>
+
 	* gtk/gtklabel.c, tests/autotestextendedlayout.c,
 	tests/testextendedlayout.c, tests/Makefile.am:
 	Implementing get_baselines for GtkLabel and testing it.
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 167af0a..edf4a99 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4266,18 +4266,18 @@ gtk_label_extended_layout_get_baselines (GtkExtendedLayout  *layout,
 
   if (baselines)
     {
-      PangoRectangle ink, log;
-      gint offset, i;
+      PangoRectangle log;
       gint *baseptr;
+      gint offset;
 
       get_layout_location (label, NULL, &offset);
       offset -= GTK_WIDGET (label)->allocation.y;
 
       *baselines = baseptr = g_new (gint, num_lines);
 
-      for (i = 0; lines; ++i, lines = lines->next, ++baseptr, offset += log.height)
+      for (; lines; lines = lines->next, ++baseptr, offset += log.height)
         {
-          pango_layout_line_get_pixel_extents (lines->data, &ink, &log);
+          pango_layout_line_get_pixel_extents (lines->data, NULL, &log);
           *baseptr = offset + PANGO_ASCENT (log);
         }
     }