diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 4 | ||||
| -rw-r--r-- | calendar/pcs/cal-backend.c | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e38ba3f411..030ac6270d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ 2001-01-15 JP Rosevear <jpr@ximian.com> + * pcs/cal-backend.c (cal_backend_compute_changes): accomadate tasks + in their new dir + + * conduits/todo/todo-conduit.c (start_calendar_server): ditto + +2001-01-15 JP Rosevear <jpr@ximian.com> + * conduits/todo/todo-conduit.c (print_local): prevent segfaults and buffer overflows. (print_remote): ditto diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index abc3bd498d..7d36dc5e10 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -207,7 +207,7 @@ start_calendar_server (EToDoConduitContext *ctxt) /* FIX ME */ ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (), - "evolution/local/Calendar/calendar.ics"); + "evolution/local/Tasks/tasks.ics"); gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_loaded", start_calendar_server_cb, ctxt); @@ -231,7 +231,7 @@ map_name (EToDoConduitContext *ctxt) { char *filename; - filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id); + filename = g_strdup_printf ("%s/evolution/local/Tasks/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id); return filename; } diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c index 9570b85d7f..0dc5d45883 100644 --- a/calendar/pcs/cal-backend.c +++ b/calendar/pcs/cal-backend.c @@ -332,7 +332,10 @@ cal_backend_compute_changes (CalBackend *backend, CalObjType type, const char *c int n; /* Find the changed ids - FIX ME, path should not be hard coded */ - filename = g_strdup_printf ("%s/evolution/local/Calendar/%s.db", g_get_home_dir (), change_id); + if (type == GNOME_Evolution_Calendar_TYPE_EVENT) + filename = g_strdup_printf ("%s/evolution/local/Tasks/%s.db", g_get_home_dir (), change_id); + else + filename = g_strdup_printf ("%s/evolution/local/Calendar/%s.db", g_get_home_dir (), change_id); ehash = e_dbhash_new (filename); g_free (filename); |