[Opensync-commits] r5185 - plugins/kdepim/src

[<dg...@su...>]

Author: mkoller
Date: Sun Jan 18 20:15:11 2009
New Revision: 5185
URL: http://www.opensync.org/changeset/5185

Log:
use new sink argument in callbacks directly

Modified:
   plugins/kdepim/src/datasource.cpp

Modified: plugins/kdepim/src/datasource.cpp
==============================================================================
--- plugins/kdepim/src/datasource.cpp	Sun Jan 18 14:10:53 2009	(r5184)
+++ plugins/kdepim/src/datasource.cpp	Sun Jan 18 20:15:11 2009	(r5185)
@@ -14,13 +14,13 @@
 /* NB: the userdata passed to the sink callbacks is not the sink's userdata, as
  * you might expect, but instead the plugin's userdata, which in our case is the
  * KdePluginImplementation object pointer. So we need to get the sink object from
- * osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info))
+ * osync_objtype_sink_get_userdata(sink)
  */
 
 static void connect_wrapper(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *userdata)
 {
   osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __PRETTY_FUNCTION__, userdata, info, ctx);
-  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info));
+  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(sink);
   obj->connect(info, ctx);
   osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
 }
@@ -30,7 +30,7 @@
 static void disconnect_wrapper(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *userdata)
 {
   osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __PRETTY_FUNCTION__, userdata, info, ctx);
-  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info));
+  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(sink);
   obj->disconnect(info, ctx);
   osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
 }
@@ -41,7 +41,7 @@
                                 OSyncContext *ctx, osync_bool slow_sync,void *userdata)
 {
   osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __PRETTY_FUNCTION__, userdata, info, ctx);
-  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info));
+  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(sink);
   obj->get_changes(info, ctx);
   osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
 }
@@ -52,7 +52,7 @@
                            OSyncContext *ctx, OSyncChange *chg, void *userdata)
 {
   osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __PRETTY_FUNCTION__, userdata, info, ctx, chg);
-  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info));
+  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(sink);
   obj->commit(info, ctx, chg);
   osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
 }
@@ -62,7 +62,7 @@
 static void sync_done_wrapper(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *userdata)
 {
   osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __PRETTY_FUNCTION__, userdata, info, ctx);
-  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(osync_plugin_info_get_sink(info));
+  OSyncDataSource *obj = (OSyncDataSource *)osync_objtype_sink_get_userdata(sink);
   obj->sync_done(info, ctx);
   osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
 }