Changeset 1763

Timestamp:

02/19/07 17:17:06 (22 months ago)

Author:

dgollub

Message:

Some other porting trials.. still not useable.

Location:

plugins/kdepim/src

Files:

• kdepim_impl.cpp (modified) (10 diffs)
• kdepim_sync.cpp (modified) (4 diffs)
• osyncbase.h (modified) (1 diff)

plugins/kdepim/src/kdepim_impl.cpp

@@ -43 +43 @@
 #include "osyncbase.h"
 #include "kaddrbook.h"
-#include "kcal.h"
-#include "knotes.h"
+//#include "kcal.h"
+//#include "knotes.h"
 static bool sentinal = false;
 
@@ -50 +50 @@
 {
         public:
-                KdePluginImplementation( OSyncMember *member )
-                                : mMember( member ),
-                                mApplication( 0 ),
+                KdePluginImplementation(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error)
+                                : mApplication( 0 ),
                                 mNewApplication( false )
                 {}
@@ -84 +83 @@
                 }
 
-                bool init(OSyncError **error)
+                bool init(OSyncPluginInfo *info, OSyncError **error)
                 {
                         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, error);
@@ -90 +89 @@
                         initKDE();
 
-                        mHashtable = osync_hashtable_new();
+                        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+                        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);
 
                         mKaddrbook = new KContactDataSource(mMember, mHashtable);
@@ -109 +110 @@
                 }
 
-                virtual void connect(OSyncContext *ctx)
+                virtual void connect(OSyncPluginInfo * /*info*/, OSyncContext *ctx)
                 {
                         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
 
-                        OSyncError *error = NULL;
-                        if ( !osync_hashtable_load(mHashtable, mMember, &error) ) {
-                                osync_context_report_osyncerror(ctx, &error);
-                                osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error));
-                                osync_error_free(&error);
-                                return;
-                        }
+//                      OSyncError *error = NULL;
 
-                        if (mKaddrbook && osync_member_objtype_enabled(mMember, "contact") && \
+                        if (mKaddrbook && \
                                 !mKaddrbook->connect(ctx)) {
                                 osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open addressbook", __func__);
@@ -131 +126 @@
                 }
 
-                virtual void disconnect(OSyncContext *ctx)
+                virtual void disconnect(OSyncPluginInfo * /*info*/, OSyncContext *ctx)
                 {
-                        osync_hashtable_close(mHashtable);
-
                         if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->disconnect(ctx))
                                 return;
@@ -142 +135 @@
 
 
-                virtual void sync_done(OSyncContext *ctx)
+                virtual void sync_done(OSyncPluginInfo *info, OSyncContext *ctx)
                 {
                         if (mKaddrbook && mKaddrbook->connected)
                         {
-                                osync_anchor_update(mMember, "contact", "true");
+                                QString anchorpath = QString("%1/anchor.db").arg(osync_plugin_info_get_configdir(info));
+                                osync_anchor_update(anchorpath, "contact", "true");
                         }
                         osync_context_report_success(ctx);
                 }
 
-                virtual void get_changeinfo(OSyncContext *ctx)
+                virtual void get_changeinfo(OSyncPluginInfo * /*info*/, OSyncContext *ctx)
                 {
                         if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->contact_get_changeinfo(ctx))
@@ -158 +152 @@
                 }
 
-                virtual bool vcard_access(OSyncContext *ctx, OSyncChange *chg)
+                virtual bool vcard_access(OSyncPluginInfo * /*info*/, OSyncContext *ctx, OSyncChange *chg)
                 {
                         if (mKaddrbook)
@@ -169 +163 @@
                 }
 
-                virtual bool vcard_commit_change(OSyncContext *ctx, OSyncChange *chg)
+                virtual bool vcard_commit_change(OSyncPluginInfo * /*info*/, OSyncContext *ctx, OSyncChange *chg)
                 {
                         if (mKaddrbook)
@@ -195 +189 @@
         KdePluginImplementationBase *new_KdePluginImplementation(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error) {
                 KdePluginImplementation *imp = new KdePluginImplementation(plugin, info, error);
-                if (!imp->init(error)) {
+                if (!imp->init(info, error)) {
                         delete imp;
                         return 0;

plugins/kdepim/src/kdepim_sync.cpp

@@ -26 +26 @@
 
 #include <dlfcn.h>
+#include <string.h>
 
 #include "osyncbase.h"
 
-static KdePluginImplementationBase *impl_object_for_context(OSyncContext *ctx)
-{
-        return (KdePluginImplementationBase *)osync_context_get_plugin_data(ctx);
+
+static void kde_finalize(void *userdata)
+{
+//      osync_debug("kde", 3, "%s()", __FUNCTION__);
+
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata;
+        delete impl_object;
+}
+
+static void kde_connect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase*)userdata;
+        impl_object->connect(info, ctx);
+}
+
+
+static void kde_disconnect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata;
+        impl_object->disconnect(info, ctx);
+}
+
+static void kde_get_changeinfo(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase*)userdata;
+//      osync_debug("kde", 3, "%s",__FUNCTION__);
+
+        impl_object->get_changeinfo(info, ctx);
+}
+
+static void kde_sync_done(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata;
+
+//      osync_debug("kde", 3, "%s()",__FUNCTION__);
+
+        impl_object->sync_done(info, ctx);
+}
+
+static void kde_vcard_commit_change(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change)
+{
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata; 
+
+//      osync_debug("kde", 3, "%s()",__FUNCTION__);
+
+        impl_object->vcard_commit_change(info, ctx, change);
+}
+
+static osync_bool kde_vcard_access(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change)
+{
+        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)userdata;
+
+//      osync_debug("kde", 3, "%s()",__FUNCTION__);
+
+        impl_object->vcard_access(info, ctx, change);
 }
 
@@ -69 +122 @@
                 goto error;
 
+        do {
+                OSyncObjTypeSink *sink = osync_objtype_sink_new("contact", error);
+                if (!sink)
+                        goto error;
+
+                osync_objtype_sink_add_objformat(sink, "vcard30");
+
+                /* Every sink can have different functions ... */
+                OSyncObjTypeSinkFunctions functions;
+                memset(&functions, 0, sizeof(functions));
+                functions.connect = kde_connect;
+                functions.disconnect = kde_disconnect;
+                functions.get_changes = kde_get_changeinfo;
+                functions.commit = kde_vcard_commit_change;
+                functions.sync_done = kde_sync_done;
+
+                /* 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);
+
+        } while(0);
+
+
         /* Return the created object to the sync engine */
         return (void*)impl_object;
@@ -75 +152 @@
 }
 
-static void kde_finalize(void *data)
-{
-//      osync_debug("kde", 3, "%s()", __FUNCTION__);
-
-        KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)data;
-        delete impl_object;
-}
-
-static void kde_connect(OSyncContext *ctx)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-        impl_object->connect(ctx);
-}
-
-
-static void kde_disconnect(OSyncContext *ctx)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-        impl_object->disconnect(ctx);
-}
-
-static void kde_get_changeinfo(OSyncContext *ctx)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-//      osync_debug("kde", 3, "%s",__FUNCTION__);
-
-        impl_object->get_changeinfo(ctx);
-}
-
-static void kde_sync_done(OSyncContext *ctx)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-//      osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        impl_object->sync_done(ctx);
-}
-
-static osync_bool kde_vcard_commit_change(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-//      osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->vcard_commit_change(ctx, change);
-}
-
-static osync_bool kde_vcard_access(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-//      osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->vcard_access(ctx, change);
-}
-
 extern "C"
 {
@@ -148 +169 @@
 }
 
-osync_bool get_sync_info(OSyncEnv *env, OSyncError **error) {
-
-        //OSyncPluginInfo *info = osync_plugin_new_info(env);
+osync_bool get_sync_info(OSyncPluginEnv *env, OSyncError **error) {
+
         OSyncPlugin *plugin = osync_plugin_new(error);
         if (!plugin)
                 goto error;
 
-        //info->version = 1;
-        //now in int get_version(void);
-
-        //info->name = "kdepim-sync";
         osync_plugin_set_name(plugin, "kdepim-sync");
-        //info->longname = "KDE Desktop";
         osync_plugin_set_longname(plugin, "KDE Desktop");
-        //info->description = "Plugin for the KDE 3.5 Desktop";
         osync_plugin_set_description(plugin, "Plugin for the KDE 3.5 Desktop");
 
-        //info->config_type = NO_CONFIGURATION;
         osync_plugin_set_config_type(plugin, OSYNC_PLUGIN_NO_CONFIGURATION);
 
-        //info->functions.initialize = kde_initialize;
         osync_plugin_set_initialize(plugin, kde_initialize);
-        
-        //info->functions.connect = kde_connect;
-        //now in initialize
-        //info->functions.disconnect = kde_disconnect;
-        //now in finalize
-
-        //info->functions.finalize = kde_finalize;
         osync_plugin_set_finalize(plugin, kde_finalize);
         osync_plugin_set_discover(plugin, kde_discover);
-        
-        info->functions.get_changeinfo = kde_get_changeinfo;
-        info->functions.sync_done = kde_sync_done;
+
 
         osync_plugin_env_register_plugin(env, plugin);

plugins/kdepim/src/osyncbase.h

@@ -24 +24 @@
 {
         public:
-                virtual void connect(OSyncContext *ctx) = 0;
-                virtual void disconnect(OSyncContext *ctx) = 0;
+                virtual void connect(OSyncPluginInfo *info, OSyncContext *ctx) = 0;
+                virtual void disconnect(OSyncPluginInfo *info, OSyncContext *ctx) = 0;
 
-                virtual void get_changeinfo(OSyncContext *ctx) = 0;
+                virtual void get_changeinfo(OSyncPluginInfo *info, OSyncContext *ctx) = 0;
 
-                virtual void sync_done(OSyncContext *ctx) = 0;
+                virtual void sync_done(OSyncPluginInfo *info, OSyncContext *ctx) = 0;
 
-                virtual bool vcard_access(OSyncContext *ctx, OSyncChange *chg) = 0;
-                virtual bool vcard_commit_change(OSyncContext *ctx, OSyncChange *chg) = 0;
+                virtual bool vcard_access(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg) = 0;
+                virtual bool vcard_commit_change(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg) = 0;