list = NULL;
for (i = 0; seq[i]; i++) {
ECalComponentId *id;
+ const gchar * eol;
+
id = g_new (ECalComponentId, 1);
- id->uid = g_strdup (seq[i]);
- id->rid = NULL; /* TODO */
+ /* match encoding as in notify_remove() in e-data-cal-view.c: <uid>[\n<rid>] */
+ eol = strchr (seq[i], '\n');
+ if (eol) {
+ id->uid = g_strndup (seq[i], eol - seq[i]);
+ id->rid = g_strdup (eol + 1);
+ } else {
+ id->uid = g_strdup (seq[i]);
+ id->rid = NULL;
+ }
list = g_list_prepend (list, id);
}
}
static void
-objects_removed_cb (EGdbusCalView *gdbus_calview, const gchar * const *uids, ECalView *view)
+objects_removed_cb (EGdbusCalView *gdbus_calview, const gchar * const *seq, ECalView *view)
{
GList *list;
g_return_if_fail (E_IS_CAL_VIEW (view));
g_object_ref (view);
- list = build_id_list (uids);
+ list = build_id_list (seq);
g_signal_emit (G_OBJECT (view), signals[OBJECTS_REMOVED], 0, list);
if (priv->removes->len == 0)
return;
- /* TODO: send ECalComponentIds as a list of pairs */
+ /* send ECalComponentIds as <uid>[\n<rid>], as encoded in notify_remove() */
e_gdbus_cal_view_emit_objects_removed (view->priv->gdbus_object, (const gchar * const *) priv->removes->data);
reset_array (priv->removes);
}
notify_remove (EDataCalView *view, ECalComponentId *id)
{
EDataCalViewPrivate *priv = view->priv;
- gchar *uid;
+ gchar *ids;
+ gchar *uid, *rid;
+ size_t uid_len, rid_len;
send_pending_adds (view);
send_pending_changes (view);
send_pending_removes (view);
}
- /* TODO: store ECalComponentId instead of just uid*/
- uid = e_util_utf8_make_valid (id->uid);
- g_array_append_val (priv->removes, uid);
+ /* store ECalComponentId as <uid>[\n<rid>] (matches D-Bus API) */
+ if (id->uid) {
+ uid = e_util_utf8_make_valid (id->uid);
+ uid_len = strlen (uid);
+ } else {
+ uid = NULL;
+ uid_len = 0;
+ }
+ if (id->rid) {
+ rid = e_util_utf8_make_valid (id->rid);
+ rid_len = strlen (rid);
+ } else {
+ rid = NULL;
+ rid_len = 0;
+ }
+ if (uid_len && !rid_len) {
+ /* shortcut */
+ ids = uid;
+ uid = NULL;
+ } else {
+ /* concatenate */
+ ids = g_malloc (uid_len + rid_len + (rid_len ? 2 : 1));
+ if (uid_len)
+ strcpy (ids, uid);
+ if (rid_len) {
+ ids[uid_len] = '\n';
+ strcpy (ids + uid_len + 1, rid);
+ }
+ }
+ g_array_append_val (priv->removes, ids);
+ g_free (uid);
+ g_free (rid);
g_hash_table_remove (priv->ids, id);