callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't convert the label charset from UTF-8 into the locale charset.

Browse Source 
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
This commit is contained in:
Jeffrey Stedfast
2003-04-28 17:48:02 +00:00
committed by Jeffrey Stedfast
parent bb0d02c04b
commit 8910fc09d9
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/ChangeLog
View File

@ -1,8 +1,12 @@
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.
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.
* 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>

12
widgets/menus/gal-view-menus.c
View File

@ -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);