[Opensync-commits] r5289 - plugins/mozilla-sync/trunk/src

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

Author: henrik
Date: Thu Mar 12 20:59:40 2009
New Revision: 5289
URL: http://www.opensync.org/changeset/5289

Log:
Update to latest OpenSync API changes

Modified:
   plugins/mozilla-sync/trunk/src/mozilla-config.cpp
   plugins/mozilla-sync/trunk/src/mozilla-sync.cpp
   plugins/mozilla-sync/trunk/src/mozilla-xpcom.cpp

Modified: plugins/mozilla-sync/trunk/src/mozilla-config.cpp
==============================================================================
--- plugins/mozilla-sync/trunk/src/mozilla-config.cpp	Wed Mar 11 17:10:44 2009	(r5288)
+++ plugins/mozilla-sync/trunk/src/mozilla-config.cpp	Thu Mar 12 20:59:40 2009	(r5289)
@@ -55,7 +55,7 @@
 	@return TRUE if default profile directory found; FALSE otherwise
 **/
 static gboolean try_find_profile_directory( 
-	char **szFoundProfileDirectory, 
+	const char **szFoundProfileDirectory, 
 	const char* szTrySubDir, 
 	char **pSzError, 
 	void (*pLogFunction)(int level, bool sensitive, const char* szFile, int iLine, const char *szFunc, const char* szFormat, ...))
@@ -104,7 +104,7 @@
 	@return TRUE if default profile directory found; FALSE otherwise
 **/
 static gboolean find_default_profile_directory( 
-	char **szFoundProfileDirectory, 
+	const char **szFoundProfileDirectory, 
 	char **pSzError, 
 	void (*pLogFunction)(int level, bool sensitive, const char* szFile, int iLine, const char *szFunc, const char* szFormat, ...))
 { 	
@@ -132,15 +132,15 @@
 
 	pMozillaConfig->szProfileDirectory=NULL;
 
-	OSyncPluginAdvancedOption *pOSyncPluginAdvancedOption;
-
-	char *szProfileDir;
+	const char *szProfileDir;
 	gboolean fProfileDir=FALSE;
-	pOSyncPluginAdvancedOption=osync_plugin_config_get_advancedoption_value_by_name(pOSyncPluginConfig, "profile-directory");
-	if (pOSyncPluginAdvancedOption) {
-		szProfileDir=g_strdup(osync_plugin_advancedoption_get_value(pOSyncPluginAdvancedOption));
-		if (*szProfileDir) fProfileDir=TRUE;
-		osync_plugin_advancedoption_unref(pOSyncPluginAdvancedOption); }
+
+
+        szProfileDir=osync_plugin_config_get_advancedoption_value_by_name(pOSyncPluginConfig, "profile-directory"); 
+        if (szProfileDir) { 
+                if (*szProfileDir) fProfileDir=TRUE;
+	} 
+
 	if (!fProfileDir)
 		fProfileDir=find_default_profile_directory(&szProfileDir, pSzError, pLogFunction);
 	if (!fProfileDir) 

Modified: plugins/mozilla-sync/trunk/src/mozilla-sync.cpp
==============================================================================
--- plugins/mozilla-sync/trunk/src/mozilla-sync.cpp	Wed Mar 11 17:10:44 2009	(r5288)
+++ plugins/mozilla-sync/trunk/src/mozilla-sync.cpp	Thu Mar 12 20:59:40 2009	(r5289)
@@ -463,7 +463,7 @@
 		void *data)
 {
 	LOG_ENTRY(10, "(%p, %p, %p, %d, %p)", pOSyncObjTypeSink, pOSyncPluginInfo, pOSyncContext, fSlow, data);
-	OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink);
+	OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) data;
 	int i = 0;
 	OSyncError *pError = NULL;
 
@@ -713,7 +713,7 @@
 	}
 
 
-	OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink);
+	OSyncMozillaDatabase *pOSyncMozillaDatabase = (OSyncMozillaDatabase*) data;
 	OSyncHashTable *pHT = pOSyncMozillaDatabase->pOSyncHashTable;
 
 	gboolean f;
@@ -772,7 +772,7 @@
 {
 	LOG_ENTRY(10, "(%p, %p, %p)", pOSyncPluginInfo, pOSyncContext, data);
 
-	OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink);
+	OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) data;
 
 	OSyncError *error = NULL;
 
@@ -812,8 +812,8 @@
 
 	OSyncError *error = NULL;
 
-	OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink);
-	OSyncMozillaEnv *env = (OSyncMozillaEnv *)data;
+	OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) data;
+	OSyncMozillaEnv *env = db->pOSyncMozillaEnv;
 
 	// TODO: Check the exact meaning of each timeout, and ajust accordingly
 	osync_objtype_sink_set_getchanges_timeout(pOSyncObjTypeSink, 4*60); // 4 minutes
@@ -899,7 +899,7 @@
 	LOG_ENTRY(10, "(%p, %p, %p, %p)", pOSyncObjTypeSink, pOSyncPluginInfo, pOSyncContext, data);
 
 	OSyncMozillaEnv *env = (OSyncMozillaEnv *)data;
-	OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) osync_objtype_sink_get_userdata(pOSyncObjTypeSink);
+	OSyncMozillaDatabase *db = (OSyncMozillaDatabase*) data;
 	
 	if (db->pOSyncHashTable) {
 		osync_hashtable_unref(db->pOSyncHashTable);

Modified: plugins/mozilla-sync/trunk/src/mozilla-xpcom.cpp
==============================================================================
--- plugins/mozilla-sync/trunk/src/mozilla-xpcom.cpp	Wed Mar 11 17:10:44 2009	(r5288)
+++ plugins/mozilla-sync/trunk/src/mozilla-xpcom.cpp	Thu Mar 12 20:59:40 2009	(r5289)
@@ -166,6 +166,7 @@
 	MOZ_ERROR_CHECK_FALSE(rv, "GetPath");
 	LOG(10, "GRE path: [%s]", NS_ConvertUTF16toUTF8(s).get());
 
+	LOG(10, "ProfileDir: [%s]", szProfileDirectory);
 	nsCString csProfileDir;
   	rv = NS_CStringSetData(csProfileDir, szProfileDirectory);
 	MOZ_ERROR_CHECK_FALSE(rv, "NS_CStringSetData for szProfileDirectory");