diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 18 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 18 |
3 files changed, 23 insertions, 20 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ef97844ff2..d74283dee1 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ 2001-10-26 JP Rosevear <jpr@ximian.com> + * conduits/calendar/calendar-conduit.c (check_for_slow_setting): + make debug output more accurate + + * conduits/todo/todo-conduit.c (check_for_slow_setting): ditto + +2001-10-26 JP Rosevear <jpr@ximian.com> + * conduits/todo/todo-conduit.c (pre_sync): remove the uid from the map if was archived and is now deleted diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 01580107b8..f619d19ed6 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -926,20 +926,18 @@ update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp, static void check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt) { - int count, map_count; + GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c); + int map_count; - count = g_list_length (ctxt->uids); + /* If there are objects but no log */ map_count = g_hash_table_size (ctxt->map->pid_map); - - /* If there are no objects or objects but no log */ - if (map_count == 0) { - GnomePilotConduitStandard *conduit; - LOG (" doing slow sync\n"); - conduit = GNOME_PILOT_CONDUIT_STANDARD (c); + if (map_count == 0) gnome_pilot_conduit_standard_set_slow (conduit, TRUE); - } else { + + if (gnome_pilot_conduit_standard_get_slow (conduit)) + LOG (" doing slow sync\n"); + else LOG (" doing fast sync\n"); - } } /* Pilot syncing callbacks */ diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 4c6289702c..8bd153364d 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -650,20 +650,18 @@ update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp, static void check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt) { - int count, map_count; + GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c); + int map_count; - count = g_list_length (ctxt->uids); - map_count = g_hash_table_size (ctxt->map->pid_map); - /* If there are no objects or objects but no log */ - if (map_count == 0) { - GnomePilotConduitStandard *conduit; - LOG (" doing slow sync\n"); - conduit = GNOME_PILOT_CONDUIT_STANDARD (c); + map_count = g_hash_table_size (ctxt->map->pid_map); + if (map_count == 0) gnome_pilot_conduit_standard_set_slow (conduit, TRUE); - } else { + + if (gnome_pilot_conduit_standard_get_slow (conduit)) + LOG (" doing slow sync\n"); + else LOG (" doing fast sync\n"); - } } /* Pilot syncing callbacks */ |