aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorMichael Meeks <mmeeks@src.gnome.org>2000-09-17 00:37:07 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-09-17 00:37:07 +0800
commit4f04a07954d6d577dfd99fbb85fe60db5873d137 (patch)
tree243a4ff3a25c323b9f9c22e8157763649d7ceb06 /addressbook
parentfa1d9f97dfd8ba2a6ba97dbb23d681441b794d74 (diff)
downloadgsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.gz
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.bz2
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.lz
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.xz
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.zst
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.zip
Everywhere add a -DEVOLUTION_DATADIR=${datadir} in the Makefile.am
And use this in grabbing the ui from the xml file. Requires HEAD bonobo. svn path=/trunk/; revision=5474
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/component/Makefile.am1
-rw-r--r--addressbook/gui/component/addressbook.c5
3 files changed, 13 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c31cb84225..fe49daef7b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-16 Michael Meeks <michael@helixcode.com>
+
+ * gui/component/select-names/e-select-names.c: fix broken include.
+
+ * gui/component/Makefile.am (INCLUDES): define datadir.
+ (evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
+
+ * gui/component/addressbook.c (control_activate): use datadir.
+
2000-09-16 Ettore Perazzoli <ettore@helixcode.com>
* gui/widgets/Makefile.am (gladedir): Define.
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 12f63005e7..bb81ffec5d 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -21,6 +21,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
$(BONOBO_HTML_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 658da4c04c..77f3d12891 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -28,7 +28,7 @@
#include <e-scroll-frame.h>
-#include <e-addressbook-model.h>
+#include <addressbook/gui/widgets/e-addressbook-model.h>
#include <select-names/e-select-names.h>
#include <select-names/e-select-names-manager.h>
@@ -524,7 +524,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
bonobo_ui_container_freeze (container, NULL);
- fname = bonobo_ui_util_get_ui_fname ("evolution-addressbook.xml");
+ fname = bonobo_ui_util_get_ui_fname (
+ EVOLUTION_DATADIR, "evolution-addressbook.xml");
g_warning ("Attempting ui load from '%s'", fname);
ui = bonobo_ui_util_new_ui (component, fname, "evolution-addressbook");