Fixes #2465

* menus/gal-view-menus.c (build_menus):
Encode the label using bonobo_ui_util_encode_str and set "label"
attribute, not "_label".
I have no idea what the previous code was trying to do but it was
definitely wrong.

svn path=/trunk/; revision=12601

2 files changed, 14 insertions, 4 deletions

diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index fb5ec1a1ac..b24092d43b 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-26  Zbigniew Chyla  <cyba@gnome.pl>
+
+	Fixes #2465
+
+	* menus/gal-view-menus.c (build_menus):
+	Encode the label using bonobo_ui_util_encode_str and set "label"
+	attribute, not "_label".
+	I have no idea what the previous code was trying to do but it was
+	definitely wrong.
+
 2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-timezone-dialog/e-timezone-dialog.h
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index 58d13d1545..329ecd890a 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -222,7 +222,7 @@ build_menus(GalViewMenus *menus)
 	menus->priv->listenerClosures = e_list_new (NULL, closure_free, menus);
 
 	for (i = 0; i < length; i++) {
-		char *label;
+		char *label, *encoded_label;
 		GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i);
 		ListenerClosure *closure;
 
@@ -234,9 +234,9 @@ build_menus(GalViewMenus *menus)
 
 		/* bonobo displays this string so it must be in locale */
 		label = e_utf8_to_locale_string(item->title);
-		/* All labels are bonobo_ui_util_decode_str()ed,
-		 * so even translated label must be set with _label */
-		bonobo_ui_node_set_attr(menuitem, "_label", label);
+		encoded_label = bonobo_ui_util_encode_str (label);
+		bonobo_ui_node_set_attr(menuitem, "label", encoded_label);
+		g_free (encoded_label);
 		g_free(label);
 
 		closure = g_new (ListenerClosure, 1);