Changeset 2497

Timestamp:

08/28/07 16:24:31 (1 year ago)

Author:

dgollub

Message:

Set a empty OSyncData object for OSyncChange if a _deleted_ change with
changetype DELETED got send. This fixes several asserts in different
places.

I didn't removed all the asserts because it's a path full of asserts
until the marshal/demarshal funciton.

TODO: Get rid of does dummy OSyncData object if the changetype is
_deleted_ - fix the marshal/demarshal fucntion and test this.

Files:

• plugins/kdepim/src/datasource.cpp (modified) (3 diffs)
• plugins/kdepim/src/datasource.h (modified) (1 diff)
• plugins/kdepim/src/kaddrbook.cpp (modified) (1 diff)
• plugins/kdepim/src/kcal.cpp (modified) (4 diffs)
• plugins/kdepim/src/knotes.cpp (modified) (1 diff)

plugins/kdepim/src/datasource.cpp

@@ -181 +181 @@
-}
-
-
-
-)", __PRETTY_FUNCTION__, info, ctx
+, OSyncObjFormat *objformat
+
+, %p)", __PRETTY_FUNCTION__, info, ctx, objformat
-        
-        int i;
@@ -194 +194 @@
-                
-                change = osync_change_new(&error);
-
-
-
-
-
-
-
-
-
+
+
-
-                osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_DELETED);
-                osync_change_set_uid(change, uids[i]);
+
+                OSyncData *data = osync_data_new(NULL, 0, objformat, &error); 
+                if (!data)
+                        goto error_free_change;
+
+                osync_data_set_objtype(data, osync_objtype_sink_get_name(sink));
+                osync_change_set_data(change, data);
+
-                osync_context_report_change(ctx, change);
-                osync_hashtable_update_hash(hashtable, OSYNC_CHANGE_TYPE_DELETED, uids[i], NULL);
@@ -215 +216 @@
-        osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
-        return true;
+
+error_free_change:      
+        osync_change_unref(change);
+error:  
+        for (; uids[i]; i++)
+                g_free(uids[i]);
+        g_free(uids);
+        osync_context_report_osyncerror(ctx, error);
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __PRETTY_FUNCTION__, osync_error_print(&error));
+        osync_error_unref(&error);
+        return false;
-}
-

plugins/kdepim/src/datasource.h

@@ -14 +14 @@
-                /* utility functions for subclasses */
-                bool report_change(OSyncPluginInfo *info, OSyncContext *ctx, QString uid, QString data, QString hash, OSyncObjFormat *objformat);
-
+, OSyncObjFormat *objformat
-
-        public:

plugins/kdepim/src/kaddrbook.cpp

@@ -148 +148 @@
-        }
-
-
+, objformat
-                osync_trace(TRACE_EXIT_ERROR, "%s", __PRETTY_FUNCTION__);
-                return;

plugins/kdepim/src/kcal.cpp

@@ -294 +294 @@
-        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
+        OSyncObjFormat *objformat = osync_format_env_find_objformat(formatenv, "vevent20");
+
-        if (osync_objtype_sink_get_slowsync(sink)) {
-                osync_trace(TRACE_INTERNAL, "Got slow-sync");
@@ -304 +307 @@
-        }
-
-
+, objformat
-                osync_trace(TRACE_EXIT_ERROR, "%s", __PRETTY_FUNCTION__);
-                return;
@@ -318 +321 @@
-
-        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
+        OSyncObjFormat *objformat = osync_format_env_find_objformat(formatenv, "vtodo20");
-
-        if (osync_objtype_sink_get_slowsync(sink)) {
@@ -329 +335 @@
-        }
-
-
+, objformat
-                osync_trace(TRACE_EXIT_ERROR, "%s", __PRETTY_FUNCTION__);
-                return;

plugins/kdepim/src/knotes.cpp

@@ -242 +242 @@
-        }
-
-
+, objformat
-                osync_trace(TRACE_EXIT_ERROR, "%s", __func__);
-                return;