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

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

Author: dgollub
Date: Mon Mar 30 00:50:49 2009
New Revision: 5443
URL: http://www.opensync.org/changeset/5443

Log:
Ported syncml plugin to OSyncObjTypeSinkFunctions API change (r5432)
Still not working due to drop of osync_plugin_info_get_sink (WIP).

refs #1086

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

Modified: plugins/syncml/src/syncml_common.c
==============================================================================
--- plugins/syncml/src/syncml_common.c	Mon Mar 30 00:43:15 2009	(r5442)
+++ plugins/syncml/src/syncml_common.c	Mon Mar 30 00:50:49 2009	(r5443)
@@ -792,18 +792,18 @@
 			goto error_free_env;
 	}
 
-	/* prepare the function list for OpenSync */
-	OSyncObjTypeSinkFunctions main_functions;
-	memset(&main_functions, 0, sizeof(main_functions));
-	main_functions.sync_done = sync_done;
-	main_functions.disconnect = disconnect;
 
 	/* Register main sink for connect and disconnect functions */
 	OSyncObjTypeSink *mainsink = osync_objtype_main_sink_new(oerror);
 	if (!mainsink)
 		goto error_free_env;
 
-	osync_objtype_sink_set_functions(mainsink, main_functions, env);
+	/* Set mainsink plugin functions */
+	osync_objtype_sink_set_sync_done_func(mainsink, sync_done);
+	osync_objtype_sink_set_disconnect_func(mainsink, disconnect);
+
+	osync_objtype_sink_set_userdata(mainsink, env);
+
 	osync_objtype_sink_enable_anchor(mainsink, TRUE);
 	osync_plugin_info_set_main_sink(info, mainsink);
 	osync_objtype_sink_unref(mainsink);

Modified: plugins/syncml/src/syncml_ds_client.c
==============================================================================
--- plugins/syncml/src/syncml_ds_client.c	Mon Mar 30 00:43:15 2009	(r5442)
+++ plugins/syncml/src/syncml_ds_client.c	Mon Mar 30 00:50:49 2009	(r5443)
@@ -40,13 +40,10 @@
 		if (!sinkEnabled)
 			continue;
 
-
-                OSyncObjTypeSinkFunctions functions;
-                memset(&functions, 0, sizeof(functions));
-		functions.connect = syncml_connect;
-		functions.connect_done = syncml_connect_done;
-                functions.get_changes = ds_client_get_changeinfo;
-		functions.batch_commit = ds_client_batch_commit;
+		osync_objtype_sink_set_connect_func(sink, syncml_connect);
+		osync_objtype_sink_set_connect_done_func(sink, syncml_connect_done);
+                osync_objtype_sink_set_get_changes_func(sink, ds_client_get_changeinfo);
+		osync_objtype_sink_set_batch_commit_func(sink, ds_client_batch_commit);
 
 		// Request an anchor from the framework.
 		osync_objtype_sink_enable_anchor(sink, TRUE);
@@ -74,7 +71,7 @@
 
 		osync_objformat_ref(database->objformat);
 
-                osync_objtype_sink_set_functions(sink, functions, database);
+                osync_objtype_sink_set_userdata(sink, database);
 
 		env->databases = g_list_append(env->databases, database);
 

Modified: plugins/syncml/src/syncml_ds_server.c
==============================================================================
--- plugins/syncml/src/syncml_ds_server.c	Mon Mar 30 00:43:15 2009	(r5442)
+++ plugins/syncml/src/syncml_ds_server.c	Mon Mar 30 00:50:49 2009	(r5443)
@@ -39,12 +39,10 @@
 		if (!sinkEnabled)
 			continue;
 
-                OSyncObjTypeSinkFunctions functions;
-                memset(&functions, 0, sizeof(functions));
-		functions.connect = syncml_connect;
-		functions.connect_done = syncml_connect_done;
-                functions.get_changes = ds_server_get_changeinfo;
-		functions.batch_commit = ds_server_batch_commit;
+		osync_objtype_sink_set_connect_func(sink, syncml_connect);
+		osync_objtype_sink_set_connect_done_func(sink, syncml_connect_done);
+                osync_objtype_sink_set_get_changes_func(sink, ds_server_get_changeinfo);
+		osync_objtype_sink_set_batch_commit_func(sink, ds_server_batch_commit);
 
 		// Request an anchor from the framework.
 		osync_objtype_sink_enable_anchor(sink, TRUE);
@@ -73,7 +71,7 @@
 
 		osync_objformat_ref(database->objformat);
 
-                osync_objtype_sink_set_functions(sink, functions, database);
+                osync_objtype_sink_set_userdata(sink, database);
 
 		env->databases = g_list_append(env->databases, database);