[Opensync-commits] r5434 - plugins/evolution2/src

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

Author: dgollub
Date: Mon Mar 30 00:14:57 2009
New Revision: 5434
URL: http://www.opensync.org/changeset/5434

Log:
Ported evo2-sync to OSyncObjTypeSinkFunctions API change (r5432)

refs #1086

Modified:
   plugins/evolution2/src/evolution2_ebook.c
   plugins/evolution2/src/evolution2_ecal.c

Modified: plugins/evolution2/src/evolution2_ebook.c
==============================================================================
--- plugins/evolution2/src/evolution2_ebook.c	Sun Mar 29 23:46:29 2009	(r5433)
+++ plugins/evolution2/src/evolution2_ebook.c	Mon Mar 30 00:14:57 2009	(r5434)
@@ -421,13 +421,11 @@
 		return TRUE;
 	}
 	
-	OSyncObjTypeSinkFunctions functions;
-	memset(&functions, 0, sizeof(functions));
-	functions.connect = evo2_ebook_connect;
-	functions.disconnect = evo2_ebook_disconnect;
-	functions.get_changes = evo2_ebook_get_changes;
-	functions.commit = evo2_ebook_modify;
-	functions.sync_done = evo2_ebook_sync_done;
+	osync_objtype_sink_set_connect_func(sink, evo2_ebook_connect);
+	osync_objtype_sink_set_disconnect_func(sink, evo2_ebook_disconnect);
+	osync_objtype_sink_set_get_changes_func(sink, evo2_ebook_get_changes);
+	osync_objtype_sink_set_commit_func(sink, evo2_ebook_modify);
+	osync_objtype_sink_set_sync_done_func(sink, evo2_ebook_sync_done);
 
 	osync_objtype_sink_enable_anchor(sink, TRUE);
 
@@ -456,7 +454,7 @@
 
 	env->contact_sink = osync_objtype_sink_ref(sink);
 
-	osync_objtype_sink_set_functions(sink, functions, env);
+	osync_objtype_sink_set_userdata(sink, env);
 	osync_trace(TRACE_EXIT, "%s", __func__);
 	return TRUE;
 

Modified: plugins/evolution2/src/evolution2_ecal.c
==============================================================================
--- plugins/evolution2/src/evolution2_ecal.c	Sun Mar 29 23:46:29 2009	(r5433)
+++ plugins/evolution2/src/evolution2_ecal.c	Mon Mar 30 00:14:57 2009	(r5434)
@@ -411,13 +411,11 @@
         if (!sinkEnabled)
                 return TRUE;
 
-        OSyncObjTypeSinkFunctions functions;
-        memset(&functions, 0, sizeof(functions));
-        functions.connect = evo2_ecal_connect;
-        functions.disconnect = evo2_ecal_disconnect;
-        functions.get_changes = evo2_ecal_get_changes;
-        functions.commit = evo2_ecal_modify;
-        functions.sync_done = evo2_ecal_sync_done;
+        osync_objtype_sink_set_connect_func(sink, evo2_ecal_connect);
+        osync_objtype_sink_set_disconnect_func(sink, evo2_ecal_disconnect);
+        osync_objtype_sink_set_get_changes_func(sink, evo2_ecal_get_changes);
+        osync_objtype_sink_set_commit_func(sink, evo2_ecal_modify);
+        osync_objtype_sink_set_sync_done_func(sink, evo2_ecal_sync_done);
 
 	osync_objtype_sink_enable_anchor(sink, TRUE);
 
@@ -467,7 +465,7 @@
 
         cal->sink = osync_objtype_sink_ref(sink);
 
-        osync_objtype_sink_set_functions(cal->sink, functions, cal);
+        osync_objtype_sink_set_userdata(cal->sink, cal);
 
 	env->calendars = g_list_append(env->calendars, cal);
 	return TRUE;