Changeset 1760

Timestamp:

02/19/07 13:45:59 (22 months ago)

Author:

mjahn

Message:

- remove osync_debug
- add a OSyncKDEEnv stuct that contains a contact_sink

Location:

plugins/kdepim/src

Files:

• kaddrbook.cpp (modified) (4 diffs)
• kcal.cpp (modified) (8 diffs)
• kdepim_sync.cpp (modified) (7 diffs)
• knotes.cpp (modified) (4 diffs)
• osyncbase.h (modified) (2 diffs)

plugins/kdepim/src/kaddrbook.cpp

@@ -46 +46 @@
         //Regard entries with invalid revision dates as having just been changed.
         QDateTime revdate = e.revision();
-        osync_debug("kde", 3, "Getting hash: %s", revdate.toString().data());
+//      osync_debug("kde", 3, "Getting hash: %s", revdate.toString().data());
         if (!revdate.isValid()) {
                 revdate = QDateTime::currentDateTime();
@@ -202 +202 @@
                         QString hash = calc_hash(addressee);
                         osync_change_set_hash(chg, hash);
-                        osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
+//                      osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
                         break;
                 }
@@ -218 +218 @@
                         QString hash = calc_hash(addressee);
                         osync_change_set_hash(chg, hash);
-                        osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
+//                      osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
                         break;
                 }
@@ -233 +233 @@
                                 addressbookptr->removeAddressee(addressee);
 
-                        osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY DELETED (UID=%s)", (const char*)uid.local8Bit());
+//                      osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY DELETED (UID=%s)", (const char*)uid.local8Bit());
 
                         break;

plugins/kdepim/src/kcal.cpp

@@ -80 +80 @@
         }
 
-        osync_debug("kcal", 3, "Calendar: %d events", calendar->events().size());
+//      osync_debug("kcal", 3, "Calendar: %d events", calendar->events().size());
 
         connected = true;
@@ -116 +116 @@
 bool KCalDataSource::report_incidence(OSyncContext *ctx, KCal::Incidence *e, const char *objtype, const char *objformat)
 {
-        osync_debug("kcal", 3, "One calendar incidence (%s)", objtype);
+//      osync_debug("kcal", 3, "One calendar incidence (%s)", objtype);
         QString hash = calc_hash(e);
 
@@ -123 +123 @@
         /* Build a local calendar for the incidence data */
         KCal::CalendarLocal cal(calendar->timeZoneId());
-        osync_debug("kcal", 3, "timezoneid: %s\n", (const char*)cal.timeZoneId().local8Bit());
+//      osync_debug("kcal", 3, "timezoneid: %s\n", (const char*)cal.timeZoneId().local8Bit());
         cal.addIncidence(e->clone());
 
@@ -131 +131 @@
         const char *data = datastr;
 
-        osync_debug("kcal", 3, "UID: %s\n", (const char*)uid.local8Bit());
+//      osync_debug("kcal", 3, "UID: %s\n", (const char*)uid.local8Bit());
         OSyncChange *chg = osync_change_new();
         osync_change_set_uid(chg, uid.local8Bit());
@@ -155 +155 @@
 {
         KCal::Event::List events = calendar->events();
-        osync_debug("kcal", 3, "Number of events: %d", events.size());
+//      osync_debug("kcal", 3, "Number of events: %d", events.size());
 
         if (osync_member_get_slow_sync(member, "event")) {
-                osync_debug("kcal", 3, "Setting slow-sync for events");
+//              osync_debug("kcal", 3, "Setting slow-sync for events");
                 osync_hashtable_set_slow_sync(hashtable, "event");
         }
@@ -184 +184 @@
         KCal::Todo::List todos = calendar->todos();
 
-        osync_debug("kcal", 3, "Number of to-dos: %d", todos.size());
+//      osync_debug("kcal", 3, "Number of to-dos: %d", todos.size());
 
         if (osync_member_get_slow_sync(member, "todo")) {
-                osync_debug("kcal", 3, "Setting slow-sync for todos");
+//              osync_debug("kcal", 3, "Setting slow-sync for todos");
                 osync_hashtable_set_slow_sync(hashtable, "todo");
         }
 
         for (KCal::Todo::List::ConstIterator i = todos.begin(); i != todos.end(); i++) {
-                osync_debug("kcal", 3, "%p: doesFloat: %d", *i, (*i)->doesFloat());
+//              osync_debug("kcal", 3, "%p: doesFloat: %d", *i, (*i)->doesFloat());
                 if (!report_incidence(ctx, *i, "todo", "vtodo20"))
                         return false;
@@ -214 +214 @@
 {
         OSyncChangeType type = osync_change_get_changetype(chg);
-        osync_debug("kcal", 3, "%s", __FUNCTION__);
+//      osync_debug("kcal", 3, "%s", __FUNCTION__);
         switch (type) {
                 case OSYNC_CHANGE_TYPE_DELETED: {
@@ -261 +261 @@
                                         e->setUid(osync_change_get_uid(chg));
 
-                                osync_debug("kcal", 3, "Writing incidence: uid: %s, summary: %s",
+//                              osync_debug("kcal", 3, "Writing incidence: uid: %s, summary: %s",
                                                 (const char*)e->uid().local8Bit(), (const char*)e->summary().local8Bit());
 

plugins/kdepim/src/kdepim_sync.cpp

@@ -48 +48 @@
         void *module;
 
-        osync_debug("kde", 3, "%s", __FUNCTION__);
-
-        osync_debug("kde", 3, "Loading implementation module");
+//      osync_debug("kde", 3, "%s", __FUNCTION__);
+
+//      osync_debug("kde", 3, "Loading implementation module");
         module = dlopen(KDEPIM_LIBDIR"/kdepim_lib.so", RTLD_NOW);
         if (!module) {
-                osync_error_set(e, OSYNC_ERROR_INITIALIZATION, "Can't load plugin implementation module from %s: %s",
+                osync_error_set(error, OSYNC_ERROR_INITIALIZATION, "Can't load plugin implementation module from %s: %s",
                                 KDEPIM_LIBDIR"/kdepim_lib.so", dlerror());
                 goto error;
         }
-        osync_debug("kde", 3, "Getting initialization function");
+//      osync_debug("kde", 3, "Getting initialization function");
         init_func = (KdeImplInitFunc)dlsym(module, "new_KdePluginImplementation");
         if (!init_func) {
-                osync_error_set(e, OSYNC_ERROR_INITIALIZATION, "Invalid plugin implementation module");
+                osync_error_set(error, OSYNC_ERROR_INITIALIZATION, "Invalid plugin implementation module");
                 goto error;
         }
 
-        osync_debug("kde", 3, "Initializing implementation module");
-        impl_object = init_func(member, e);
+//      osync_debug("kde", 3, "Initializing implementation module");
+        impl_object = init_func(plugin, info, error);
         if (!impl_object)
                 goto error;
@@ -77 +77 @@
 static void kde_finalize(void *data)
 {
-        osync_debug("kde", 3, "%s()", __FUNCTION__);
+//      osync_debug("kde", 3, "%s()", __FUNCTION__);
 
         KdePluginImplementationBase *impl_object = (KdePluginImplementationBase *)data;
@@ -99 +99 @@
 {
         KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
-        osync_debug("kde", 3, "%s",__FUNCTION__);
+//      osync_debug("kde", 3, "%s",__FUNCTION__);
 
         impl_object->get_changeinfo(ctx);
@@ -108 +108 @@
         KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
 
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
+//      osync_debug("kde", 3, "%s()",__FUNCTION__);
 
         impl_object->sync_done(ctx);
@@ -117 +117 @@
         KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
 
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
+//      osync_debug("kde", 3, "%s()",__FUNCTION__);
 
         return impl_object->vcard_commit_change(ctx, change);
@@ -126 +126 @@
         KdePluginImplementationBase *impl_object = impl_object_for_context(ctx);
 
-        osync_debug("kde", 3, "%s()",__FUNCTION__);
+//      osync_debug("kde", 3, "%s()",__FUNCTION__);
 
         return impl_object->vcard_access(ctx, change);
@@ -140 +140 @@
         osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, error);
         
-        OSyncEvoEnv *env = (OSyncEvoEnv *)data;
+        OSyncKDEEnv *env = (OSyncKDEEnv *)data;
 
         osync_objtype_sink_set_available(env->contact_sink, TRUE);

plugins/kdepim/src/knotes.cpp

@@ -155 +155 @@
 
         if (osync_member_get_slow_sync(member, "note")) {
-                osync_debug("kcal", 3, "Setting slow-sync for notes");
+//              osync_debug("kcal", 3, "Setting slow-sync for notes");
                 osync_hashtable_set_slow_sync(hashtable, "note");
         }
@@ -165 +165 @@
                  */
                 if (kn_iface->text(i.key()) == "") {
-                        osync_debug("knotes", 4, "Skipping empty note");
+//                      osync_debug("knotes", 4, "Skipping empty note");
                         continue;
                 }
 
-                osync_debug("knotes", 4, "Note key: %s", (const char*)i.key().local8Bit());
-                osync_debug("knotes", 4, "Note summary: %s", (const char*)i.data().local8Bit());
+//              osync_debug("knotes", 4, "Note key: %s", (const char*)i.key().local8Bit());
+//              osync_debug("knotes", 4, "Note summary: %s", (const char*)i.data().local8Bit());
                 osync_trace(TRACE_INTERNAL, "reporting notes %s\n", (const char*)i.key().local8Bit());
 
@@ -207 +207 @@
                 osync_change_set_data(chg, (char*)doc, sizeof(doc), 1);
 
-                osync_debug("knotes", 4, "Reporting note:\%s", osync_change_get_printable(chg));
+//              osync_debug("knotes", 4, "Reporting note:\%s", osync_change_get_printable(chg));
 
                 // Use the hash table to check if the object
@@ -327 +327 @@
                 QString asdasd = "dcop knotes KNotesIface killNote " + uid + " true";
                 system((const char*)asdasd.local8Bit());
-                osync_debug("knotes", 4, "Deleting note %s", (const char*)uid.local8Bit());
+//              osync_debug("knotes", 4, "Deleting note %s", (const char*)uid.local8Bit());
                 /*kn_iface->killNote(uid, true);
                 if (kn_iface->status() != DCOPStub::CallSucceeded) {

plugins/kdepim/src/osyncbase.h

@@ -5 +5 @@
 {
 #include <opensync/opensync.h>
+#include <opensync/opensync-plugin.h>
+#include <opensync/opensync-context.h>
+#include <opensync/opensync-data.h>
+#include <opensync/opensync-helper.h>
 }
+
+typedef struct OSyncKDEEnv {
+        char *change_id;
+        OSyncObjTypeSink *contact_sink;
+} OSyncKDEEnv;
 /** Base class to OpenSync plugin.
  *
@@ -32 +41 @@
 };
 
-typedef KdePluginImplementationBase *(*KdeImplInitFunc)(OSyncMember *m, OSyncError **e);
+typedef KdePluginImplementationBase *(*KdeImplInitFunc)(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error);
 
 #endif // KDEPIM_OSYNC_BASE_H