diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 23 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 24 |
3 files changed, 21 insertions, 36 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 03b6968ac8..6da5bcb51b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2000-10-23 JP Rosevear <jpr@helixcode.com> + + * conduits/todo/todo-conduit.c (local_record_from_comp): Use + new e-pilot-map lookup function + (match): ditto + + * conduits/calendar/calendar-conduit.c (local_record_from_comp): Use + new e-pilot-map lookup function + (match): ditto + 2000-10-23 Dan Winship <danw@helixcode.com> * pcs/Makefile.am (INCLUDES): diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index f5ef766648..ac3bd515c3 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -236,19 +236,6 @@ get_ical_day (int day) } static void -compute_pid (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid) -{ - guint32 *pid; - - pid = g_hash_table_lookup (ctxt->map->uid_map, uid); - - if (pid) - local->local.ID = *pid; - else - local->local.ID = 0; -} - -static void compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid) { local->local.archived = FALSE; @@ -314,7 +301,7 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC local->comp = comp; cal_component_get_uid (local->comp, &uid); - compute_pid (ctxt, local, uid); + local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid); compute_status (ctxt, local, uid); local->appt = g_new0 (struct Appointment,1); @@ -403,7 +390,7 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC static void local_record_from_uid (ECalLocalRecord *local, - char *uid, + const char *uid, ECalConduitContext *ctxt) { CalComponent *comp; @@ -651,7 +638,7 @@ pre_sync (GnomePilotConduit *conduit, switch (coc->type) { case CALOBJ_UPDATED: - if (g_hash_table_lookup (ctxt->map->uid_map, coc->uid)) + if (e_pilot_map_lookup_pid (ctxt->map, coc->uid) > 0) g_hash_table_insert (ctxt->modified, coc->uid, coc); else g_hash_table_insert (ctxt->added, coc->uid, coc); @@ -965,7 +952,7 @@ match (GnomePilotConduitSyncAbs *conduit, ECalLocalRecord **local, ECalConduitContext *ctxt) { - char *uid; + const char *uid; LOG ("match: looking for local copy of %s\n", print_remote (remote)); @@ -974,7 +961,7 @@ match (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (remote != NULL, -1); *local = NULL; - uid = g_hash_table_lookup (ctxt->map->pid_map, &remote->ID); + uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID); if (!uid) return 0; diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 9158f55c30..d4b715f4e8 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -215,19 +215,6 @@ map_name (EToDoConduitContext *ctxt) } static void -compute_pid (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid) -{ - guint32 *pid; - - pid = g_hash_table_lookup (ctxt->map->uid_map, uid); - - if (pid) - local->local.ID = *pid; - else - local->local.ID = 0; -} - -static void compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid) { local->local.archived = FALSE; @@ -294,7 +281,8 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui local->comp = comp; cal_component_get_uid (local->comp, &uid); - compute_pid (ctxt, local, uid); + local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid); + compute_status (ctxt, local, uid); local->todo = g_new0 (struct ToDo,1); @@ -350,7 +338,7 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui static void local_record_from_uid (EToDoLocalRecord *local, - char *uid, + const char *uid, EToDoConduitContext *ctxt) { CalComponent *comp; @@ -530,7 +518,7 @@ pre_sync (GnomePilotConduit *conduit, switch (coc->type) { case CALOBJ_UPDATED: - if (g_hash_table_lookup (ctxt->map->uid_map, coc->uid)) + if (e_pilot_map_lookup_pid (ctxt->map, coc->uid) > 0) g_hash_table_insert (ctxt->modified, coc->uid, coc); else g_hash_table_insert (ctxt->added, coc->uid, coc); @@ -845,7 +833,7 @@ match (GnomePilotConduitSyncAbs *conduit, EToDoLocalRecord **local, EToDoConduitContext *ctxt) { - char *uid; + const char *uid; LOG ("match: looking for local copy of %s\n", print_remote (remote)); @@ -854,7 +842,7 @@ match (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (remote != NULL, -1); *local = NULL; - uid = g_hash_table_lookup (ctxt->map->pid_map, &remote->ID); + uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID); if (!uid) return 0; |