[Opensync-commits] r5295 - plugins/opie-sync/src

[<svn...@op...>]

Author: paule
Date: Sat Mar 21 15:59:22 2009
New Revision: 5295
URL: http://www.opensync.org/changeset/5295

Log:
Fix for change to plugin sink function signatures

Modified:
   plugins/opie-sync/src/opie_sync.c

Modified: plugins/opie-sync/src/opie_sync.c
==============================================================================
--- plugins/opie-sync/src/opie_sync.c	Tue Mar 17 14:02:07 2009	(r5294)
+++ plugins/opie-sync/src/opie_sync.c	Sat Mar 21 15:59:22 2009	(r5295)
@@ -247,11 +247,10 @@
 }
 
 
-static void opie_sync_connect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+static void opie_sync_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx);
-	OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-	OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink);
+	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx, data);
+	OpieSinkEnv *env = (OpieSinkEnv *)data;
 
 	OSyncError *error = NULL;
 
@@ -316,15 +315,14 @@
 	osync_error_unref(&error);
 }
 
-static void opie_sync_get_changes(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+static void opie_sync_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx);
-	OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-	OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink);
+	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %d, %p)", __func__, sink, info, ctx, slow_sync, data);
+	OpieSinkEnv *env = (OpieSinkEnv *)data;
 
 	OSyncError *error = NULL;
 
-	if (osync_objtype_sink_get_slowsync(sink)) {
+	if (slow_sync) {
 		osync_trace(TRACE_INTERNAL, "Slow sync requested");
 
 		if (!osync_hashtable_slowsync(env->hashtable, &error)) {
@@ -446,11 +444,10 @@
 	osync_trace(TRACE_EXIT, "%s", __func__);
 }
 
-static void opie_sync_commit_change(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change)
+static void opie_sync_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx);
-	OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-	OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink);
+	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, data);
+	OpieSinkEnv *env = (OpieSinkEnv *)data;
 
 	OSyncError *error = NULL;
 	const char *ext_uid = osync_change_get_uid(change);
@@ -551,11 +548,10 @@
 	osync_error_unref(&error);
 }
 
-static void opie_sync_sync_done(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+static void opie_sync_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx);
-	OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-	OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink);
+	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data);
+	OpieSinkEnv *env = (OpieSinkEnv *)data;
 	OSyncError *error = NULL;
 	
 	if ( !opie_put_sink(env) ) {
@@ -585,10 +581,9 @@
 	osync_error_unref(&error);
 }
 
-static void opie_sync_disconnect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+static void opie_sync_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
-	OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-	OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink);
+	OpieSinkEnv *env = (OpieSinkEnv *)data;
 	
 	/* Close the hashtable */
 	osync_hashtable_unref(env->hashtable);