diff options
author | Tor Lillqvist <tml@novell.com> | 2005-11-26 10:31:52 +0800 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-26 10:31:52 +0800 |
commit | e7defa25a587dfaa160211ce0e2941c044560b5a (patch) | |
tree | 92e5a8b5ffb7010a28bced8e3eb9726411f27c81 /calendar/gui/e-tasks.c | |
parent | ae89d959aab24359c730375cff664ac3b44cc953 (diff) | |
download | gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.gz gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.bz2 gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.lz gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.xz gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.zst gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.zip |
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
Diffstat (limited to 'calendar/gui/e-tasks.c')
-rw-r--r-- | calendar/gui/e-tasks.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index d2fb77912a..864b607a0e 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -37,6 +37,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 <libedataserver/e-url.h> #include <libedataserver/e-categories.h> @@ -1310,7 +1311,7 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic) ETasksPrivate *priv; GalViewFactory *factory; ETableSpecification *spec; - char *dir; + char *dir0, *dir1, *filename; static GalViewCollection *collection = NULL; g_return_if_fail (tasks != NULL); @@ -1332,18 +1333,25 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic) gal_view_collection_set_title (collection, _("Tasks")); - dir = g_build_filename (tasks_component_peek_base_directory (tasks_component_peek ()), - "tasks", "views", NULL); + dir0 = g_build_filename (EVOLUTION_GALVIEWSDIR, + "tasks", + NULL); + dir1 = g_build_filename (tasks_component_peek_base_directory (tasks_component_peek ()), + "tasks", "views", NULL); gal_view_collection_set_storage_directories (collection, - EVOLUTION_GALVIEWSDIR "/tasks/", - dir); - g_free (dir); + dir0, + dir1); + g_free (dir1); + g_free (dir0); /* Create the views */ spec = e_table_specification_new (); - e_table_specification_load_from_file (spec, - EVOLUTION_ETSPECDIR "/e-calendar-table.etspec"); + filename = g_build_filename (EVOLUTION_ETSPECDIR, + "e-calendar-table.etspec", + NULL); + e_table_specification_load_from_file (spec, filename); + g_free (filename); factory = gal_view_factory_etable_new (spec); g_object_unref (spec); |