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

Removed EVOLUTION_VERSION from the rest of makefiles. use VERSION instead. So

Browse Source 
you must include <config.h>, heh.

and a stil-not-working "fix" for galview menus.

svn path=/trunk/; revision=9707
This commit is contained in:
Gediminas Paulauskas
2001-05-08 00:28:34 +00:00
parent 0a9bafb949
commit 10a1eb46a9
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mail/Makefile.am
View File

@ -26,7 +26,6 @@ INCLUDES = \
$(GNOME_VFS_CFLAGS) \ $(GNOME_VFS_CFLAGS) \
$(GTKHTML_CFLAGS) \ $(GTKHTML_CFLAGS) \
$(THREADS_CFLAGS) \ $(THREADS_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \

1
notes/Makefile.am
View File

@ -6,7 +6,6 @@ INCLUDES = \
-I$(top_srcdir)/widgets/e-text \ -I$(top_srcdir)/widgets/e-text \
$(BONOBO_HTML_GNOME_CFLAGS) \ $(BONOBO_HTML_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \

1
shell/Makefile.am
View File

@ -7,7 +7,6 @@ INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \ $(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \

1
widgets/menus/Makefile.am
View File

@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libmenus.la
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/widgets/menus \ -I$(top_srcdir)/widgets/menus \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
$(EXTRA_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \
-DG_LOG_DOMAIN=\"menus\" -DG_LOG_DOMAIN=\"menus\"

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

@ -161,7 +161,6 @@ build_menus(GalViewMenus *menus)
int length; int length;
int i; int i;
GalViewCollection *collection = menus->priv->collection; GalViewCollection *collection = menus->priv->collection;
char *label;
root = bonobo_ui_node_new("Root"); root = bonobo_ui_node_new("Root");
menu = bonobo_ui_node_new_child(root, "menu"); menu = bonobo_ui_node_new_child(root, "menu");
@ -179,10 +178,17 @@ build_menus(GalViewMenus *menus)
length = gal_view_collection_get_count(collection); length = gal_view_collection_get_count(collection);
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
char *verb; char *verb;
char *label;
GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i); GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i);
menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
bonobo_ui_node_set_attr(menuitem, "name", item->id); 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); verb = g_strdup_printf("DefineViews:%s", item->id);
bonobo_ui_node_set_attr(menuitem, "verb", verb); bonobo_ui_node_set_attr(menuitem, "verb", verb);

1
wombat/Makefile.am
View File

@ -11,7 +11,6 @@ INCLUDES = \
-I$(top_builddir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \
$(GNOME_INCLUDEDIR) \ $(GNOME_INCLUDEDIR) \
$(BONOBO_VFS_GNOME_CFLAGS) \ $(BONOBO_VFS_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
bin_PROGRAMS = \ bin_PROGRAMS = \