Menu
▾
▴
[Opensync-commits] r5236 - plugins/evolution2/src
|
From: <dg...@su...> - 2009-01-27 17:48:36
|
Author: ianmartin Date: Tue Jan 27 18:47:04 2009 New Revision: 5236 URL: http://www.opensync.org/changeset/5236 Log: Update function parameter lists to those introduced in Ticket #1018 Modified: plugins/evolution2/src/evolution2_ebook.c plugins/evolution2/src/evolution2_ecal.c Modified: plugins/evolution2/src/evolution2_ebook.c ============================================================================== --- plugins/evolution2/src/evolution2_ebook.c Tue Jan 27 16:40:39 2009 (r5235) +++ plugins/evolution2/src/evolution2_ebook.c Tue Jan 27 18:47:04 2009 (r5236) @@ -132,12 +132,11 @@ } -static void evo2_ebook_connect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ebook_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); OSyncEvoEnv *env = (OSyncEvoEnv *)data; osync_bool anchor_match; @@ -174,7 +173,7 @@ osync_error_unref(&error); } -static void evo2_ebook_disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ebook_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); OSyncEvoEnv *env = (OSyncEvoEnv *)data; @@ -189,14 +188,13 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void evo2_ebook_sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ebook_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); OSyncEvoEnv *env = (OSyncEvoEnv *)data; OSyncError *error = NULL; GError *gerror=NULL; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); if (!anchor) { osync_error_set(&error, OSYNC_ERROR_GENERIC, "Anchor missing for objtype \"%s\"", osync_objtype_sink_get_name(sink)); @@ -255,11 +253,10 @@ osync_change_unref(change); } -static void evo2_ebook_get_changes(void *indata, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ebook_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *userdata) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, indata, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncEvoEnv *env = (OSyncEvoEnv *)indata; + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %p)", __func__, sink, info, ctx, slow_sync ? "TRUE" : "FALSE", userdata); + OSyncEvoEnv *env = (OSyncEvoEnv *)userdata; OSyncError *error = NULL; GList *changes = NULL; @@ -271,7 +268,7 @@ int datasize = 0; GError *gerror = NULL; - if (osync_objtype_sink_get_slowsync(sink) == FALSE) { + if (slow_sync == FALSE) { osync_trace(TRACE_INTERNAL, "No slow_sync for contact"); if (!e_book_get_changes(env->addressbook, env->change_id, &changes, &gerror)) { osync_error_set(&error, OSYNC_ERROR_GENERIC, "Failed to alloc new default addressbook: %s", gerror ? gerror->message : "None"); @@ -334,9 +331,9 @@ osync_error_unref(&error); } -static void evo2_ebook_modify(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +static void evo2_ebook_modify(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, data); OSyncEvoEnv *env = (OSyncEvoEnv *)data; const char *uid = osync_change_get_uid(change); Modified: plugins/evolution2/src/evolution2_ecal.c ============================================================================== --- plugins/evolution2/src/evolution2_ecal.c Tue Jan 27 16:40:39 2009 (r5235) +++ plugins/evolution2/src/evolution2_ecal.c Tue Jan 27 18:47:04 2009 (r5236) @@ -82,13 +82,12 @@ return NULL; } -static void evo2_ecal_connect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ecal_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)osync_objtype_sink_get_userdata(sink); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); + OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)osync_objtype_sink_get_userdata(sink); if (!(evo_cal->calendar = evo2_ecal_open_cal(osync_strdup(evo_cal->uri), evo_cal->source_type, &error))) { goto error; @@ -123,11 +122,10 @@ osync_error_unref(&error); } -static void evo2_ecal_disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ecal_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)osync_objtype_sink_get_userdata(sink); if (evo_cal->calendar) { @@ -140,14 +138,13 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void evo2_ecal_sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ecal_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); OSyncEvoEnv *env = (OSyncEvoEnv *)data; OSyncError *error = NULL; GError *gerror = NULL; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)osync_objtype_sink_get_userdata(sink); OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); @@ -208,10 +205,9 @@ } -static void evo2_ecal_get_changes(void *indata, OSyncPluginInfo *info, OSyncContext *ctx) +static void evo2_ecal_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *indata) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, indata, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %p)", __func__, sink, info, ctx, slow_sync ? "TRUE" : "FALSE", indata); OSyncEvoEnv *env = (OSyncEvoEnv *)indata; OSyncError *error = NULL; @@ -225,7 +221,7 @@ OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)osync_objtype_sink_get_userdata(sink); - if (osync_objtype_sink_get_slowsync(sink) == FALSE) { + if (slow_sync == FALSE) { osync_trace(TRACE_INTERNAL, "No slow_sync for %s", evo_cal->objtype); if (!e_cal_get_changes(evo_cal->calendar, env->change_id, &changes, &gerror)) { osync_error_set(&error, OSYNC_ERROR_GENERIC, "Failed to open changed %s entries: %s", evo_cal->objtype, gerror ? gerror->message : "None"); @@ -283,9 +279,9 @@ osync_error_unref(&error); } -static void evo2_ecal_modify(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +static void evo2_ecal_modify(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, data); const char *uid = osync_change_get_uid(change); icalcomponent *icomp = NULL; @@ -295,7 +291,6 @@ OSyncData *odata = NULL; char *plain = NULL; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)osync_objtype_sink_get_userdata(sink); switch (osync_change_get_changetype(change)) { |
