diff options
| author | JP Rosevear <jpr@ximian.com> | 2004-01-22 23:18:28 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-01-22 23:18:28 +0800 |
| commit | 512c6fec267590bb0c5c9f1bc7d782b18dbe9e97 (patch) | |
| tree | d59c021cce65fbe163caf36144a0956fc28d8e71 | |
| parent | a162e68178fe831c2682dad37da92c543f01275d (diff) | |
| download | gsoc2013-evolution-512c6fec267590bb0c5c9f1bc7d782b18dbe9e97.tar.gz gsoc2013-evolution-512c6fec267590bb0c5c9f1bc7d782b18dbe9e97.tar.zst gsoc2013-evolution-512c6fec267590bb0c5c9f1bc7d782b18dbe9e97.zip | |
use the calendar component config dir (gnome_calendar_setup_view_menus):
2004-01-22 JP Rosevear <jpr@ximian.com>
* gui/gnome-cal.c (setup_widgets): use the calendar component
config dir
(gnome_calendar_setup_view_menus): use the calendar component base
dir for the view storage
* gui/e-tasks.c (e_tasks_setup_view_menus): use the task component
base dir for the view storage
Fixes #53133
svn path=/trunk/; revision=24362
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/e-tasks.c | 5 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 60505c509a..76bdf0ab66 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2004-01-22 JP Rosevear <jpr@ximian.com> + + * gui/gnome-cal.c (setup_widgets): use the calendar component + config dir + (gnome_calendar_setup_view_menus): use the calendar component base + dir for the view storage + + * gui/e-tasks.c (e_tasks_setup_view_menus): use the task component + base dir for the view storage + + Fixes #53133 + 2004-01-21 Rodrigo Moya <rodrigo@ximian.com> * gui/e-tasks.c (e_tasks_add_todo_source): check return value diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 3e6a71b808..50b5dfc203 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -46,6 +46,7 @@ #include "comp-util.h" #include "e-calendar-table-config.h" #include "misc.h" +#include "tasks-component.h" #include "e-tasks.h" #include "common/authentication.h" @@ -1107,7 +1108,9 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic) gal_view_collection_set_title (collection, _("Tasks")); - dir = gnome_util_prepend_user_home ("/evolution/views/tasks/"); + dir = g_build_filename (tasks_component_peek_base_directory (tasks_component_peek ()), + "tasks", "views", NULL); + g_message ("Using %s", dir); gal_view_collection_set_storage_directories (collection, EVOLUTION_GALVIEWSDIR "/tasks/", dir); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 4a3af0babc..22eab34e2a 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1015,7 +1015,8 @@ setup_widgets (GnomeCalendar *gcal) connect_week_view_focus (gcal, E_WEEK_VIEW (priv->month_view)); /* The List View. */ - filename = g_strdup_printf (".evolution/config/CalListView"); + filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()), + "CalListView", NULL); priv->list_view = e_cal_list_view_new (filename); g_free (filename); @@ -1606,7 +1607,8 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic) gal_view_collection_set_title (collection, _("Calendar")); - path = gnome_util_prepend_user_home ("/evolution/views/calendar/"); + path = 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); |