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

[<dg...@su...>]

Author: paule
Date: Sun Jan 25 13:47:14 2009
New Revision: 5229
URL: http://www.opensync.org/changeset/5229

Log:
Fix for anchor API changes; fix for change to discovery function signature

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

Modified: plugins/opie-sync/src/opie_sync.c
==============================================================================
--- plugins/opie-sync/src/opie_sync.c	Sat Jan 24 19:13:57 2009	(r5228)
+++ plugins/opie-sync/src/opie_sync.c	Sun Jan 25 13:47:14 2009	(r5229)
@@ -298,10 +298,12 @@
 
 	if(env->objtype == OPIE_OBJECT_TYPE_NOTE) {
 		/* Check if the notes resource has changed since the last sync */
-		char *anchorpath = g_strdup_printf("%s/anchor.db", osync_plugin_info_get_configdir(info));
-		if (!osync_anchor_compare(anchorpath, "notespath", env->plugin_env->notes_path))
+		OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink);
+		osync_bool anchor_result = FALSE;
+		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);
-		g_free(anchorpath);
 	}
 	
 	osync_context_report_success(ctx);
@@ -561,9 +563,9 @@
 	}
 	
 	if(env->objtype == OPIE_OBJECT_TYPE_NOTE) {
-		char *anchorpath = g_strdup_printf("%s/anchor.db", osync_plugin_info_get_configdir(info));
- 		osync_anchor_update(anchorpath, "notespath", env->plugin_env->notes_path);
-		g_free(anchorpath);
+		OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink);
+ 		if(!osync_anchor_update(anchor, env->plugin_env->notes_path, &error))
+			goto error;
 	}
 	
 	if (!osync_hashtable_save(env->hashtable, &error))
@@ -662,6 +664,7 @@
 	env->note_env = opie_sync_create_sink_env(env, info, "note", OPIE_FORMAT_XML_NOTE, OPIE_OBJECT_TYPE_NOTE, NULL, "notes", "note", error);
 	if(!env->note_env)
 		goto error_free_env;
+	osync_objtype_sink_enable_anchor(env->note_env->sink, TRUE);
 	
 	env->qcopconn = NULL;
 	env->connected = FALSE;
@@ -708,7 +711,7 @@
 	osync_trace(TRACE_EXIT, "%s", __func__);
 }
 
-static osync_bool opie_sync_discover(void *data, OSyncPluginInfo *info, OSyncError **error)
+static osync_bool opie_sync_discover(OSyncPluginInfo *info, void *data, OSyncError **error)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, error);
 	
@@ -728,6 +731,7 @@
 	//osync_version_set_hardwareversion(version, "hardwareversion");
 	osync_plugin_info_set_version(info, version);
 	osync_version_unref(version);
+	
 
 	/* FIXME define capabilities */