[Opensync-commits] r1080 - trunk/libsyncml/data_sync_api

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

Author: bellmich
Date: Thu Apr 30 17:00:20 2009
New Revision: 1080
URL: http://libsyncml.opensync.org/changeset/1080

Log:
The getAlertTypeCallback should only be called once per data store.

Modified:
   trunk/libsyncml/data_sync_api/data_sync_client.c
   trunk/libsyncml/data_sync_api/transport_http_client.c

Modified: trunk/libsyncml/data_sync_api/data_sync_client.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_client.c	Thu Apr 30 14:59:55 2009	(r1079)
+++ trunk/libsyncml/data_sync_api/data_sync_client.c	Thu Apr 30 17:00:20 2009	(r1080)
@@ -182,6 +182,11 @@
 		if (*error)
 			goto error;
 	}
+	if (alertType == SML_ALERT_UNKNOWN)
+	{
+		smlTrace(TRACE_INTERNAL, "%s: no alert type => slow-sync", __func__);
+		alertType == SML_ALERT_SLOW_SYNC;
+	}
 	if (alertType != SML_ALERT_SLOW_SYNC)
 	{
 		/* this must be a two-way-sync */

Modified: trunk/libsyncml/data_sync_api/transport_http_client.c
==============================================================================
--- trunk/libsyncml/data_sync_api/transport_http_client.c	Thu Apr 30 14:59:55 2009	(r1079)
+++ trunk/libsyncml/data_sync_api/transport_http_client.c	Thu Apr 30 17:00:20 2009	(r1080)
@@ -146,19 +146,7 @@
 	for (; o; o = o->next) { 
 		SmlDataSyncDatastore *datastore = o->data;
 
-		SmlAlertType alertType = SML_ALERT_SLOW_SYNC;
-		if (dsObject->getAlertTypeCallback)
-		{
-			alertType = dsObject->getAlertTypeCallback(
-						dsObject,
-						datastore->sourceUri,
-						SML_ALERT_UNKNOWN,
-						dsObject->getAlertTypeUserdata,
-						error);
-			if (*error)
-				goto error;
-		}
-		if (!smlDataSyncClientSendAlert(datastore, alertType, error))
+		if (!smlDataSyncClientSendAlert(datastore, SML_ALERT_UNKNOWN, error))
 			goto error;
 	}
 	smlTrace(TRACE_INTERNAL, "%s: all datastores created their alerts", __func__);