diff options
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | notes/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | widgets/menus/Makefile.am | 3 | ||||
| -rw-r--r-- | widgets/menus/gal-view-menus.c | 10 | ||||
| -rw-r--r-- | wombat/Makefile.am | 1 |
6 files changed, 9 insertions, 8 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am index b9700e60f5..ba4dc91d59 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -26,7 +26,6 @@ INCLUDES = \ $(GNOME_VFS_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(THREADS_CFLAGS) \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ diff --git a/notes/Makefile.am b/notes/Makefile.am index 42b06c241a..37e2a7ea03 100644 --- a/notes/Makefile.am +++ b/notes/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = \ -I$(top_srcdir)/widgets/e-text \ $(BONOBO_HTML_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ diff --git a/shell/Makefile.am b/shell/Makefile.am index efd90a8f8e..bbf4c9bc00 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -7,7 +7,6 @@ INCLUDES = \ $(BONOBO_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ 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); diff --git a/wombat/Makefile.am b/wombat/Makefile.am index 495ee1d68b..0d0919613b 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -11,7 +11,6 @@ INCLUDES = \ -I$(top_builddir)/libical/src/libical \ $(GNOME_INCLUDEDIR) \ $(BONOBO_VFS_GNOME_CFLAGS) \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" bin_PROGRAMS = \ |