Changeset 1765

Timestamp:

02/19/07 18:11:34 (22 months ago)

Author:

dgollub

Message:

Removed OSyncKDEEnv.
Moved contact_sink in impl class.
Fixed wrong use of contact_sink.

Location:

plugins/kdepim/src

Files:

• kdepim_impl.cpp (modified) (1 diff)
• kdepim_sync.cpp (modified) (6 diffs)
• osyncbase.h (modified) (2 diffs)

plugins/kdepim/src/kdepim_impl.cpp

@@ -89 +89 @@
                         initKDE();
 
-                        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+                        contact_sink = osync_objtype_sink_new("contact", error);
+
                         QString tablepath = QString("%1/hashtable.db").arg(osync_plugin_info_get_configdir(info));
-                        mHashtable = osync_hashtable_new(tablepath, osync_objtype_sink_get_name(sink), error);
+                        mHashtable = osync_hashtable_new(tablepath, osync_objtype_sink_get_name(contact_sink), error);
 
                         mKaddrbook = new KContactDataSource(mHashtable);

plugins/kdepim/src/kdepim_sync.cpp

@@ -33 +33 @@
 static void kde_finalize(void *userdata)
 {
-//      osync_debug("kde", 3, "%s()", __FUNCTION__);
-
+        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, userdata);
         KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata;
         delete impl_object;
+        osync_trace(TRACE_EXIT, "%s(%p)", __func__, userdata);
 }
 
 static void kde_connect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
 {
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx);
         KdePluginImplementationBase *impl_object = (KdePluginImplementationBase*)userdata;
         impl_object->connect(info, ctx);
+        osync_trace(TRACE_EXIT, "%s", __func__);
 }
 
@@ -97 +99 @@
 static void *kde_initialize(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error)
 {
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, plugin, info, error);
+
         KdeImplInitFunc init_func;
         KdePluginImplementationBase *impl_object;
@@ -123 +127 @@
 
         do {
-                OSyncObjTypeSink *sink = osync_objtype_sink_new("contact", error);
-                if (!sink)
+                impl_object->contact_sink = osync_objtype_sink_new("contact", error);
+                if (!impl_object->contact_sink)
                         goto error;
 
-                osync_objtype_sink_add_objformat(sink, "vcard30");
+                osync_objtype_sink_add_objformat(impl_object->contact_sink, "vcard30");
 
                 /* Every sink can have different functions ... */
@@ -140 +144 @@
                 /* We pass the OSyncFileDir object to the sink, so we dont have to look it up
                  * again once the functions are called */
-                osync_objtype_sink_set_functions(sink, functions, impl_object);
-                osync_plugin_info_add_objtype(info, sink);
+                osync_objtype_sink_set_functions(impl_object->contact_sink, functions, impl_object);
+                osync_plugin_info_add_objtype(info, impl_object->contact_sink);
 
         } while(0);
@@ -148 +152 @@
         /* Return the created object to the sync engine */
         return (void*)impl_object;
+        osync_trace(TRACE_EXIT, "%s: %p", __func__, impl_object);
+
 error:
+        osync_trace(TRACE_EXIT_ERROR,  "%s: NULL", __func__);
         return NULL;
 }
@@ -157 +164 @@
 /* Here we actually tell opensync which sinks are available. For this plugin, we
  * go through the list of directories and enable all, since all have been configured */
-static osync_bool kde_discover(void *data, OSyncPluginInfo *info, OSyncError **error)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, error);
+static osync_bool kde_discover(void *userdata, OSyncPluginInfo *info, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, error);
         
-        OSyncKDEEnv *env = (OSyncKDEEnv *)data;
-
-        osync_objtype_sink_set_available(env->contact_sink, TRUE);
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata;
+
+        osync_objtype_sink_set_available(impl_object->contact_sink, TRUE);
 
         osync_trace(TRACE_EXIT, "%s", __func__);

plugins/kdepim/src/osyncbase.h

@@ -12 +12 @@
 }
 
-typedef struct OSyncKDEEnv {
-        char *change_id;
-        OSyncObjTypeSink *contact_sink;
-} OSyncKDEEnv;
 /** Base class to OpenSync plugin.
  *
@@ -40 +36 @@
                  */
                 virtual ~KdePluginImplementationBase() { };
+
+                OSyncObjTypeSink *contact_sink;
+
 };