From 1fff2516257a785bb4597c7ad4917405bbcb8cbc Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 20 Oct 2000 21:25:47 +0000 Subject: Pulling up stuff from the 0.6 branch 2000-10-20 JP Rosevear * pcs/cal-backend.c (cal_backend_destroy): New destroy handler to properly stop the timer, sync the log and unref the URI. (cal_backend_last_client_gone): Just emit the signal, clean up work is done in cal_backend_destroy now. * pcs/cal-backend-file.c (cal_backend_file_load): Unref the uri we are replacing NOT the new uri. 2000-10-20 JP Rosevear * conduits/todo/Makefile.am: Fix build * conduits/calendar/Makefile.am: Fix build 2000-10-20 JP Rosevear * conduits/calendar/calendar-conduit.c (delete_archive_record): Don't throw an error * conduits/todo/todo-conduit.c (delete_archive_record): ditto 2000-10-20 JP Rosevear * conduits/todo/todo-conduit-control-applet.c: Add defines * conduits/todo/todo-conduit-config.h: put #ifdefs around functions can't make this a public interface in the usual way as then the symbols would be exported * conduits/todo/todo-conduit.c: Kill warnings. clahey will be happy! Add some defines to include only the necessary config functions. (conduit_get_gpilot_conduit): Hook up archive signals * conduits/calendar/calendar-conduit.c: Same as above * conduits/calendar/calendar-conduit-control-applet.c: ditto * conduits/calendar/calendar-conduit-config.h: ditto svn path=/trunk/; revision=6086 --- calendar/conduits/calendar/Makefile.am | 5 ++++- calendar/conduits/calendar/calendar-conduit-config.h | 2 +- calendar/conduits/calendar/calendar-conduit.c | 4 +++- calendar/conduits/todo/Makefile.am | 5 ++++- calendar/conduits/todo/todo-conduit-config.h | 2 +- calendar/conduits/todo/todo-conduit.c | 6 +++--- 6 files changed, 16 insertions(+), 8 deletions(-) (limited to 'calendar/conduits') diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index e0f1d76e18..25282d9c53 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -26,7 +26,10 @@ e_calendar_conduit_control_applet_LDADD = \ e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la -libecalendar_conduit_la_SOURCES = calendar-conduit.c +libecalendar_conduit_la_SOURCES = \ + calendar-conduit.c \ + calendar-conduit.h \ + calendar-conduit-config.h libecalendar_conduit_la_LIBADD = \ $(top_builddir)/calendar/cal-client/libcal-client-static.la \ diff --git a/calendar/conduits/calendar/calendar-conduit-config.h b/calendar/conduits/calendar/calendar-conduit-config.h index e353142aaa..d0ba28dbb1 100644 --- a/calendar/conduits/calendar/calendar-conduit-config.h +++ b/calendar/conduits/calendar/calendar-conduit-config.h @@ -29,7 +29,7 @@ #include #include -/* This is the configuration of the GnomeCal conduit. */ +/* Configuration info */ typedef struct _ECalConduitCfg ECalConduitCfg; struct _ECalConduitCfg { gboolean open_secret; diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 3ba6e7d931..7452e0f911 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -1074,11 +1074,13 @@ delete_archive_record (GnomePilotConduitSyncAbs *conduit, ECalLocalRecord *local, ECalConduitContext *ctxt) { + int retval = 0; + g_return_val_if_fail(local!=NULL,-1); LOG ("delete_archive_record: doing nothing\n"); - return -1; + return retval; } static gint diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 619a11657b..73c9dc203b 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -26,7 +26,10 @@ e_todo_conduit_control_applet_LDADD = \ e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits e_todo_conduits_LTLIBRARIES = libetodo_conduit.la -libetodo_conduit_la_SOURCES = todo-conduit.c +libetodo_conduit_la_SOURCES = \ + todo-conduit.c \ + todo-conduit.h \ + todo-conduit-config.h libetodo_conduit_la_LIBADD = \ $(top_builddir)/calendar/cal-client/libcal-client-static.la \ diff --git a/calendar/conduits/todo/todo-conduit-config.h b/calendar/conduits/todo/todo-conduit-config.h index 7a23475839..fe7b1dbafa 100644 --- a/calendar/conduits/todo/todo-conduit-config.h +++ b/calendar/conduits/todo/todo-conduit-config.h @@ -29,7 +29,7 @@ #include #include -/* This is the configuration of the GnomeCal conduit. */ +/* Configuration info */ typedef struct _EToDoConduitCfg EToDoConduitCfg; struct _EToDoConduitCfg { gboolean open_secret; diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 646f850b42..d3ea9dbd63 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -94,8 +94,6 @@ print_local (EToDoLocalRecord *local) } return ""; - - return cal_component_get_as_string (local->comp); } @@ -955,11 +953,13 @@ delete_archive_record (GnomePilotConduitSyncAbs *conduit, EToDoLocalRecord *local, EToDoConduitContext *ctxt) { + int retval =0; + g_return_val_if_fail(local!=NULL,-1); LOG ("delete_archive_record: doing nothing\n"); - return -1; + return retval; } static gint -- cgit v1.2.3