Fix a typo. (#168646, Vincent Untz)

2005-02-27  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c (gtk_label_size_request): Fix a typo.
	(#168646, Vincent Untz)

diff --git a/ChangeLog b/ChangeLog
index f6aebe1fd4662c27ff1d59fd945084e75dccefe0..f35e58f00a7e7a83679bff084227bc4cf3f709aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (gtk_label_size_request): Fix a typo.
+       (#168646, Vincent Untz)
+
        * gtk/gtkfilechooserdefault.c (save_folder_combo_create): 
        Unset "focus-on-click" for the save folder combo.  (#168688,
        Sven Neumann)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f6aebe1fd4662c27ff1d59fd945084e75dccefe0..f35e58f00a7e7a83679bff084227bc4cf3f709aa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-02-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (gtk_label_size_request): Fix a typo.
+       (#168646, Vincent Untz)
+
        * gtk/gtkfilechooserdefault.c (save_folder_combo_create): 
        Unset "focus-on-click" for the save folder combo.  (#168688,
        Sven Neumann)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f6aebe1fd4662c27ff1d59fd945084e75dccefe0..f35e58f00a7e7a83679bff084227bc4cf3f709aa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-02-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (gtk_label_size_request): Fix a typo.
+       (#168646, Vincent Untz)
+
        * gtk/gtkfilechooserdefault.c (save_folder_combo_create): 
        Unset "focus-on-click" for the save folder combo.  (#168688,
        Sven Neumann)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f1d2cee47a7925d2446d97aba8123345fdd58433..b0a895d6399c5a6d63f81c394923a506903a2a03 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2018,7 +2018,7 @@ gtk_label_size_request (GtkWidget      *widget,
        priv->width_chars > 0 || priv->max_width_chars > 0) && 
       aux_info && aux_info->width > 0)
     width += aux_info->width;
-  else if (label->ellipsize || priv->width_chars > 0 || priv->width_chars > 0)
+  else if (label->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0)
     {
       PangoContext *context;
       PangoFontMetrics *metrics;