calendar file backend: revert adding EXDATE when creating detached recurrences
authorPatrick Ohly <patrick.ohly@intel.com>
Wed, 14 Sep 2011 07:43:58 +0000 (09:43 +0200)
committerPatrick Ohly <patrick.ohly@intel.com>
Wed, 14 Sep 2011 07:48:08 +0000 (09:48 +0200)
This reverts the part of 8631a8f which adds an EXDATE to the recurring
event when adding a detached recurrence. Adding that EXDATE is not
necessary, the detached recurrences overwrite the regular recurrences
based on UID/RECURRENCE-ID, and changes visible EDS behavior (breaks
SyncEvolution testing, for example).

As discussed in GNOME Bug #655253 and the "SyncEvolution + EClient API
+ EXDATE regression (Bug #655253)" mail thread, the real problem
seems to be related to UID handling in detached recurrences.

calendar/backends/file/e-cal-backend-file.c

index 2dc9a90..e1cfbb3 100644 (file)
@@ -2391,9 +2391,6 @@ e_cal_backend_file_modify_object (ECalBackendSync *backend,
                        priv->comp = g_list_remove (priv->comp, recurrence);
                        obj_data->recurrences_list = g_list_remove (obj_data->recurrences_list, recurrence);
                        g_hash_table_remove (obj_data->recurrences, rid);
-               } else if (obj_data->full_object) {
-                       /* add exception for the modified instance */
-                       e_cal_util_remove_instances (e_cal_component_get_icalcomponent (obj_data->full_object), icaltime_from_string (rid), CALOBJ_MOD_THIS);
                }
 
                /* add the detached instance */