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

1 files changed, 15 insertions, 6 deletions

diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 9fa7edf7a4..d3b2ac5014 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -51,6 +51,7 @@
 #include <widgets/menus/gal-define-views-dialog.h>
 #include "widgets/menus/gal-view-menus.h"
 #include "e-util/e-error.h"
+#include "e-util/e-util-private.h"
 #include "e-comp-editor-registry.h"
 #include "dialogs/delete-error.h"
 #include "dialogs/event-editor.h"
@@ -2092,7 +2093,7 @@ void
 gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 {
 	GnomeCalendarPrivate *priv;
-	char *path;
+	char *path0, *path1, *etspecfile;
 	CalendarViewFactory *factory;
 	GalViewFactory *gal_factory;
 	static GalViewCollection *collection = NULL;
@@ -2115,12 +2116,16 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 
 		gal_view_collection_set_title (collection, _("Calendar"));
 
-		path = g_build_filename (calendar_component_peek_base_directory (calendar_component_peek ()), 
+		path0 = g_build_filename (EVOLUTION_GALVIEWSDIR,
+					  "calendar",
+					  NULL);
+		path1 = g_build_filename (calendar_component_peek_base_directory (calendar_component_peek ()), 
 					 "calendar", "views", NULL);
 		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_GALVIEWSDIR "/calendar/",
-							     path);
-		g_free (path);
+							     path0,
+							     path1);
+		g_free (path1);
+		g_free (path0);
 
 		/* Create the views */
 
@@ -2141,7 +2146,11 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
 		g_object_unref (factory);
 
 		spec = e_table_specification_new ();
-		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/e-cal-list-view.etspec");
+		etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
+					       "e-cal-list-view.etspec",
+					       NULL);
+		e_table_specification_load_from_file (spec, etspecfile);
+		g_free (etspecfile);
 		gal_factory = gal_view_factory_etable_new (spec);
 		g_object_unref (spec);
 		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (gal_factory));