Changeset 43

Timestamp:

12/10/04 17:09:37 (4 years ago)

Author:

ehabkost

Message:

Make kde-sync build again
- Removed kdeplugin.c from source tree, it is not used anymore

Location:

trunk/plugins/kdepim_sync/src

Files:

• kaddrbook.cpp (modified) (6 diffs)
• kdeplugin.c (deleted)

trunk/plugins/kdepim_sync/src/kaddrbook.cpp

@@ -91 +91 @@
 
 
-        int get_changes(OSyncContext *ctx, int newdbs) 
+        int get_changes(OSyncContext *ctx)
         {
             //printf("kdepim_plugin: kaddrbook::%s(newdbs=%d)\n", __FUNCTION__, newdbs);
@@ -154 +154 @@
                 osync_change_set_objformat_string(chg, "vcard");
                 osync_change_set_hash(chg, hash.data());
-                if (osync_hashtable_detect_change(hashtable, chg)) {
+                /*FIXME: slowsync */
+                if (osync_hashtable_detect_change(hashtable, chg, 0)) {
                     osync_context_report_change(ctx, chg);
                     osync_hashtable_update_hash(hashtable, chg);
@@ -163 +164 @@
             }
 
-            osync_hashtable_report_deleted(hashtable, ctx);
+            osync_hashtable_report_deleted(hashtable, ctx, 0);
 
             return 0;
@@ -384 +385 @@
         printf("kdepim_plugin: %s\n",__FUNCTION__);
 
-    //FIXME: newdbs support
-    int reset = 0;
-    int err = addrbook->get_changes(ctx, reset);
+    int err = addrbook->get_changes(ctx);
     if (err) {
         osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Couldn't access KDE addressbook");
@@ -417 +416 @@
 }
 
-static OSyncFormatFunctions vcard_functions;
-
 extern "C" {
 void get_info(OSyncPluginInfo *info)
@@ -432 +429 @@
     info->functions.get_changeinfo = kde_get_changeinfo;
 
-    vcard_functions.commit_change = kde_commit_change,
+    osync_plugin_accept_objtype(info, "contact");
+    osync_plugin_accept_objformat(info, "contact", "vcard");
     /*FIXME: check the differences between commit_change() and access() */
-    vcard_functions.access = kde_commit_change,
-
-    osync_plugin_register_accepted_objtype(info, "contact");
-    osync_plugin_register_accepted_objformat(info, "contact", "vcard", &vcard_functions);
+    osync_plugin_set_commit_objformat(info, "contact", "vcard", kde_commit_change);
+    osync_plugin_set_access_objformat(info, "contact", "vcard", kde_commit_change);
+
 }