aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c29
-rw-r--r--calendar/conduits/todo/todo-conduit.c1
3 files changed, 14 insertions, 27 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index cb3c6d3785..d352bb4811 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2001-01-22 JP Rosevear <jpr@ximian.com>
+
+ * conduits/calendar/calendar-conduit.c: Remove alarm foo for now
+
+2001-01-21 JP Rosevear <jpr@ximian.com>
+
+ * conduits/calendar/calendar-conduit.c (delete_record): Remove
+ deleted records from the pilot map so we don't have dupes in the future
+
+ * conduits/todo/todo-conduit.c (delete_record): ditto
+
2001-01-21 Federico Mena Quintero <federico@ximian.com>
* gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 9b820ef1d3..1d07a7bc66 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -535,6 +535,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
int pos, i;
CalComponentText summary = {NULL, NULL};
CalComponentDateTime dt = {NULL, NULL};
+ GList *alist, *l;
char *txt;
g_return_val_if_fail (remote != NULL, NULL);
@@ -656,33 +657,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
cal_component_set_rrule_list (comp, NULL);
}
- /* Alarm information */
- if (appt.alarm) {
- CalComponentAlarm *alarm;
- CalAlarmTrigger trig;
-
- alarm = cal_component_alarm_new ();
- cal_component_add_alarm (comp, alarm);
-
- memset (&trig, 0, sizeof (trig));
- trig.type = CAL_ALARM_TRIGGER_RELATIVE_START;
- trig.u.rel_duration.is_neg = 1;
- switch (appt.advanceUnits) {
- case advMinutes:
- trig.u.rel_duration.minutes = appt.advance;
- break;
- case advHours:
- trig.u.rel_duration.hours = appt.advance;
- break;
- case advDays:
- trig.u.rel_duration.days = appt.advance;
- break;
- }
- cal_component_alarm_set_trigger (alarm, trig);
-
- cal_component_alarm_set_action (alarm, CAL_ALARM_AUDIO);
- }
-
cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
if (remote->attr & dlpRecAttrSecret)
@@ -1066,6 +1040,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit,
LOG ("delete_record: deleting %s\n", uid);
+ e_pilot_map_remove_by_uid (ctxt->map, uid);
cal_client_remove_object (ctxt->client, uid);
return 0;
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index f0dfb56b14..4d6a27e5e1 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -854,6 +854,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit,
LOG ("delete_record: deleting %s\n", uid);
+ e_pilot_map_remove_by_uid (ctxt->map, uid);
cal_client_remove_object (ctxt->client, uid);
return 0;