Menu
▾
▴
[Opensync-commits] r5176 - in plugins/gpe: . src
|
From: <dg...@su...> - 2009-01-17 00:10:11
|
Author: Graham Cobb Date: Sat Jan 17 01:09:13 2009 New Revision: 5176 URL: http://www.opensync.org/changeset/5176 Log: gpe-sync: Update to new sink functions API Modified: plugins/gpe/ChangeLog plugins/gpe/src/calendar.c plugins/gpe/src/contacts.c plugins/gpe/src/gpe_sync.c plugins/gpe/src/todo.c Modified: plugins/gpe/ChangeLog ============================================================================== --- plugins/gpe/ChangeLog Sat Jan 17 01:08:04 2009 (r5175) +++ plugins/gpe/ChangeLog Sat Jan 17 01:09:13 2009 (r5176) @@ -1,3 +1,17 @@ +2009-01-16 Graham Cobb <g+...@co...> + + * src/calendar.c: Update to new sink functions API: gpe_calendar_commit_change, + gpe_calendar_get_changes + + * src/contacts.c: Update to new sink functions API: gpe_contacts_commit_change, + gpe_contacts_get_changes + + * src/todo.c: Update to new sink functions API: gpe_todo_commit_change, + gpe_todo_get_changes + + * src/gpe_sync.c: Update to new sink functions API: gpe_connect, gpe_disconnect, + gpe_sync_done + 2009-01-14 Graham Cobb <g+...@co...> * src/gpe_sync.h: Remove already commented out "member" from environment Modified: plugins/gpe/src/calendar.c ============================================================================== --- plugins/gpe/src/calendar.c Sat Jan 17 01:08:04 2009 (r5175) +++ plugins/gpe/src/calendar.c Sat Jan 17 01:09:13 2009 (r5176) @@ -27,12 +27,12 @@ * \param change The change that has to be committed * */ -void gpe_calendar_commit_change (void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +void gpe_calendar_commit_change (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, userdata, info, ctx, change); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); - gpe_environment *env = (gpe_environment *)userdata; - sink_environment *sinkenv = (sink_environment *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info)); + sink_environment *sinkenv = (sink_environment *)userdata; + gpe_environment *env = sinkenv->gpe_env; gchar *response = NULL; char *result = NULL; char *modified = NULL; @@ -113,13 +113,13 @@ * \param ctx Context of the plugin * */ -void gpe_calendar_get_changes(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx) +void gpe_calendar_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slowsync, void *userdata) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %d, %p)", __func__, sink, info, ctx, slowsync, userdata); OSyncError *error = NULL; - gpe_environment *env = (gpe_environment *)userdata; - sink_environment *sinkenv = (sink_environment *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info)); + sink_environment *sinkenv = (sink_environment *)userdata; + gpe_environment *env = sinkenv->gpe_env; if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); @@ -127,7 +127,7 @@ return; } - if (osync_objtype_sink_get_slowsync(sinkenv->sink)) { + if (slowsync) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); if (!osync_hashtable_slowsync(sinkenv->hashtable, &error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); Modified: plugins/gpe/src/contacts.c ============================================================================== --- plugins/gpe/src/contacts.c Sat Jan 17 01:08:04 2009 (r5175) +++ plugins/gpe/src/contacts.c Sat Jan 17 01:09:13 2009 (r5176) @@ -27,12 +27,12 @@ * \param change The change that has to be committed * */ -void gpe_contacts_commit_change (void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +void gpe_contacts_commit_change (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, userdata, info, ctx, change); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); - gpe_environment *env = (gpe_environment *)userdata; - sink_environment *sinkenv = (sink_environment *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info)); + sink_environment *sinkenv = (sink_environment *)userdata; + gpe_environment *env = sinkenv->gpe_env; gchar *response = NULL; char *result = NULL; char *modified = NULL; @@ -113,13 +113,13 @@ * \param ctx Context of the plugin * */ -void gpe_contacts_get_changes(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx) +void gpe_contacts_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slowsync, void *userdata) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %d, %p)", __func__, sink, info, ctx, slowsync, userdata); OSyncError *error = NULL; - gpe_environment *env = (gpe_environment *)userdata; - sink_environment *sinkenv = (sink_environment *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info)); + sink_environment *sinkenv = (sink_environment *)userdata; + gpe_environment *env = sinkenv->gpe_env; if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); @@ -127,7 +127,7 @@ return; } - if (osync_objtype_sink_get_slowsync(sinkenv->sink)) { + if (slowsync) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); if (!osync_hashtable_slowsync(sinkenv->hashtable, &error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); Modified: plugins/gpe/src/gpe_sync.c ============================================================================== --- plugins/gpe/src/gpe_sync.c Sat Jan 17 01:08:04 2009 (r5175) +++ plugins/gpe/src/gpe_sync.c Sat Jan 17 01:09:13 2009 (r5176) @@ -176,12 +176,11 @@ osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__); } -static void gpe_disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void gpe_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - void *userdata = (sink_environment *)osync_objtype_sink_get_userdata(sink); - gpe_environment *env = ((sink_environment *)userdata)->gpe_env; + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); + sink_environment *sinkenv = (sink_environment *)data; + gpe_environment *env = sinkenv->gpe_env; gpe_disconnect_internal(env); @@ -365,17 +364,15 @@ } -static void gpe_connect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void gpe_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { char *client_err = NULL; OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, data, info, ctx); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); - // We need to get the context to load all our stuff. - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - void *userdata = (sink_environment *)osync_objtype_sink_get_userdata(sink); - gpe_environment *env = ((sink_environment *)userdata)->gpe_env; + sink_environment *sinkenv = (sink_environment *)data; + gpe_environment *env = sinkenv->gpe_env; /* Re-parse and re-discover */ if ( @@ -427,14 +424,14 @@ * * \param ctx The context of the plugin */ -static void sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - void *userdata = (sink_environment *)osync_objtype_sink_get_userdata(sink); - gpe_environment *env = ((sink_environment *)userdata)->gpe_env; + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); + + sink_environment *sinkenv = (sink_environment *)data; + gpe_environment *env = sinkenv->gpe_env; if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); Modified: plugins/gpe/src/todo.c ============================================================================== --- plugins/gpe/src/todo.c Sat Jan 17 01:08:04 2009 (r5175) +++ plugins/gpe/src/todo.c Sat Jan 17 01:09:13 2009 (r5176) @@ -27,12 +27,12 @@ * \param change The change that has to be committed * */ -void gpe_todo_commit_change (void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +void gpe_todo_commit_change (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, userdata, info, ctx, change); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); - gpe_environment *env = (gpe_environment *)userdata; - sink_environment *sinkenv = (sink_environment *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info)); + sink_environment *sinkenv = (sink_environment *)userdata; + gpe_environment *env = sinkenv->gpe_env; gchar *response = NULL; char *result = NULL; char *modified = NULL; @@ -114,13 +114,13 @@ * \param ctx Context of the plugin * */ -void gpe_todo_get_changes(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx) +void gpe_todo_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slowsync, void *userdata) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %d, %p)", __func__, sink, info, ctx, slowsync, userdata); OSyncError *error = NULL; - gpe_environment *env = (gpe_environment *)userdata; - sink_environment *sinkenv = (sink_environment *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info)); + sink_environment *sinkenv = (sink_environment *)userdata; + gpe_environment *env = sinkenv->gpe_env; if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); @@ -128,7 +128,7 @@ return; } - if (osync_objtype_sink_get_slowsync(sinkenv->sink)) { + if (slowsync) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); if (!osync_hashtable_slowsync(sinkenv->hashtable, &error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); |
