Changeset 1757

Timestamp:

02/19/07 11:36:40 (22 months ago)

Author:

mjahn

Message:

***Warning the current state is not usefull and will not build!***
- fix changetypes api
- add kde_discover (copy&pasted form evo2sync)
- mostly fixed api changes
- disabled event, todo and notes

Location:

plugins/kdepim

Files:

• Makefile.am (modified) (1 diff)
• src/kaddrbook.cpp (modified) (3 diffs)
• src/kcal.cpp (modified) (3 diffs)
• src/kdepim_impl.cpp (modified) (9 diffs)
• src/kdepim_sync.cpp (modified) (3 diffs)
• src/knotes.cpp (modified) (3 diffs)
• src/osyncbase.h (modified) (1 diff)

plugins/kdepim/Makefile.am

@@ -37 +37 @@
 kdepim_sync_la_LIBADD = -lstdc++ -L@OPENSYNC_LIBDIR@ -lopensync
 
-src/kdepim_impl.cpp: KNotesIface_stub.h
-KNotesIface_stub.cpp: KNotesIface_stub.h
+#src/kdepim_impl.cpp: KNotesIface_stub.h
+#KNotesIface_stub.cpp: KNotesIface_stub.h
 
-KNotesIface_stub.cpp:
-        dcopidl $(top_srcdir)/src/KNotesIface.h > KNotesIface.kidl
-        dcopidl2cpp KNotesIface.kidl
-KNotesIface_stub.h:
-        dcopidl $(top_srcdir)/src/KNotesIface.h > KNotesIface.kidl
-        dcopidl2cpp KNotesIface.kidl
+#KNotesIface_stub.cpp:
+#       dcopidl $(top_srcdir)/src/KNotesIface.h > KNotesIface.kidl
+#       dcopidl2cpp KNotesIface.kidl
+#KNotesIface_stub.h:
+#       dcopidl $(top_srcdir)/src/KNotesIface.h > KNotesIface.kidl
+#       dcopidl2cpp KNotesIface.kidl
 
-dist_kdepim_lib_la_SOURCES = \
-        src/kdepim_impl.cpp \
-        src/kcal.cpp \
-        src/knotes.cpp \
-        src/kaddrbook.cpp 
-nodist_kdepim_lib_la_SOURCES = KNotesIface_stub.cpp
+dist_kdepim_lib_la_SOURCES = src/kdepim_impl.cpp src/kaddrbook.cpp
+#       src/kdepim_impl.cpp \
+#       src/kcal.cpp \
+#       src/knotes.cpp \
+#       src/kaddrbook.cpp 
+#nodist_kdepim_lib_la_SOURCES = KNotesIface_stub.cpp
 kdepim_lib_la_CXXFLAGS = -DPLUGINDIR=\"$(plugindir)\" -DKDEPIM_LIBDIR=\"$(plugindir)\" -Wall
 kdepim_lib_la_LDFLAGS = $(KDE_LDFLAGS) -avoid-version -export-dynamic -module

plugins/kdepim/src/kaddrbook.cpp

@@ -189 +189 @@
         OSyncChangeType chtype = osync_change_get_changetype(chg);
         switch(chtype) {
-                case CHANGE_MODIFIED: {
+                case OSYNC_CHANGE_TYPE_MODIFIED: {
                         KABC::Addressee addressee = converter.parseVCard(QString::fromUtf8(data, data_size));
 
@@ -205 +205 @@
                         break;
                 }
-                case CHANGE_ADDED: {
+                case OSYNC_CHANGE_TYPE_ADDED: {
                         KABC::Addressee addressee = converter.parseVCard(QString::fromUtf8(data, data_size));
 
@@ -221 +221 @@
                         break;
                 }
-                case CHANGE_DELETED: {
+                case OSYNC_CHANGE_TYPE_DELETED: {
                         if (uid.isEmpty()) {
                                 osync_context_report_error(ctx, OSYNC_ERROR_FILE_NOT_FOUND, "Trying to delete entry with empty UID");

plugins/kdepim/src/kcal.cpp

@@ -216 +216 @@
         osync_debug("kcal", 3, "%s", __FUNCTION__);
         switch (type) {
-                case CHANGE_DELETED: {
+                case OSYNC_CHANGE_TYPE_DELETED: {
                         KCal::Incidence *e = calendar->incidence(osync_change_get_uid(chg));
                         if (!e) {
@@ -225 +225 @@
                         break;
                 }
-                case CHANGE_ADDED:
-                case CHANGE_MODIFIED: {
+                case OSYNC_CHANGE_TYPE_ADDED:
+                case OSYNC_CHANGE_TYPE_MODIFIED: {
                         KCal::ICalFormat format;
 
@@ -258 +258 @@
                         for (KCal::Incidence::List::ConstIterator i = evts.begin(); i != evts.end(); i++) {
                                 KCal::Incidence *e = (*i)->clone();
-                                if (type == CHANGE_MODIFIED)
+                                if (type == OSYNC_CHANGE_TYPE_MODIFIED)
                                         e->setUid(osync_change_get_uid(chg));
 

plugins/kdepim/src/kdepim_impl.cpp

@@ -64 +64 @@
                             "libopensync-kdepim-plugin",         // internal program name
                             "OpenSync-KDE-plugin",               // displayable program name.
-                            "0.1",                               // version string
+                            "0.2",                               // version string
                             "OpenSync KDEPIM plugin",            // short porgram description
                             KAboutData::License_GPL,             // license type
-                            "(c) 2005, Eduardo Pereira Habkost", // copyright statement
+                            "(c) 2005, Eduardo Pereira Habkost, (c)", // copyright statement
                             0,                                   // any free form text
                             "http://www.opensync.org",           // program home page address
@@ -92 +92 @@
                         mHashtable = osync_hashtable_new();
 
-                        mKcal = new KCalDataSource(mMember, mHashtable);
-                        mKnotes = new KNotesDataSource(mMember, mHashtable);
                         mKaddrbook = new KContactDataSource(mMember, mHashtable);
 
@@ -102 +100 @@
                 virtual ~KdePluginImplementation()
                 {
-                        delete mKcal;
-                        mKcal = 0;
-
-                        delete mKnotes;
-                        mKnotes = 0;
-
                         if ( mNewApplication ) {
                                 delete mApplication;
@@ -129 +121 @@
                         }
 
-
-                        if (mKcal && (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;
-                        }
-
-                        if (mKnotes && osync_member_objtype_enabled(mMember, "note") && \
-                                !mKnotes->connect(ctx)) {
-                                osync_trace(TRACE_EXIT_ERROR, "%s: Unable to open notes", __func__);
-                                return;
-                        }
-
                         if (mKaddrbook && osync_member_objtype_enabled(mMember, "contact") && \
                                 !mKaddrbook->connect(ctx)) {
@@ -156 +135 @@
                         osync_hashtable_close(mHashtable);
 
-                        if (mKcal && mKcal->connected && !mKcal->disconnect(ctx))
-                                return;
-                        if (mKnotes && mKnotes->connected && !mKnotes->disconnect(ctx))
-                                return;
                         if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->disconnect(ctx))
                                 return;
@@ -173 +148 @@
                                 osync_anchor_update(mMember, "contact", "true");
                         }
-
-                        if (mKcal && mKcal->connected &&
-                                 osync_member_objtype_enabled(mMember, "event"))
-                        {
-                                osync_anchor_update(mMember, "event", "true");
-                        }
-
-                        if (mKcal && mKcal->connected &&
-                                 osync_member_objtype_enabled(mMember, "todo"))
-                        {
-                                osync_anchor_update(mMember, "todo", "true");
-                        }
-
-                        if (mKnotes && mKnotes->connected)
-                        {
-                                osync_anchor_update(mMember, "note", "true");
-                        }
-
                         osync_context_report_success(ctx);
                 }
@@ -198 +155 @@
                         if (mKaddrbook && mKaddrbook->connected && !mKaddrbook->contact_get_changeinfo(ctx))
                                 return;
-
-                        if (mKcal && mKcal->connected &&
-                                osync_member_objtype_enabled(mMember, "event") &&
-                                 !mKcal->get_changeinfo_events(ctx))
-                                return;
-
-                        if (mKcal && mKcal->connected &&
-                                 osync_member_objtype_enabled(mMember, "todo") &&
-                                 !mKcal->get_changeinfo_todos(ctx))
-                                return;
-
-                        if (mKnotes && mKnotes->connected && !mKnotes->get_changeinfo(ctx))
-                                return;
-
                         osync_context_report_success(ctx);
                 }
@@ -236 +179 @@
                         return true;
                 }
-
-                virtual bool event_access(OSyncContext *ctx, OSyncChange *chg)
-                {
-                        if (mKcal)
-                                return mKcal->event_access(ctx, chg);
-                        else {
-                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
-                                return false;
-                        }
-                        return true;
-                }
-
-                virtual bool event_commit_change(OSyncContext *ctx, OSyncChange *chg)
-                {
-                        if (mKcal)
-                                return mKcal->event_commit_change(ctx, chg);
-                        else {
-                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
-                                return false;
-                        }
-                        return true;
-                }
-
-                virtual bool todo_access(OSyncContext *ctx, OSyncChange *chg)
-                {
-                        if (mKcal)
-                                return mKcal->todo_access(ctx, chg);
-                        else {
-                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
-                                return false;
-                        }
-                        return true;
-                }
-
-                virtual bool todo_commit_change(OSyncContext *ctx, OSyncChange *chg)
-                {
-                        if (mKcal)
-                                return mKcal->todo_commit_change(ctx, chg);
-                        else {
-                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No calendar loaded");
-                                return false;
-                        }
-                        return true;
-                }
-
-                virtual bool note_access(OSyncContext *ctx, OSyncChange *chg)
-                {
-                        if (mKnotes)
-                                return mKnotes->access(ctx, chg);
-                        else {
-                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No notes loaded");
-                                return false;
-                        }
-                        return true;
-                }
-
-                virtual bool note_commit_change(OSyncContext *ctx, OSyncChange *chg)
-                {
-                        if (mKnotes)
-                                return mKnotes->commit_change(ctx, chg);
-                        else {
-                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No notes loaded");
-                                return false;
-                        }
-                        return true;
-                }
-
         private:
-                KCalDataSource *mKcal;
-                KNotesDataSource *mKnotes;
                 KContactDataSource *mKaddrbook;
 
@@ -319 +193 @@
 {
 
-        KdePluginImplementationBase *new_KdePluginImplementation(OSyncMember *member, OSyncError **error) {
-                KdePluginImplementation *imp = new KdePluginImplementation(member);
+        KdePluginImplementationBase *new_KdePluginImplementation(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error) {
+                KdePluginImplementation *imp = new KdePluginImplementation(plugin, info, error);
                 if (!imp->init(error)) {
                         delete imp;

plugins/kdepim/src/kdepim_sync.cpp

@@ -22 +22 @@
 /**
  * @autor Eduardo Pereira Habkost <ehabkost@conectiva.com.br>
+ * edit Matthias Jahn <jahn.matthias@freenet.de>
  */
 
@@ -41 +42 @@
  * @see KdePluginImplementationBase
  */
-static void *kde_initialize(OSyncMember *member, OSyncError **e)
+static void *kde_initialize(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error)
 {
         KdeImplInitFunc init_func;
@@ -130 +131 @@
 }
 
-static osync_bool kde_event_commit_change(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->event_commit_change(ctx, change);
-}
-
-static osync_bool kde_event_access(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->event_access(ctx, change);
-}
-
-static osync_bool kde_todo_commit_change(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->todo_commit_change(ctx, change);
-}
-
-static osync_bool kde_todo_access(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->todo_access(ctx, change);
-}
-
-static osync_bool kde_note_commit_change(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->note_commit_change(ctx, change);
-}
-
-static osync_bool kde_note_access(OSyncContext *ctx, OSyncChange *change)
-{
-        KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
-
-        return impl_object->note_access(ctx, change);
-}
-
 extern "C"
 {
-        void get_info(OSyncEnv *env) {
-                OSyncPluginInfo *info = osync_plugin_new_info(env);
-                info->version = 1;
-                info->name = "kdepim-sync";
-                /*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;
-                info->functions.disconnect = kde_disconnect;
-                info->functions.finalize = kde_finalize;
-                info->functions.get_changeinfo = kde_get_changeinfo;
-                info->functions.sync_done = kde_sync_done;
-
-                osync_plugin_accept_objtype(info, "contact");
-                osync_plugin_accept_objformat(info, "contact", "vcard30", "kde");
-                osync_plugin_set_commit_objformat(info, "contact", "vcard30", kde_vcard_commit_change);
-                osync_plugin_set_access_objformat(info, "contact", "vcard30", kde_vcard_access);
-                osync_plugin_accept_objformat(info, "contact", "vcard21", "kde");
-                osync_plugin_set_commit_objformat(info, "contact", "vcard21", kde_vcard_commit_change);
-                osync_plugin_set_access_objformat(info, "contact", "vcard21", kde_vcard_access);
-
-                osync_plugin_accept_objtype(info, "event");
-                osync_plugin_accept_objformat(info, "event", "vevent20", "kde");
-                osync_plugin_set_commit_objformat(info, "event", "vevent20", kde_event_commit_change);
-                osync_plugin_set_access_objformat(info, "event", "vevent20", kde_event_access);
-
-                osync_plugin_accept_objtype(info, "todo");
-                osync_plugin_accept_objformat(info, "todo", "vtodo20", "kde");
-                osync_plugin_set_commit_objformat(info, "todo", "vtodo20", kde_todo_commit_change);
-                osync_plugin_set_access_objformat(info, "todo", "vtodo20", kde_todo_access);
-
-                osync_plugin_accept_objtype(info, "note");
-                osync_plugin_accept_objformat(info, "note", "xml-note", NULL);
-                osync_plugin_set_commit_objformat(info, "note", "xml-note", kde_note_commit_change);
-                osync_plugin_set_access_objformat(info, "note", "xml-note", kde_note_access);
-        }
+
+/* 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);
+        
+        OSyncEvoEnv *env = (OSyncEvoEnv *)data;
+
+        osync_objtype_sink_set_available(env->contact_sink, TRUE);
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+}
+
+osync_bool get_sync_info(OSyncEnv *env, OSyncError **error) {
+
+        //OSyncPluginInfo *info = osync_plugin_new_info(env);
+        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);
+        osync_plugin_unref(plugin);
+        return TRUE;
+
+error:
+        osync_trace(TRACE_ERROR, "Unable to register: %s", osync_error_print(error));
+        osync_error_unref(error);
+        return FALSE;
+}
+
+int get_version(void)
+{
+        return 1;
+}
 
 }// extern "C"

plugins/kdepim/src/knotes.cpp

@@ -243 +243 @@
         KMD5 hash_value;
 
-        if (type != CHANGE_DELETED) {
+        if (type != OSYNC_CHANGE_TYPE_DELETED) {
 
                 // Get osxml data
@@ -278 +278 @@
                 QString hash;
                 switch (type) {
-                        case CHANGE_ADDED: {
+                        case OSYNC_CHANGE_TYPE_ADDED: {
                                 osync_trace(TRACE_INTERNAL, "addding new \"%s\" and \"%s\"\n", (const char*)summary.local8Bit(), (const char*)body.local8Bit());
                                 uid = kn_iface->newNote(summary, body);
@@ -297 +297 @@
                                 break;
                         }
-                        case CHANGE_MODIFIED: {
+                        case OSYNC_CHANGE_TYPE_MODIFIED: {
                                 kn_iface->setName(uid, summary);
                                 if (kn_iface->status() != DCOPStub::CallSucceeded) {

plugins/kdepim/src/osyncbase.h

@@ -25 +25 @@
                 virtual bool vcard_commit_change(OSyncContext *ctx, OSyncChange *chg) = 0;
 
-                virtual bool event_access(OSyncContext *ctx, OSyncChange *chg) = 0;
-                virtual bool event_commit_change(OSyncContext *ctx, OSyncChange *chg) = 0;
-
-                virtual bool todo_access(OSyncContext *ctx, OSyncChange *chg) = 0;
-                virtual bool todo_commit_change(OSyncContext *ctx, OSyncChange *chg) = 0;
-
-                virtual bool note_access(OSyncContext *ctx, OSyncChange *chg) = 0;
-                virtual bool note_commit_change(OSyncContext *ctx, OSyncChange *chg) = 0;
 
                 /* The declaration above seemed to be necessary just because the