From 49680fed32fbf8fa5badfc83d3134d8da9032fac Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 17 Apr 1998 01:18:30 +0000 Subject: [PATCH] corrected a brace position (Damon Chaplin), which i got wrong when Wed Apr 15 05:13:09 1998 Tim Janik * 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. hm, first -j use... --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtklabel.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c3dabf27f1..fd50bdce56 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Apr 15 05:13:09 1998 Tim Janik + + * 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. + Wed Apr 15 20:42:46 1998 Owen Taylor * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 397b546c1c..7bd3687c76 100644 --- 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;