Changeset 672

Timestamp:

09/02/05 21:40:34 (3 years ago)

Author:

ehabkost

Message:

Fix plugin bug that made it try to update the hashtable _after_ it
already reported success on commit_change() for vcards. It was causing
hard to reproduce crashes

Location:

plugins/kdepim/src

Files:

• kaddrbook.cpp (modified) (2 diffs)
• kaddrbook.h (modified) (2 diffs)
• kdepim_impl.cpp (modified) (1 diff)

plugins/kdepim/src/kaddrbook.cpp

@@ -162 +162 @@
 }*/
 
-bool KContactDataSource::vcard_access(OSyncContext *ctx, OSyncChange *chg)
+/** vcard access method
+ *
+ * This method is used by both access() and commit_change() method,
+ * so it shouldn't call osync_context_report_success(). On success,
+ * it should just return true and let the caller report success() to
+ * OpenSync
+ */
+bool KContactDataSource::__vcard_access(OSyncContext *ctx, OSyncChange *chg)
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
@@ -228 +235 @@
         }
         
-        osync_context_report_success(ctx);
         osync_trace(TRACE_EXIT, "%s", __func__);
         return TRUE;
 }
+
+bool KContactDataSource::vcard_access(OSyncContext *ctx, OSyncChange *chg)
+{
+        if (!__vcard_access(ctx, chg))
+                return false;
+
+        osync_context_report_success(ctx);
+        return true;
+}
+
+bool KContactDataSource::vcard_commit_change(OSyncContext *ctx, OSyncChange *chg)
+{
+    if ( !__vcard_access(ctx, chg) )
+        return false;
+
+    osync_hashtable_update_hash(hashtable, chg);
+    osync_context_report_success(ctx);
+    return true;
+}

plugins/kdepim/src/kaddrbook.h

@@ -36 +36 @@
         OSyncHashTable *hashtable;
         OSyncMember *member;
+
+        bool __vcard_access(OSyncContext *ctx, OSyncChange *chg);
+
     public:
         KContactDataSource(OSyncMember *member, OSyncHashTable *hashtable);
@@ -44 +47 @@
         bool contact_get_changeinfo(OSyncContext *ctx);
         bool vcard_access(OSyncContext *ctx, OSyncChange *chg);
+        bool vcard_commit_change(OSyncContext *ctx, OSyncChange *chg);
                 bool connected;
 };

plugins/kdepim/src/kdepim_impl.cpp

@@ -210 +210 @@
         {
                         if (kaddrbook)
-                                if (kaddrbook->vcard_access(ctx, chg))
-                        osync_hashtable_update_hash(hashtable, chg);
-                else
-                        return FALSE;
+                                return kaddrbook->vcard_commit_change(ctx, chg);
                         else {
                                 osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "No addressbook loaded");