aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorGediminas Paulauskas <menesis@src.gnome.org>2001-05-08 08:28:34 +0800
committerGediminas Paulauskas <menesis@src.gnome.org>2001-05-08 08:28:34 +0800
commit10a1eb46a99144ac67c451a53aff3dd0a240aa2c (patch)
tree8dd93845e851b34cf3e1c028666a72fa3e03f01e /widgets
parent0a9bafb949e411cbc6f3eeb2d3f1901f1273adf5 (diff)
downloadgsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.tar
gsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.tar.gz
gsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.tar.bz2
gsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.tar.lz
gsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.tar.xz
gsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.tar.zst
gsoc2013-evolution-10a1eb46a99144ac67c451a53aff3dd0a240aa2c.zip
Removed EVOLUTION_VERSION from the rest of makefiles. use VERSION instead. So
you must include <config.h>, heh. and a stil-not-working "fix" for galview menus. svn path=/trunk/; revision=9707
Diffstat (limited to 'widgets')
-rw-r--r--widgets/menus/Makefile.am3
-rw-r--r--widgets/menus/gal-view-menus.c10
2 files changed, 9 insertions, 4 deletions
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index dc58b34f09..500f0672fc 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -3,10 +3,9 @@ noinst_LTLIBRARIES = libmenus.la
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets/menus \
- -DEVOLUTION_VERSION=\""$(VERSION)"\" \
$(EXTRA_GNOME_CFLAGS) \
-DG_LOG_DOMAIN=\"menus\"
libmenus_la_SOURCES = \
gal-view-menus.c \
- gal-view-menus.h \ No newline at end of file
+ gal-view-menus.h
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index 4be6d73e19..ac99ae1793 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -161,7 +161,6 @@ build_menus(GalViewMenus *menus)
int length;
int i;
GalViewCollection *collection = menus->priv->collection;
- char *label;
root = bonobo_ui_node_new("Root");
menu = bonobo_ui_node_new_child(root, "menu");
@@ -179,10 +178,17 @@ build_menus(GalViewMenus *menus)
length = gal_view_collection_get_count(collection);
for (i = 0; i < length; i++) {
char *verb;
+ char *label;
GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i);
menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
bonobo_ui_node_set_attr(menuitem, "name", item->id);
- bonobo_ui_node_set_attr(menuitem, "_label", item->title);
+
+ /* 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);
+ g_free(label);
verb = g_strdup_printf("DefineViews:%s", item->id);
bonobo_ui_node_set_attr(menuitem, "verb", verb);