Changeset 1675

Timestamp:

02/04/07 15:55:45 (22 months ago)

Author:

mjahn

Message:

apply fix based one XMPM changes against OpenSync? kdepim plugin 0570-fix_anchors_usage.patch
Only update anchors at end of successful sync Use individual anchors per objtype

Location:

plugins/kdepim

Files:

• . (modified) (1 prop)
• src/kaddrbook.cpp (modified) (1 diff)
• src/kcal.cpp (modified) (3 diffs)
• src/kdepim_impl.cpp (modified) (1 diff)
• src/kdepim_sync.cpp (modified) (2 diffs)
• src/knotes.cpp (modified) (1 diff)
• src/osyncbase.h (modified) (1 diff)

plugins/kdepim/src/kaddrbook.cpp

@@ -80 +80 @@
 
         //Detection mechanismn if this is the first sync
-        if (!osync_anchor_compare(member, "synced", "true")) {
-                osync_trace(TRACE_INTERNAL, "Setting slow-sync");
+        if (!osync_anchor_compare(member, "contact", "true")) {
+                osync_trace(TRACE_INTERNAL, "Setting slow-sync contact");
                 osync_member_set_slow_sync(member, "contact", TRUE);
-                osync_anchor_update(member, "synced", "true");
         }
 

plugins/kdepim/src/kcal.cpp

@@ -37 +37 @@
 bool KCalDataSource::connect(OSyncContext *ctx)
 {
-
         DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
         if (!dcopc) {
@@ -67 +66 @@
         calendar->load();
 #endif
+
+        //Detection mechanismn if this is the first sync
+        if (osync_member_objtype_enabled(member, "event")
+            && !osync_anchor_compare(member, "event", "true")) {
+                osync_trace(TRACE_INTERNAL, "Setting slow-sync for event");
+                osync_member_set_slow_sync(member, "event", TRUE);
+        }
+
+        if (osync_member_objtype_enabled(member, "todo")
+            && !osync_anchor_compare(member, "todo", "true")) {
+                osync_trace(TRACE_INTERNAL, "Setting slow-sync for todo");
+                osync_member_set_slow_sync(member, "todo", TRUE);
+        }
+
         osync_debug("kcal", 3, "Calendar: %d events", calendar->events().size());
 
@@ -75 +88 @@
 bool KCalDataSource::disconnect(OSyncContext *)
 {
-
         /* Save the changes */
         calendar->save();

plugins/kdepim/src/kdepim_impl.cpp

@@ -166 +166 @@
                 }
 
+
+                virtual void sync_done(OSyncContext *ctx)
+                {
+                        if (mKaddrbook && mKaddrbook->connected)
+                        {
+                                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);
+                }
+
                 virtual void get_changeinfo(OSyncContext *ctx)
                 {

plugins/kdepim/src/kdepim_sync.cpp

@@ -103 +103 @@
 }
 
+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)
 {
@@ -191 +200 @@
                 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");

plugins/kdepim/src/knotes.cpp

@@ -80 +80 @@
         kn_iface = new KNotesIface_stub("knotes", "KNotesIface");
 
+        if (!osync_anchor_compare(member, "note", "true")) {
+                osync_trace(TRACE_INTERNAL, "Setting slow-sync for note");
+                osync_member_set_slow_sync(member, "note", TRUE);
+        }
+
         connected = true;
         osync_trace(TRACE_EXIT, "%s", __func__);

plugins/kdepim/src/osyncbase.h

@@ -19 +19 @@
 
                 virtual void get_changeinfo(OSyncContext *ctx) = 0;
+
+                virtual void sync_done(OSyncContext *ctx) = 0;
 
                 virtual bool vcard_access(OSyncContext *ctx, OSyncChange *chg) = 0;