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

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

Author: dgollub
Date: Mon Mar 30 04:40:10 2009
New Revision: 5447
URL: http://www.opensync.org/changeset/5447

Log:
Ported opie-sync plugin to slow-sync report API change (#1085)

Fixed typo from previous commit r5436 (of osync_objtype_sink_set_*_func)

refs #1085

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

Modified: plugins/opie-sync/src/opie_comms.c
==============================================================================
--- plugins/opie-sync/src/opie_comms.c	Mon Mar 30 04:36:36 2009	(r5446)
+++ plugins/opie-sync/src/opie_comms.c	Mon Mar 30 04:40:10 2009	(r5447)
@@ -247,16 +247,16 @@
 /*
  * opie_fetch_sink
  */
-gboolean opie_fetch_sink(OpieSinkEnv *env)
+gboolean opie_fetch_sink(OpieSinkEnv *env, OSyncContext *ctx)
 {
-	return opie_fetch_file(env->plugin_env, env->objtype, env->remotefile, &env->doc, env->sink);
+	return opie_fetch_file(env->plugin_env, env->objtype, env->remotefile, &env->doc, env->sink, ctx);
 }
 
 
 /*
  * opie_fetch_file
  */
-gboolean opie_fetch_file(OpiePluginEnv *env, OPIE_OBJECT_TYPE objtype, const char *remotefile, xmlDoc **doc, OSyncObjTypeSink *sink)
+gboolean opie_fetch_file(OpiePluginEnv *env, OPIE_OBJECT_TYPE objtype, const char *remotefile, xmlDoc **doc, OSyncObjTypeSink *sink, OSyncContext *ctx)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %p)", __func__, env, objtype, remotefile, doc, sink);
 	
@@ -334,9 +334,11 @@
 		if(rc)
 		{
 			if(!data) {
-				/* File didn't exist on the handheld (ie, clean device) */
-				if(sink)
-					osync_objtype_sink_set_slowsync(sink, TRUE);
+				/* File didn't exist on the handheld (ie, clean device).
+				 * And report a slowsync request
+				 */
+				osync_context_report_slowsync(ctx);
+
 				*doc = opie_xml_create_doc(objtype);
 				if(*doc == 0)
 					rc = FALSE;

Modified: plugins/opie-sync/src/opie_comms.h
==============================================================================
--- plugins/opie-sync/src/opie_comms.h	Mon Mar 30 04:36:36 2009	(r5446)
+++ plugins/opie-sync/src/opie_comms.h	Mon Mar 30 04:40:10 2009	(r5447)
@@ -39,8 +39,8 @@
 
 
 /* connect to the device and pull down the data */
-gboolean opie_fetch_sink(OpieSinkEnv *env);
-gboolean opie_fetch_file(OpiePluginEnv *env, OPIE_OBJECT_TYPE objtype, const char *remotefile, xmlDoc **doc, OSyncObjTypeSink *sink);
+gboolean opie_fetch_sink(OpieSinkEnv *env, OSyncContext *ctx);
+gboolean opie_fetch_file(OpiePluginEnv *env, OPIE_OBJECT_TYPE objtype, const char *remotefile, xmlDoc **doc, OSyncObjTypeSink *sink, OSyncContext *ctx);
 
 /* connect to the device and push the files back */
 gboolean opie_put_sink(OpieSinkEnv *env);

Modified: plugins/opie-sync/src/opie_sync.c
==============================================================================
--- plugins/opie-sync/src/opie_sync.c	Mon Mar 30 04:36:36 2009	(r5446)
+++ plugins/opie-sync/src/opie_sync.c	Mon Mar 30 04:40:10 2009	(r5447)
@@ -267,13 +267,13 @@
 	
 	if(!env->plugin_env->categories_doc) {
 		/* Fetch categories */
-		opie_fetch_file(env->plugin_env, OPIE_OBJECT_TYPE_CATEGORY, OPIE_CATEGORY_FILE, &env->plugin_env->categories_doc, NULL);
+		opie_fetch_file(env->plugin_env, OPIE_OBJECT_TYPE_CATEGORY, OPIE_CATEGORY_FILE, &env->plugin_env->categories_doc, NULL, ctx);
 	}
 	
 	g_mutex_unlock(env->plugin_env->plugin_mutex);
 	
 	/* pull the required data back */
-	if(!opie_fetch_sink(env))
+	if(!opie_fetch_sink(env, ctx))
 	{
 		/* failed */
 		char *errmsg;
@@ -291,7 +291,7 @@
 		if(!osync_anchor_compare(anchor, env->plugin_env->notes_path, &anchor_result, &error))
 			goto error;
 		if(!anchor_result)
-			osync_objtype_sink_set_slowsync(sink, TRUE);
+			osync_context_report_slowsync(ctx);
 	}
 	
 	osync_context_report_success(ctx);
@@ -601,9 +601,9 @@
 	/* Every sink can have different functions ... */
 	osync_objtype_sink_set_connect_func(sink, opie_sync_connect);
 	osync_objtype_sink_set_disconnect_func(sink, opie_sync_disconnect);
-	osync_objtype_sink_set_get_changes_set_func(sink, opie_sync_get_changes);
-	osync_objtype_sink_set_commit_set_func(sink, opie_sync_commit_change);
-	osync_objtype_sink_set_sync_done_set_func(sink, opie_sync_sync_done);
+	osync_objtype_sink_set_get_changes_func(sink, opie_sync_get_changes);
+	osync_objtype_sink_set_commit_func(sink, opie_sync_commit_change);
+	osync_objtype_sink_set_sync_done_func(sink, opie_sync_sync_done);
 
 	/* We pass the sink_env object to the sink, so we dont have to look it up
 		* again once the functions are called */