Ticket #208: exp.patch

configure.in

@@ -39 +39 @@
-AC_SUBST(OPENSYNC_HEADERDIR)
-AC_SUBST(OPENSYNC_INCLUDEDIR)
-AC_SUBST(OPENSYNC_LIBDIR)
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(XML_LIBS)
-
-## AC_CHECK_HEADER(${$ac_kde_includes}/libkcal/resourcecalendar.h)
-

src/kdepim_sync.cpp

@@ -183 +183 @@
-    /*FIXME: i18n */
-    info->longname = "KDE Desktop";
-    info->description = "Plugin for the KDE 3.5 Desktop";
-    info->config_type = NO_CONFIGURATION;
-
-    info->functions.initialize = kde_initialize;
-    info->functions.connect = kde_connect;

src/kdepim_impl.cpp

@@ -33 +33 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
-
-#include <qsignal.h>
-
@@ -54 +56 @@
-        mApplication( 0 ),
-        mNewApplication( false )
-    {
+      isKcal=false; isKaddrbook=false; isKnotes=false; isTodo=false;
+      mKcal = 0; mKnotes = 0; mKaddrbook=0;
-    }
-
-    void initKDE()
@@ -91 +95 @@
-      initKDE();
-
-      mHashtable = osync_hashtable_new();
+      char *configData = NULL;
+      int configSize = 0;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+      if (isKcal) {
+        mKcal = new KCalDataSource(mMember, mHashtable);
+      }
+      if (isKnotes) {
+        mKnotes = new KNotesDataSource(mMember, mHashtable);
+      }
+      if (isKaddrbook) {
+        mKaddrbook = new KContactDataSource(mMember, mHashtable);
+      }
+
-      osync_trace(TRACE_EXIT, "%s", __func__);
-      return true;
-    }
-
-    virtual ~KdePluginImplementation()
-    {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      if ( mNewApplication ) {
-        delete mApplication;
-        mApplication = 0;
@@ -130 +186 @@
-      }
-
-
-mKcal && (osync_member_objtype_enabled(mMember, "todo"
+isKcal && ( ((isTodo) && osync_member_objtype_enabled(mMember, "todo")
-          osync_member_objtype_enabled(mMember, "event")) && !mKcal->connect(ctx)) {
-        osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open calendar", __func__);
-        return;
-      }
-
-m
+is
-          !mKnotes->connect(ctx)) {
-        osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open notes", __func__);
-        return;
-      }
-
-m
+is
-          !mKaddrbook->connect(ctx)) {
-        osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open addressbook", __func__);
-        return;
@@ -156 +212 @@
-    {
-      osync_hashtable_close(mHashtable);
-
-m
+is
-        return;
-m
+is
-        return;
-m
+is
-        return;
-
-      osync_context_report_success(ctx);
@@ -168 +224 @@
-
-    virtual void get_changeinfo(OSyncContext *ctx)
-    {
-m
+is
-        return;
-
-m
+is
-        return;
-
-mKcal
+isKcal && isTodo
-        return;
-
-m
+is
-        return;
-
-      osync_context_report_success(ctx);
@@ -185 +241 @@
-
-    virtual bool vcard_access(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKaddrbook && 
-        return mKaddrbook->vcard_access(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No addressbook loaded");
@@ -196 +252 @@
-
-    virtual bool vcard_commit_change(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKaddrbook && 
-        return mKaddrbook->vcard_commit_change(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No addressbook loaded");
@@ -207 +263 @@
-
-    virtual bool event_access(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKcal && 
-        return mKcal->event_access(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
@@ -218 +274 @@
-
-    virtual bool event_commit_change(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKcal && 
-        return mKcal->event_commit_change(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
@@ -229 +285 @@
-
-    virtual bool todo_access(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKcal && isTodo && 
-        return mKcal->todo_access(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
@@ -240 +296 @@
-
-    virtual bool todo_commit_change(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKcal && isTodo && 
-        return mKcal->todo_commit_change(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
@@ -251 +307 @@
-
-    virtual bool note_access(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKnotes && 
-        return mKnotes->access(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No notes loaded");
@@ -262 +318 @@
-
-    virtual bool note_commit_change(OSyncContext *ctx, OSyncChange *chg)
-    {
-
+isKnotes && 
-        return mKnotes->commit_change(ctx, chg);
-      else {
-        osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No notes loaded");
@@ -281 +337 @@
-
-    KApplication *mApplication;
-    bool mNewApplication;
+    bool isKcal;
+    bool isKnotes;
+    bool isKaddrbook;
+    bool isTodo;
-};
-
-