corrected a brace position (Damon Chaplin), which i got wrong when

Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
                (Damon Chaplin), which i got wrong when applying Damon's patch the last
                        time.

diff --git a/ChangeLog b/ChangeLog
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index eb9899ccae5bd57ce61825fad6041b985c707c6b..a580d7703bddebc0f8d2fc6d8ae1aa5ce845328b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Apr 15 05:13:09 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position
+       (Damon Chaplin), which i got wrong when applying Damon's patch the last
+       time.
+
 1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
        * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 397b546c1ce4e6e4d424d0681985446e6609ffd8..7bd3687c767cb2af95317c7052fe46d9d86b1c1b 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -268,7 +268,7 @@ gtk_label_size_request (GtkWidget      *widget,
          width = MAX (width,
                        gdk_text_width (GTK_WIDGET (label)->style->font,
                                       row->data,
-                                       (gchar*) row->next->data - (gchar*) row->data) - 1);
+                                       (gchar*) row->next->data - (gchar*) row->data - 1));
       else
         width = MAX (width, gdk_string_width (GTK_WIDGET (label)->style->font, row->data));
       row = row->next;