diff --git a/ChangeLog b/ChangeLog index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f83857f45b..2aa81d2cce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Nov 28 20:05:44 2001 Owen Taylor + + * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove + improper use of g_locale_to_utf8() to convert from + latin-1, and do it the easy way by building the string + correctly in the first place. + Wed Nov 28 19:34:15 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get): diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index b3721e1c4c..2b6513baa6 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -533,7 +533,7 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label) g_string_append (gstring, "Backslash"); break; default: - g_string_append_c (gstring, toupper (key->accel_key)); + g_string_append_unichar (gstring, toupper (key->accel_key)); break; } } @@ -558,13 +558,6 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label) if (!accel_label->accel_string) accel_label->accel_string = g_strdup (""); - utf8 = g_locale_to_utf8 (accel_label->accel_string, -1, NULL, NULL, NULL); - if (utf8) - { - g_free (accel_label->accel_string); - accel_label->accel_string = utf8; - } - if (accel_label->queue_id) { gtk_idle_remove (accel_label->queue_id);