[ fixes #21499 ]

2003-04-18  Rodney Dawes  <dobey@ximian.com>

	[ fixes #21499 ]
	* gui/component/Makefile.am:
	* gui/component/addressbook.c:
	* gui/component/select-names/e-select-names-bonobo.c:
	* gui/contact-editor/Makefile.am:
	* gui/contact-editor/e-contact-editor.c:
	* gui/contact-list-editor/Makefile.am:
	* gui/contact-list-editor/e-contact-list-editor.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()

	* gui/Makefile.am:
	* gui/calendar-commands.c:
	* gui/tasks-control.c:
	* gui/dialogs/Makefile.am:
	* gui/dialogs/comp-editor.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()

	* Makefile.am:
	* e-msg-composer.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
	Fixes bug #21499.

	* Makefile.am:
	* folder-browser-ui.c:
	* mail-signature-editor.c:
	* message-browser.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
	Fixes bug #21499.

	* Makefile.am:
	* e-summary-factory.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()

	* e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for
	bonobo_ui_util_set_ui () [#21499]

svn path=/trunk/; revision=20888

27 files changed, 73 insertions, 13 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b10833d890..54e2794f55 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-18  Rodney Dawes  <dobey@ximian.com>
+
+	[ fixes #21499 ]
+	* gui/component/Makefile.am:
+	* gui/component/addressbook.c:
+	* gui/component/select-names/e-select-names-bonobo.c:
+	* gui/contact-editor/Makefile.am:
+	* gui/contact-editor/e-contact-editor.c:
+	* gui/contact-list-editor/Makefile.am:
+	* gui/contact-list-editor/e-contact-list-editor.c:
+	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
+	
 2003-04-15  Chris Toshok  <toshok@ximian.com>
 
 	[ fixes #41252 ]
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 5a67f4d9d4..36dd543700 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -19,6 +19,7 @@ INCLUDES =									\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DPREFIX=\""$(prefix)"\"				\
 	$(LDAP_CFLAGS)						\
 	-DG_DISABLE_DEPRECATED					\
 	-DGTK_DISABLE_DEPRECATED				\
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index b5f7bc5df8..39c4f2fcce 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -374,7 +374,7 @@ control_activate (BonoboControl     *control,
 	
 	bonobo_ui_component_freeze (uic, NULL);
 
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-addressbook.xml",
 			       "evolution-addressbook", NULL);
 
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 6c970a19fc..b722baec6f 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -374,7 +374,7 @@ merge_menu_items (BonoboControl *control, BonoboUIComponent *uic, ControlUIClosu
 
 		bonobo_ui_component_freeze (uic, NULL);
 
-		bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+		bonobo_ui_util_set_ui (uic, PREFIX,
 				       closure->ui_xml_path,
 				       closure->app_name, NULL);
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index e59d90cf50..c6738099b9 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES =						\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
+	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"contact-editor\"		\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 3450c307aa..8de9ca4636 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1191,7 +1191,7 @@ create_ui (EContactEditor *ce)
 {
 	bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
 
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ce->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-contact-editor.xml",
 			       "evolution-contact-editor", NULL);
 
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 1af8d7a86d..82e296f8cf 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES =						\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
+	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 754048c2a5..0ef87dc5a1 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -559,7 +559,7 @@ create_ui (EContactListEditor *ce)
 	bonobo_ui_component_add_verb_list_with_data (
 		ce->uic, verbs, ce);
 
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ce->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-contact-list-editor.xml",
 			       "evolution-contact-list-editor", NULL);
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b7775328b2..b3a6f55e01 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-18  Rodney Dawes  <dobey@ximian.com>
+
+	Fixes #21499
+
+	* gui/Makefile.am:
+	* gui/calendar-commands.c:
+	* gui/tasks-control.c:
+	* gui/dialogs/Makefile.am:
+	* gui/dialogs/comp-editor.c:
+	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
+	
 2003-04-17  JP Rosevear  <jpr@ximian.com>
 
 	Fixes #41459
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 2b0e08e5b0..9c58cce4a7 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -79,6 +79,7 @@ INCLUDES =						\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 glade_DATA = 					\
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 854ded3825..23109d50a7 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -719,7 +719,7 @@ calendar_control_activate (BonoboControl *control,
 
 	bonobo_ui_component_freeze (uic, NULL);
 
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-calendar.xml",
 			       "evolution-calendar",
 			       NULL);
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 53ea88a9dc..8dc79e7fe7 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -28,6 +28,7 @@ INCLUDES = 								\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
+	-DPREFIX=\""$(prefix)"\"					\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 noinst_LTLIBRARIES = libcal-dialogs.la
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index c8d89eae7e..a27ec7776c 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -198,7 +198,7 @@ setup_widgets (CompEditor *editor)
 					  "/evolution/UIConf/kvps");
 
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (priv->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-comp-editor.xml",
 			       "evolution-calendar", NULL);
 	e_pixmaps_update (priv->uic, pixmaps);
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 41ff698fce..1e91b07afd 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -322,7 +322,7 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 
 	bonobo_ui_component_freeze (uic, NULL);
 
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-tasks.xml",
 			       "evolution-tasks",
 			       NULL);
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 0183e454cd..443dc2947a 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-18  Rodney Dawes  <dobey@ximian.com>
+
+	* Makefile.am:
+	* e-msg-composer.c:
+	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
+	Fixes bug #21499.
+	
 2003-04-14  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer-attachment.c (file_name_focus_out_cb): Return
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 3c12e877a2..f605c116f3 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -65,6 +65,7 @@ INCLUDES =								\
 	-DEVOLUTION_IMAGESDIR=\"$(imagesdir)\"				\
 	-DEVOLUTION_UIDIR=\"$(evolutionuidir)\"				\
 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
+	-DPREFIX=\"$(prefix)\"						\
 	-DG_LOG_DOMAIN=\"composer\"					\
 	-DG_DISABLE_DEPRECATED						\
 	-DGTK_DISABLE_DEPRECATED					\
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index aeabea9028..71ea78e419 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2086,7 +2086,7 @@ setup_ui (EMsgComposer *composer)
 	
 	bonobo_ui_component_freeze (composer->uic, NULL);
 	
-	bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (composer->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-message-composer.xml",
 			       "evolution-message-composer", NULL);
 	
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ff438ae3cf..11fc64447e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-18  Rodney Dawes  <dobey@ximian.com>
+
+	* Makefile.am:
+	* folder-browser-ui.c:
+	* mail-signature-editor.c:
+	* message-browser.c:
+	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
+	Fixes bug #21499.
+	
 2003-04-17  Not Zed  <NotZed@Ximian.com>
 
 	* mail-signature-editor.c (menu_help): remove the help menu item
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 65d8c8bcc6..11be8be634 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -33,6 +33,7 @@ INCLUDES =						\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index 393278e505..2dbf4df3cf 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -312,7 +312,7 @@ ui_add (FolderBrowser *fb, const char *name, BonoboUIVerb verb[], EPixmap pixcac
 	/*bonobo_ui_component_freeze (uic, NULL);*/
 	
 	file = g_strconcat (EVOLUTION_UIDIR "/evolution-mail-", name, ".xml", NULL);
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, file, "evolution-mail", NULL);
+	bonobo_ui_util_set_ui (uic, PREFIX, file, "evolution-mail", NULL);
 	g_free (file);
 	
 	e_pixmaps_update (uic, pixcache);
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 8d71636620..9a3a4e0272 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -391,7 +391,7 @@ mail_signature_editor (MailConfigSignature *sig, GtkWindow *parent, gboolean is_
 	component = bonobo_ui_component_new_default ();
 	bonobo_ui_component_set_container (component, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
 	bonobo_ui_component_add_verb_list_with_data (component, verbs, editor);
-	bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (component, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-signature-editor.xml",
 			       "evolution-signature-editor", NULL);
 	
diff --git a/mail/message-browser.c b/mail/message-browser.c
index bac9abb7d2..5c105bc109 100644
--- a/mail/message-browser.c
+++ b/mail/message-browser.c
@@ -283,7 +283,7 @@ set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb)
 	/* Load our UI */
 	
 	/*bonobo_ui_component_freeze (uic, NULL);*/
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml",
 			       "evolution-mail", NULL);
 	
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 40cd9561e1..697a12108a 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-18  Rodney Dawes  <dobey@ximian.com>
+
+	[#21499]
+
+	* Makefile.am:
+	* e-summary-factory.c:
+	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
+	
 2003-04-16  Ettore Perazzoli  <ettore@ximian.com>
 
 	[#39693]
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index fcb3e124b4..f255497090 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES =							\
 	-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
 	-DLOCATIONDIR=\""$(Locationdir)"\"			\
+	-DPREFIX=\""$(prefix)"\"	\
 	-DG_LOG_DOMAIN=\"evolution-executive-summary\"		\
 	$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
 
diff --git a/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c
index 521ebc3120..43f7fe5467 100644
--- a/my-evolution/e-summary-factory.c
+++ b/my-evolution/e-summary-factory.c
@@ -64,7 +64,7 @@ control_activate (BonoboControl *control,
 	bonobo_ui_component_add_verb_list_with_data (ui_component, summary_verbs, summary);
 	bonobo_ui_component_freeze (ui_component, NULL);
 
-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ui_component, PREFIX,
 			       EVOLUTION_UIDIR "/my-evolution.xml", "my-evolution", NULL);
   	e_pixmaps_update (ui_component, pixmaps); 
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 61bc06f773..365568f47b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-18  Rodney Dawes  <dobey@ximian.com>
+
+	* e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for
+	bonobo_ui_util_set_ui () [#21499]
+	
 2003-04-17  Dan Winship  <danw@ximian.com>
 
 	* e-shell-folder-creation-dialog.c (add_folder_types): If the
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 75aedb6798..e3a4a1422e 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1823,7 +1823,7 @@ e_shell_view_construct (EShellView *shell_view,
 
 	bonobo_ui_component_freeze (priv->ui_component, NULL);
 
-	bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (priv->ui_component, PREFIX,
 			       EVOLUTION_UIDIR "/evolution.xml",
 			       "evolution-1.4", NULL);