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, 16 insertions, 8 deletions

diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index f4c92b9b03..c4b4041284 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -38,6 +38,7 @@
 #include "e-util/e-error.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-config-listener.h"
+#include "e-util/e-util-private.h"
 #include "shell/e-user-creatable-items-handler.h"
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-url.h>
@@ -1068,7 +1069,7 @@ e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic)
 	EMemosPrivate *priv;
 	GalViewFactory *factory;
 	ETableSpecification *spec;
-	char *dir;
+	char *dir0, *dir1, *filename;
 	static GalViewCollection *collection = NULL;
 
 	g_return_if_fail (memos != NULL);
@@ -1090,19 +1091,26 @@ e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic)
 
 		gal_view_collection_set_title (collection, _("Memos"));
 
-		dir = g_build_filename (memos_component_peek_base_directory (memos_component_peek ()), 
-					"memos", "views", NULL);
-	
+		dir0 = g_build_filename (EVOLUTION_GALVIEWSDIR,
+					 "memos",
+					 NULL);
+		dir1 = g_build_filename (memos_component_peek_base_directory (memos_component_peek ()), 
+					 "memos", "views", NULL);
 		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_GALVIEWSDIR "/memos/",
-							     dir);
-		g_free (dir);
+							     dir0,
+							     dir1);
+		g_free (dir1);
+		g_free (dir0);
 
 		/* Create the views */
 
 		spec = e_table_specification_new ();
+		filename = g_build_filename (EVOLUTION_ETSPECDIR,
+					     "e-memo-table.etspec",
+					     NULL);
 		e_table_specification_load_from_file (spec, 
-						      EVOLUTION_ETSPECDIR "/e-memo-table.etspec");
+						      filename);
+		g_free (filename);
 
 		factory = gal_view_factory_etable_new (spec);
 		g_object_unref (spec);