From e7defa25a587dfaa160211ce0e2941c044560b5a Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Sat, 26 Nov 2005 02:31:52 +0000
Subject: gui/calendar-commands.c gui/e-cal-list-view.c gui/e-calendar-table.c

2005-11-26  Tor Lillqvist  <tml@novell.com>

	* gui/calendar-commands.c
	* gui/e-cal-list-view.c
	* gui/e-calendar-table.c
	* gui/e-memo-table.c
	* gui/e-memos.c
	* gui/e-tasks.c
	* gui/gnome-cal.c
	* gui/goto.c
	* gui/memos-control.c
	* gui/tasks-control.c
	* gui/alarm-notify/alarm-notify-dialog.c
	* gui/alarm-notify/notify-main.c
	* gui/dialogs/alarm-dialog.c
	* gui/dialogs/alarm-list-dialog.c
	* gui/dialogs/cal-attachment.c
	* gui/dialogs/cal-prefs-dialog.c
	* gui/dialogs/comp-editor.c
	* gui/dialogs/e-delegate-dialog.c
	* gui/dialogs/event-editor.c
	* gui/dialogs/meeting-page.c
	* gui/dialogs/memo-page.c
	* gui/dialogs/recurrence-page.c
	* gui/dialogs/schedule-page.c
	* gui/dialogs/task-details-page.c
	* gui/dialogs/task-page.c
	* gui/dialogs/url-editor-dialog.c: Include e-util-private.h to get
	redefinition of compile-time pathnames as calls to functions on
	Windows. Construct the pathnames of files and directories under
	the installation prefix at run-time to enable install-anywhere on
	Windows. No effect on functionality on Unix.

svn path=/trunk/; revision=30679
---
 calendar/gui/dialogs/comp-editor.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'calendar/gui/dialogs/comp-editor.c')

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index b1e9f69f84..86c8116bdb 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -42,6 +42,7 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
 #include <evolution-shell-component-utils.h>
 
 #include <camel/camel-url.h>
@@ -1400,6 +1401,7 @@ comp_editor_init (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
 	BonoboUIContainer *container;
+	char *xmlfile;
 
 	priv = g_new0 (CompEditorPrivate, 1);
 	editor->priv = priv;
@@ -1425,9 +1427,14 @@ comp_editor_init (CompEditor *editor)
 
 	bonobo_ui_component_freeze (editor->uic, NULL);
 
+	xmlfile = g_build_filename (EVOLUTION_UIDIR,
+				    "evolution-editor.xml",
+				    NULL);
 	bonobo_ui_util_set_ui (editor->uic, PREFIX,
-			       EVOLUTION_UIDIR "/evolution-editor.xml",
+			       xmlfile,
 			       "evolution-editor", NULL);
+	g_free (xmlfile);
+
 	e_pixmaps_update (editor->uic, pixmaps);
 	bonobo_ui_component_thaw (editor->uic, NULL);
 
-- 
cgit v1.2.3