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

11 files changed, 37 insertions, 5 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");
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 40a65c7539..9df9705ffd 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-16  Michael Meeks  <michael@helixcode.com>
+
+	* gui/Makefile.am (INCLUDES): add datadir
+
+	* gui/calendar-commands.c (calendar_control_activate): use it.
+
 2000-09-14  JP Rosevear  <jpr@helixcode.com>
 
 	* conduits/todo/.cvsignore: Shush
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 26de95f324..37a1aa3259 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -18,6 +18,7 @@ INCLUDES = 						\
 	-I$(top_srcdir)/widgets				\
 	-I$(includedir)					\
 	$(BONOBO_VFS_GNOME_CFLAGS)			\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 9f9b58aa7f..cef814a36f 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -593,7 +593,8 @@ calendar_control_activate (BonoboControl *control,
 		container = bonobo_ui_compat_get_container (uih);
 		g_return_if_fail (container != CORBA_OBJECT_NIL);
 		
-		fname = bonobo_ui_util_get_ui_fname ("evolution-calendar.xml");
+		fname = bonobo_ui_util_get_ui_fname (
+			EVOLUTION_DATADIR, "evolution-calendar.xml");
 		g_warning ("Attempting ui load from '%s'", fname);
 		
 		ui = bonobo_ui_util_new_ui (component, fname, "evolution-calendar");
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2b72b91d2f..adf62d1e0d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-16  Michael Meeks  <michael@helixcode.com>
+
+	* Makefile.am (INCLUDES): add datadir
+
+	* folder-browser-factory.c (control_activate): use it.
+
 2000-09-15  Dan Winship  <danw@helixcode.com>
 
 	* mail-callbacks.c (transfer_msg): Revert **Temp fix** from below
diff --git a/mail/Makefile.am b/mail/Makefile.am
index a0b935c612..d7a8518e9d 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = \
 	$(UNICODE_CFLAGS)				\
 	$(GTKHTML_CFLAGS)				\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 13fc4eafa2..56a7f4952d 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -187,7 +187,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 		char *fname;
 		xmlNode *ui;
 
-		fname = bonobo_ui_util_get_ui_fname ("evolution-mail.xml");
+		fname = bonobo_ui_util_get_ui_fname (
+			EVOLUTION_DATADIR, "evolution-mail.xml");
 		g_warning ("Attempting ui load from '%s'", fname);
 		
 		ui = bonobo_ui_util_new_ui (component, fname, "evolution-mail");
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 252ea07ca3..4f0936875d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-16  Michael Meeks  <michael@helixcode.com>
+
+	* e-shell-view-menu.c (e_shell_view_menu_setup): use datadir.
+
 2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* e-shell-view.h: #include "bonobo-win.h", not "bonobo-app.h".
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 351c7b6231..0d7c992292 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -457,7 +457,8 @@ e_shell_view_menu_setup (EShellView *shell_view)
 
 	bonobo_ui_container_freeze (container, NULL);
 
-	fname = bonobo_ui_util_get_ui_fname ("evolution.xml");
+	fname = bonobo_ui_util_get_ui_fname (
+		EVOLUTION_DATADIR, "evolution.xml");
 	g_warning ("Attempting ui load from '%s'", fname);
 
 	ui = bonobo_ui_util_new_ui (component, fname, "evolution");