forked from AuroraMiddleware/gtk
Remove improper use of g_locale_to_utf8() to convert from latin-1, and do
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * 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.
This commit is contained in:
parent
51f1c2a73c
commit
ea644d3572
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -1,3 +1,10 @@
|
||||
Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* 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 <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkproperty-x11.c (gdk_property_change, gdk_property_get):
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user