From bcd74986f4ba7f31182a292cce56ce344210e776 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 7 Feb 2001 03:34:58 +0000 Subject: Added -DEVOLUTION_DATADIR=\""$(datadir)"\". 2001-02-06 Christopher James Lahey * gui/widgets/Makefile.am (INCLUDES): Added -DEVOLUTION_DATADIR=\""$(datadir)"\". * gui/widgets/e-addressbook-view.c (e_addressbook_view_setup_menus): Changed the local and system directories. svn path=/trunk/; revision=8044 --- addressbook/ChangeLog | 9 +++++++++ addressbook/gui/widgets/Makefile.am | 1 + addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index e9ea26b17a..db1e0020a8 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2001-02-06 Christopher James Lahey + + * gui/widgets/Makefile.am (INCLUDES): Added + -DEVOLUTION_DATADIR=\""$(datadir)"\". + + * gui/widgets/e-addressbook-view.c + (e_addressbook_view_setup_menus): Changed the local and system + directories. + 2001-02-06 Chris Toshok * backend/pas/pas-backend-ldap.c (create_card_handler): doh, diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 9b5166eaf0..0f9a07438e 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"e-minicard\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend/ebook \ -I$(top_srcdir)/addressbook/contact-editor \ diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 9a322a8cbf..56420290a1 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -813,8 +813,8 @@ e_addressbook_view_setup_menus (EAddressbookView *view, collection = gal_view_collection_new(); /* FIXME: Memory leak. */ gal_view_collection_set_storage_directories(collection, - gnome_util_prepend_user_home("/evolution/system/"), - gnome_util_prepend_user_home("/evolution/galview/")); + EVOLUTION_DATADIR "/evolution/views/addressbook/", + gnome_util_prepend_user_home("/evolution/views/addressbook/")); spec = e_table_specification_new(); e_table_specification_load_from_string(spec, SPEC); -- cgit v1.2.3