diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 3 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 1136fe18f4..5505ce2b42 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,15 @@ 2001-01-17 JP Rosevear <jpr@ximian.com> + * conduits/calendar/calendar-conduit.c (start_calendar_server): Check + for open error and handled + + * conduits/todo/todo-conduit.c (start_calendar_server): ditto + +2001-01-17 JP Rosevear <jpr@ximian.com> + + * conduits/calendar/calendar-conduit.c (start_calendar_server): Check + for open error and handled + * pcs/cal-backend.c (cal_backend_compute_changes): Fix transposition of sync db location diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 0ed563b574..868d7bddd7 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -197,7 +197,8 @@ start_calendar_server (ECalConduitContext *ctxt) start_calendar_server_cb, ctxt); LOG (" calling cal_client_open_calendar\n"); - cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE); + if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE)) + return -1; /* run a sub event loop to turn cal-client's async load notification into a synchronous call */ diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index fe50a7869b..f0dfb56b14 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -201,7 +201,8 @@ start_calendar_server (EToDoConduitContext *ctxt) start_calendar_server_cb, ctxt); LOG (" calling cal_client_open_calendar\n"); - cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE); + if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE)) + return -1; /* run a sub event loop to turn cal-client's async load notification into a synchronous call */ |