diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-04-29 01:48:02 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-04-29 01:48:02 +0800 |
| commit | 8910fc09d977dc9ae58227aad6ff7cc70a1d93bc (patch) | |
| tree | c433a94da5ffb0ba45ccccd04479b8af9f6f3523 | |
| parent | bb0d02c04bb2c09e004ba5bad2159cc3cb219672 (diff) | |
| download | gsoc2013-evolution-8910fc09d977dc9ae58227aad6ff7cc70a1d93bc.tar.gz gsoc2013-evolution-8910fc09d977dc9ae58227aad6ff7cc70a1d93bc.tar.zst gsoc2013-evolution-8910fc09d977dc9ae58227aad6ff7cc70a1d93bc.zip | |
Don't convert the label charset from UTF-8 into the locale charset.
2003-04-23 Jeffrey Stedfast <fejj@ximian.com>
* menus/gal-view-menus.c (build_menus): Don't convert the label
charset from UTF-8 into the locale charset.
svn path=/trunk/; revision=20985
| -rw-r--r-- | widgets/ChangeLog | 10 | ||||
| -rw-r--r-- | widgets/menus/gal-view-menus.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 8e4144369c..6233092a4b 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,8 +1,12 @@ -2003-04-22 Anna Dirks <anna@ximian.com> +2003-04-23 Jeffrey Stedfast <fejj@ximian.com> + + * menus/gal-view-menus.c (build_menus): Don't convert the label + charset from UTF-8 into the locale charset. - *misc/e-multi-config-dialog.c : add appropriate padding - and spacing to the settings dialog. Fixes #41392. +2003-04-22 Anna Dirks <anna@ximian.com> + * misc/e-multi-config-dialog.c : add appropriate padding and + spacing to the settings dialog. Fixes #41392. 2003-04-10 Mike Kestner <mkestner@ximian.com> diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index be617208bd..39f4db3366 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -22,7 +22,6 @@ #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> #include <gal/menus/gal-define-views-dialog.h> -#include <gal/widgets/e-unicode.h> #include <bonobo/bonobo-ui-util.h> #include <e-util/e-list.h> @@ -295,10 +294,10 @@ build_menus(GalViewMenus *menus) menus->priv->listenerClosures = e_list_new (closure_copy, closure_free, menus); for (i = 0; i < length; i++) { - char *label, *encoded_label; GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i); ListenerClosure *closure; - + char *label; + menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", item->id); bonobo_ui_node_set_attr(menuitem, "id", item->id); @@ -309,11 +308,8 @@ build_menus(GalViewMenus *menus) bonobo_ui_node_set_attr(command, "name", item->id); bonobo_ui_node_set_attr(command, "group", "GalViewMenus"); - /* bonobo displays this string so it must be in locale */ - label = e_utf8_to_locale_string(item->title); - encoded_label = bonobo_ui_util_encode_str (label); - bonobo_ui_node_set_attr(menuitem, "label", encoded_label); - g_free (encoded_label); + label = bonobo_ui_util_encode_str (item->title); + bonobo_ui_node_set_attr(menuitem, "label", label); g_free (label); closure = g_new (ListenerClosure, 1); |