diff options
| -rw-r--r-- | calendar/ChangeLog | 21 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 12 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 10 |
3 files changed, 30 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a3691c90aa..d57bffcc59 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,12 +1,25 @@ +2001-10-27 JP Rosevear <jpr@ximian.com> + + * conduits/todo/todo-conduit.c (local_record_from_comp): touch on + lookup + (check_for_slow_setting): write touched only if slow sync + (match): touch on lookup + + * conduits/calendar/calendar-conduit.c (local_record_from_comp): + touch the record on lookup + (check_for_slow_setting): write touched only if slow sync + (pre_sync): don't touch on lookup + (match): touch on lookup + 2001-10-26 JP Rosevear <jpr@ximian.com> - * conduits/calendar/e-calendar.conduit.in: remove the merges as valid sync - types + * conduits/calendar/e-calendar.conduit.in: remove the merges as + valid sync types * conduits/todo/e-todo.conduit.in: as above - * conduits/calendar/calendar-conduit.c (pre_sync): write out only the - touched records if we are doing copies + * conduits/calendar/calendar-conduit.c (pre_sync): write out only + the touched records if we are doing copies * conduits/todo/todo-conduit.c: as above diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index db50409d4b..4f01b27a5f 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -548,7 +548,7 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC gtk_object_ref (GTK_OBJECT (comp)); cal_component_get_uid (local->comp, &uid); - local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid); + local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE); compute_status (ctxt, local, uid); local->appt = g_new0 (struct Appointment, 1); @@ -934,10 +934,12 @@ check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt) if (map_count == 0) gnome_pilot_conduit_standard_set_slow (conduit, TRUE); - if (gnome_pilot_conduit_standard_get_slow (conduit)) + if (gnome_pilot_conduit_standard_get_slow (conduit)) { + ctxt->map->write_touched_only = TRUE; LOG (" doing slow sync\n"); - else + } else { LOG (" doing fast sync\n"); + } } /* Pilot syncing callbacks */ @@ -1002,7 +1004,7 @@ pre_sync (GnomePilotConduit *conduit, ctxt->changed = g_list_concat (ctxt->changed, multi_ccc); cal_component_get_uid (ccc->comp, &uid); - if (e_pilot_map_lookup_pid (ctxt->map, uid) == 0) { + if (e_pilot_map_lookup_pid (ctxt->map, uid, FALSE) == 0) { ctxt->changed = g_list_remove (ctxt->changed, ccc); gtk_object_unref (GTK_OBJECT (ccc->comp)); g_free (ccc); @@ -1352,7 +1354,7 @@ match (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (remote != NULL, -1); *local = NULL; - uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID); + uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE); if (!uid) return 0; diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 1dac791862..91252a9bbf 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -405,7 +405,7 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui gtk_object_ref (GTK_OBJECT (comp)); cal_component_get_uid (local->comp, &uid); - local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid); + local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE); compute_status (ctxt, local, uid); @@ -658,10 +658,12 @@ check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt) if (map_count == 0) gnome_pilot_conduit_standard_set_slow (conduit, TRUE); - if (gnome_pilot_conduit_standard_get_slow (conduit)) + if (gnome_pilot_conduit_standard_get_slow (conduit)) { + ctxt->map->write_touched_only = TRUE; LOG (" doing slow sync\n"); - else + } else { LOG (" doing fast sync\n"); + } } /* Pilot syncing callbacks */ @@ -1054,7 +1056,7 @@ match (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (remote != NULL, -1); *local = NULL; - uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID); + uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE); if (!uid) return 0; |