[Opensync-commits] r5415 - plugins/syncml/src

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

Author: dgollub
Date: Sun Mar 29 00:02:50 2009
New Revision: 5415
URL: http://www.opensync.org/changeset/5415

Log:
Port of OSyncPluginEnv API changes for syncml plugin.
Dropped legacy includes.

Modified:
   plugins/syncml/src/syncml_common.h
   plugins/syncml/src/syncml_ds_client.c
   plugins/syncml/src/syncml_ds_server.c

Modified: plugins/syncml/src/syncml_common.h
==============================================================================
--- plugins/syncml/src/syncml_common.h	Sat Mar 28 23:39:18 2009	(r5414)
+++ plugins/syncml/src/syncml_common.h	Sun Mar 29 00:02:50 2009	(r5415)
@@ -28,7 +28,6 @@
 #include <opensync/opensync-format.h>
 #include <opensync/opensync-plugin.h>
 #include <opensync/opensync-capabilities.h>
-#include <opensync/opensync-context.h>
 #include <opensync/opensync-data.h>
 #include <opensync/opensync-helper.h>
 #include <opensync/opensync-group.h>

Modified: plugins/syncml/src/syncml_ds_client.c
==============================================================================
--- plugins/syncml/src/syncml_ds_client.c	Sat Mar 28 23:39:18 2009	(r5414)
+++ plugins/syncml/src/syncml_ds_client.c	Sun Mar 29 00:02:50 2009	(r5415)
@@ -31,12 +31,10 @@
 	SmlError *error = NULL;
 	OSyncPluginConfig *config = osync_plugin_info_get_config(info);
 	OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
-	unsigned int i, num_objtypes = osync_plugin_info_num_objtypes(info);
-	osync_trace(TRACE_INTERNAL, "%s: %d objtypes", __func__, num_objtypes);
+	OSyncList *l, *list = osync_plugin_info_get_objtype_sinks(info);
 
-
-	for (i=0; i < num_objtypes; i++) {
-		OSyncObjTypeSink *sink = osync_plugin_info_nth_objtype(info, i);
+	for (l=list; l; l = l->next) {
+		OSyncObjTypeSink *sink = (OSyncObjTypeSink *) l->data;
 		osync_bool sinkEnabled = osync_objtype_sink_is_enabled(sink);
 		osync_trace(TRACE_INTERNAL, "%s: enabled => %d", __func__, sinkEnabled);
 		if (!sinkEnabled)
@@ -101,6 +99,9 @@
 	osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error));
 	smlErrorDeref(&error);
 oerror:
+	if (list)
+		osync_list_free(list);
+
 	osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, osync_error_print(oerror));
 	return FALSE;
 }

Modified: plugins/syncml/src/syncml_ds_server.c
==============================================================================
--- plugins/syncml/src/syncml_ds_server.c	Sat Mar 28 23:39:18 2009	(r5414)
+++ plugins/syncml/src/syncml_ds_server.c	Sun Mar 29 00:02:50 2009	(r5415)
@@ -30,11 +30,10 @@
 	SmlError *error = NULL;
 	OSyncPluginConfig *config = osync_plugin_info_get_config(info);
 	OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
-	unsigned int i, num_objtypes = osync_plugin_info_num_objtypes(info);
-	osync_trace(TRACE_INTERNAL, "%s: %d objtypes", __func__, num_objtypes);
+	OSyncList *l, *list = osync_plugin_info_get_objtype_sinks(info);
 
-	for (i=0; i < num_objtypes; i++) {
-		OSyncObjTypeSink *sink = osync_plugin_info_nth_objtype(info, i);
+	for (l=list; l; l = l->next) {
+		OSyncObjTypeSink *sink = (OSyncObjTypeSink *) l->data;
 		osync_bool sinkEnabled = osync_objtype_sink_is_enabled(sink);
 		osync_trace(TRACE_INTERNAL, "%s: enabled => %d", __func__, sinkEnabled);
 		if (!sinkEnabled)
@@ -86,12 +85,19 @@
                                         &error))
                                 goto error;
 	}
+	
+	osync_list_free(list);
+	list = NULL;
+
 	osync_trace(TRACE_EXIT, "%s - TRUE", __func__);
 	return TRUE;
 error:
 	osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error));
 	smlErrorDeref(&error);
 oerror:
+	if (list)
+		osync_list_free(list);
+
 	osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, osync_error_print(oerror));
 	return FALSE;
 }