From: <svn...@op...> - 2009-03-31 14:42:09
|
Author: henrik Date: Tue Mar 31 16:41:53 2009 New Revision: 5490 URL: http://www.opensync.org/changeset/5490 Log: migrated from OSyncAnchor to OSyncSinkStateDB Modified: plugins/mozilla-sync/trunk/src/mozilla-sync.cpp Modified: plugins/mozilla-sync/trunk/src/mozilla-sync.cpp ============================================================================== --- plugins/mozilla-sync/trunk/src/mozilla-sync.cpp Tue Mar 31 16:41:50 2009 (r5489) +++ plugins/mozilla-sync/trunk/src/mozilla-sync.cpp Tue Mar 31 16:41:53 2009 (r5490) @@ -766,8 +766,8 @@ OSyncError *error = NULL; LOG(10, "Updating anchor to value [%s]", db->szAnchorValue); - OSyncAnchor *anchor = osync_objtype_sink_get_anchor(pOSyncObjTypeSink); - if (!osync_anchor_update(anchor, db->szAnchorKey, db->szAnchorValue, &error)) { + OSyncSinkStateDB *pStateDB = osync_objtype_sink_get_state_db(pOSyncObjTypeSink); + if (!osync_sink_state_set(pStateDB, db->szAnchorKey, db->szAnchorValue, &error)) { osync_context_report_osyncerror(pOSyncContext, error); LOG_EXIT_ERROR_OSYNC_SZ(10, &error, "Could not do osync_anchor_update"); return; } @@ -807,11 +807,10 @@ osync_objtype_sink_set_read_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes - osync_objtype_sink_enable_anchor(pOSyncObjTypeSink, TRUE); - - OSyncAnchor *anchor = osync_objtype_sink_get_anchor(pOSyncObjTypeSink); + osync_objtype_sink_enable_state_db(pOSyncObjTypeSink, TRUE); + OSyncSinkStateDB *pStateDB = osync_objtype_sink_get_state_db(pOSyncObjTypeSink); osync_bool same; - if (!osync_anchor_compare(anchor, db->szAnchorKey, db->szAnchorValue, &same, &error)) { + if (!osync_sink_state_equal(pStateDB, db->szAnchorKey, db->szAnchorValue, &same, &error)) { osync_context_report_osyncerror(pOSyncContext, error); LOG_EXIT_ERROR_OSYNC_SZ(10, &error, "Could not do osync_anchor_compare"); return; } @@ -1049,8 +1048,8 @@ continue; } - // Request anchor functionality from OpenSync - osync_objtype_sink_enable_anchor(sink, TRUE); + // Request state database functionality from OpenSync + osync_objtype_sink_enable_state_db(sink, TRUE); // Request a hashtable from OpenSync osync_objtype_sink_enable_hashtable(sink, TRUE); |