diff options
Diffstat (limited to 'calendar/conduits/calendar/calendar-conduit.c')
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 37661377b1..3ba6e7d931 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -40,19 +40,24 @@ #include <pi-file.h> #include <pi-dlp.h> #include <pi-version.h> -#include <calendar-conduit-config.h> -#include <calendar-conduit.h> #include <libical/src/libical/icaltypes.h> +#define CAL_CONFIG_LOAD 1 +#define CAL_CONFIG_DESTROY 1 +#include <calendar-conduit-config.h> +#undef CAL_CONFIG_LOAD +#undef CAL_CONFIG_DESTROY + +#include <calendar-conduit.h> GnomePilotConduit * conduit_get_gpilot_conduit (guint32); void conduit_destroy_gpilot_conduit (GnomePilotConduit*); -#define CONDUIT_VERSION "0.8.11" +#define CONDUIT_VERSION "0.1.0" #ifdef G_LOG_DOMAIN #undef G_LOG_DOMAIN #endif -#define G_LOG_DOMAIN "calconduit" +#define G_LOG_DOMAIN "ecalconduit" #define DEBUG_CALCONDUIT 1 /* #undef DEBUG_CALCONDUIT */ @@ -311,18 +316,6 @@ start_calendar_server (ECalConduitContext *ctxt) } /* Utility routines */ -static const char * -status_to_string (gint status) -{ - switch(status) { - case GnomePilotRecordNothing: return "GnomePilotRecordNothing"; - case GnomePilotRecordDeleted: return "GnomePilotRecordDeleted"; - case GnomePilotRecordNew: return "GnomePilotRecordNew"; - case GnomePilotRecordModified: return "GnomePilotRecordModified"; - } - - return "Unknown"; -} static icalrecurrencetype_weekday get_ical_day (int day) { @@ -1216,12 +1209,12 @@ conduit_get_gpilot_conduit (guint32 pilot_id) gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt); gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt); -/* gtk_signal_connect (retval, "add_archive_record", (GtkSignalFunc) add_archive_record, ctxt); */ + gtk_signal_connect (retval, "add_archive_record", (GtkSignalFunc) add_archive_record, ctxt); gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt); gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt); -/* gtk_signal_connect (retval, "delete_archive_record", (GtkSignalFunc) delete_archive_record, ctxt); */ + gtk_signal_connect (retval, "delete_archive_record", (GtkSignalFunc) delete_archive_record, ctxt); gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt); gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt); |