Menu
▾
▴
[Opensync-commits] r5215 - in plugins/mozilla-sync/trunk: . src
|
From: <dg...@su...> - 2009-01-22 18:14:15
|
Author: henrik Date: Thu Jan 22 19:12:55 2009 New Revision: 5215 URL: http://www.opensync.org/changeset/5215 Log: Update to latest OpenSync API Modified: plugins/mozilla-sync/trunk/CMakeLists.txt plugins/mozilla-sync/trunk/src/mozilla-sync.cpp Modified: plugins/mozilla-sync/trunk/CMakeLists.txt ============================================================================== --- plugins/mozilla-sync/trunk/CMakeLists.txt Tue Jan 20 19:21:30 2009 (r5214) +++ plugins/mozilla-sync/trunk/CMakeLists.txt Thu Jan 22 19:12:55 2009 (r5215) @@ -29,7 +29,7 @@ ENDIF(COMMAND cmake_policy) SET( PROJECT_NAME mozilla-sync ) -PROJECT( ${PROJECT_NAME} CXX ) +PROJECT( ${PROJECT_NAME} C CXX ) SET( CPACK_PACKAGE_VERSION_MAJOR "0") SET( CPACK_PACKAGE_VERSION_MINOR "1") Modified: plugins/mozilla-sync/trunk/src/mozilla-sync.cpp ============================================================================== --- plugins/mozilla-sync/trunk/src/mozilla-sync.cpp Tue Jan 20 19:21:30 2009 (r5214) +++ plugins/mozilla-sync/trunk/src/mozilla-sync.cpp Thu Jan 22 19:12:55 2009 (r5215) @@ -201,7 +201,9 @@ @return TRUE on success; FALSE on error **/ gboolean mozilla_sync_report_addressbook_changes_to_hash( - OSyncMozillaDatabase *pOSyncMozillaDatabase, OSyncPluginInfo *pOSyncPluginInfo, OSyncContext *pOSyncContext) { + OSyncMozillaDatabase *pOSyncMozillaDatabase, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext) { LOG_ENTRY(10, "(%p, %p, %p)", pOSyncMozillaDatabase, pOSyncPluginInfo, pOSyncContext); @@ -333,7 +335,9 @@ @return TRUE on success; FALSE on error **/ gboolean mozilla_sync_report_calendar_changes_to_hash( - OSyncMozillaDatabase *pOSyncMozillaDatabase, OSyncPluginInfo *pOSyncPluginInfo, OSyncContext *pOSyncContext) { + OSyncMozillaDatabase *pOSyncMozillaDatabase, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext) { LOG_ENTRY(10, "(%p, %p, %p)", pOSyncMozillaDatabase, pOSyncPluginInfo, pOSyncContext); @@ -451,17 +455,21 @@ @param pOSyncPluginInfo On entry we have what we gave in get_sync_info. @param pOSyncContext The context of the connect (e.g. to report error) **/ -static void mozilla_sync_get_changes(void *data, OSyncPluginInfo *pOSyncPluginInfo, OSyncContext *pOSyncContext) +static void mozilla_sync_get_changes( + OSyncObjTypeSink* pOSyncObjTypeSink, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext, + osync_bool fSlow, + void *data) { - LOG_ENTRY(10, "(%p, %p, %p)", data, pOSyncPluginInfo, pOSyncContext); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(pOSyncPluginInfo); - OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(sink); + LOG_ENTRY(10, "(%p, %p, %p, %d, %p)", pOSyncObjTypeSink, pOSyncPluginInfo, pOSyncContext, fSlow, data); + OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink); int i = 0; OSyncError *pError = NULL; // Thank you Michael Bell for corrections // &&& osync_hashtable_reset_reports(pOSyncMozillaDatabase->pOSyncHashTable); - if (osync_objtype_sink_get_slowsync(pOSyncMozillaDatabase->pOSyncObjTypeSink)) { + if (osync_objtype_sink_get_slowsync(pOSyncMozillaDatabase->pOSyncObjTypeSink) || fSlow) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); if (!osync_hashtable_slowsync(pOSyncMozillaDatabase->pOSyncHashTable, &pError)) { @@ -472,7 +480,7 @@ } } - LOG(10, "Getting changes for [%s]", osync_objtype_sink_get_name(sink)); + LOG(10, "Getting changes for [%s]", osync_objtype_sink_get_name(pOSyncObjTypeSink)); gboolean f; @@ -494,7 +502,7 @@ return; } - LOG(10, "Checking for deleted [%s]", osync_objtype_sink_get_name(sink)); + LOG(10, "Checking for deleted [%s]", osync_objtype_sink_get_name(pOSyncObjTypeSink)); OSyncList *u; OSyncList *uids = osync_hashtable_get_deleted(pOSyncMozillaDatabase->pOSyncHashTable); @@ -534,7 +542,7 @@ } osync_context_report_success(pOSyncContext); - LOG(10, "Done getting changes for [%s]", osync_objtype_sink_get_name(sink)); + LOG(10, "Done getting changes for [%s]", osync_objtype_sink_get_name(pOSyncObjTypeSink)); LOG_EXIT(10, "void"); } @@ -676,10 +684,13 @@ @param pOSyncContext The context of the connect (e.g. to report error) @param pChange The change we shall commit **/ -static void mozilla_sync_commit_change(void *data, OSyncPluginInfo *pOSyncPluginInfo, - OSyncContext *pOSyncContext, OSyncChange *pChange) +static void mozilla_sync_commit_change( + OSyncObjTypeSink* pOSyncObjTypeSink, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext, + OSyncChange *pChange, void *data) { - LOG_ENTRY(10, "(%p, %p, %p, %p)", data, pOSyncPluginInfo, pOSyncContext, pChange); + LOG_ENTRY(10, "(%p, %p, %p, %p)", pOSyncObjTypeSink, pOSyncPluginInfo, pOSyncContext, data); // Log what we are about to do @@ -702,8 +713,7 @@ } - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(pOSyncPluginInfo); - OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(sink); + OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink); OSyncHashTable *pHT = pOSyncMozillaDatabase->pOSyncHashTable; gboolean f; @@ -755,17 +765,19 @@ @param pOSyncPluginInfo On entry we have what we gave in get_sync_info. @param pOSyncContext The context of the connect (e.g. to report error) **/ -static void mozilla_sync_done(void *data, OSyncPluginInfo *pOSyncPluginInfo, OSyncContext *pOSyncContext) +static void mozilla_sync_done(OSyncObjTypeSink* pOSyncObjTypeSink, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext, + void *data) { - LOG_ENTRY(10, "(%p, %p, %p)", data, pOSyncPluginInfo, pOSyncContext); + LOG_ENTRY(10, "(%p, %p, %p)", pOSyncPluginInfo, pOSyncContext, data); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(pOSyncPluginInfo); - OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(sink); + OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink); OSyncError *error = NULL; LOG(10, "Updating anchor to value [%s]", db->szAnchorValue); - OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); + OSyncAnchor *anchor = osync_objtype_sink_get_anchor(pOSyncObjTypeSink); if (!osync_anchor_update(anchor, db->szAnchorValue, &error)) { osync_context_report_osyncerror(pOSyncContext, error); LOG_EXIT_ERROR_OSYNC_SZ(10, &error, "Could not do osync_anchor_update"); @@ -789,30 +801,33 @@ @param pOSyncPluginInfo On entry we have what we gave in get_sync_info. @param pOSyncContext The context of the connect (e.g. to report error) **/ -static void mozilla_sync_connect(void *data, OSyncPluginInfo *pOSyncPluginInfo, OSyncContext *pOSyncContext) +static void mozilla_sync_connect( + OSyncObjTypeSink* pOSyncObjTypeSink, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext, + void *data) { - LOG_ENTRY(10, "(%p, %p, %p)", data, pOSyncPluginInfo, pOSyncContext); + LOG_ENTRY(10, "(%p, %p, %p, %p)", pOSyncObjTypeSink, pOSyncPluginInfo, pOSyncContext, data); OSyncError *error = NULL; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(pOSyncPluginInfo); - OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(sink); + OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink); OSyncMozillaEnv *env = (OSyncMozillaEnv *)data; // TODO: Check the exact meaning of each timeout, and ajust accordingly - osync_objtype_sink_set_getchanges_timeout(sink, 4*60); // 4 minutes - osync_objtype_sink_set_commit_timeout(sink, 4*60); // 4 minutes - osync_objtype_sink_set_batchcommit_timeout(sink, 4*60); // 4 minutes - osync_objtype_sink_set_committedall_timeout(sink, 4*60); // 4 minutes - osync_objtype_sink_set_syncdone_timeout(sink, 4*60); // 4 minutes - osync_objtype_sink_set_write_timeout(sink, 4*60); // 4 minutes - osync_objtype_sink_set_read_timeout(sink, 4*60); // 4 minutes + osync_objtype_sink_set_getchanges_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes + osync_objtype_sink_set_commit_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes + osync_objtype_sink_set_batchcommit_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes + osync_objtype_sink_set_committedall_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes + osync_objtype_sink_set_syncdone_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes + osync_objtype_sink_set_write_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes + osync_objtype_sink_set_read_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes char *tablepath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "hashtable.db", osync_plugin_info_get_configdir(pOSyncPluginInfo)); LOG(10, "Initializing hashtable [%s]", tablepath); // Note that despite it's name, osync_hashtable_new, will re-use the hash-table, if it exists - db->pOSyncHashTable = osync_hashtable_new(tablepath, osync_objtype_sink_get_name(sink), &error); + db->pOSyncHashTable = osync_hashtable_new(tablepath, osync_objtype_sink_get_name(pOSyncObjTypeSink), &error); g_free(tablepath); if (!db->pOSyncHashTable) { @@ -826,7 +841,7 @@ return; } - OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); + OSyncAnchor *anchor = osync_objtype_sink_get_anchor(pOSyncObjTypeSink); osync_bool same; if (!osync_anchor_compare(anchor, db->szAnchorValue, &same, &error)) { osync_context_report_osyncerror(pOSyncContext, error); @@ -875,13 +890,16 @@ @param pOSyncPluginInfo On entry we have what we gave in get_sync_info. @param pOSyncContext The context of the connect (e.g. to report error) **/ -static void mozilla_sync_disconnect(void *data, OSyncPluginInfo *pOSyncPluginInfo, OSyncContext *pOSyncContext) +static void mozilla_sync_disconnect( + OSyncObjTypeSink* pOSyncObjTypeSink, + OSyncPluginInfo *pOSyncPluginInfo, + OSyncContext *pOSyncContext, + void *data) { - LOG_ENTRY(10, "(%p, %p, %p)", data, pOSyncPluginInfo, pOSyncContext); + LOG_ENTRY(10, "(%p, %p, %p, %p)", pOSyncObjTypeSink, pOSyncPluginInfo, pOSyncContext, data); OSyncMozillaEnv *env = (OSyncMozillaEnv *)data; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(pOSyncPluginInfo); - OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(sink); + OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink); if (db->pOSyncHashTable) { osync_hashtable_unref(db->pOSyncHashTable); |
