aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c34
-rw-r--r--calendar/conduits/calendar/calendar-conduit.h7
-rw-r--r--calendar/conduits/todo/todo-conduit.c36
-rw-r--r--calendar/conduits/todo/todo-conduit.h8
5 files changed, 37 insertions, 57 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 67b5d22cb8..9e8438f2da 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,14 @@
2000-10-23 JP Rosevear <jpr@helixcode.com>
+ * conduits/todo/todo-conduit.h: Use new libeconduit calls and
+ abstraction
+
+ * conduits/calendar/calendar-conduit.c: ditto
+
+ * conduits/calendar/calendar-conduit.h: ditto
+
+ * conduits/todo/todo-conduit.c: ditto
+
* conduits/calendar/Makefile.am: Add libeconduit-static.la
* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 945c384b21..f5ef766648 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -41,7 +41,6 @@
#include <pi-dlp.h>
#include <pi-version.h>
#include <libical/src/libical/icaltypes.h>
-#include <e-pilot-map.h>
#define CAL_CONFIG_LOAD 1
#define CAL_CONFIG_DESTROY 1
@@ -241,7 +240,7 @@ compute_pid (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
{
guint32 *pid;
- pid = g_hash_table_lookup (ctxt->uid_map, uid);
+ pid = g_hash_table_lookup (ctxt->map->uid_map, uid);
if (pid)
local->local.ID = *pid;
@@ -591,7 +590,7 @@ check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
int count, map_count;
count = g_list_length (ctxt->uids);
- map_count = g_hash_table_size (ctxt->pid_map);
+ map_count = g_hash_table_size (ctxt->map->pid_map);
/* If there are no objects or objects but no log */
if ((count == 0) || (count > 0 && map_count == 0)) {
@@ -615,7 +614,6 @@ pre_sync (GnomePilotConduit *conduit,
int len;
unsigned char *buf;
char *filename;
- xmlSAXHandler handler;
gint num_records;
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
@@ -636,11 +634,8 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_EVENT);
/* Load the uid <--> pilot id mapping */
- ctxt->pid_map = g_hash_table_new (g_int_hash, g_int_equal);
- ctxt->uid_map = g_hash_table_new (g_str_hash, g_str_equal);
-
filename = map_name (ctxt);
- e_pilot_map_read (filename, ctxt->pid_map, ctxt->uid_map, &ctxt->since);
+ e_pilot_map_read (filename, &ctxt->map);
g_free (filename);
/* Find the added, modified and deleted items */
@@ -650,13 +645,13 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->changed = cal_client_get_changed_uids (ctxt->client,
CALOBJ_TYPE_EVENT,
- ctxt->since + 1);
+ ctxt->map->since + 1);
for (l = ctxt->changed; l != NULL; l = l->next) {
CalObjChange *coc = l->data;
switch (coc->type) {
case CALOBJ_UPDATED:
- if (g_hash_table_lookup (ctxt->uid_map, coc->uid))
+ if (g_hash_table_lookup (ctxt->map->uid_map, coc->uid))
g_hash_table_insert (ctxt->modified, coc->uid, coc);
else
g_hash_table_insert (ctxt->added, coc->uid, coc);
@@ -709,7 +704,7 @@ post_sync (GnomePilotConduit *conduit,
LOG ("---------------------------------------------------------\n");
filename = map_name (ctxt);
- e_pilot_map_write (filename, ctxt->pid_map);
+ e_pilot_map_write (filename, ctxt->map);
g_free (filename);
return 0;
@@ -722,16 +717,11 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit,
ECalConduitContext *ctxt)
{
const char *uid;
- char *new_uid;
- guint32 *pid = g_new (guint32, 1);
LOG ("set_pilot_id: setting to %d\n", ID);
cal_component_get_uid (local->comp, &uid);
- *pid = ID;
- new_uid = g_strdup (uid);
- g_hash_table_insert (ctxt->pid_map, pid, new_uid);
- g_hash_table_insert (ctxt->uid_map, new_uid, pid);
+ e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
return 0;
}
@@ -879,8 +869,6 @@ add_record (GnomePilotConduitSyncAbs *conduit,
{
CalComponent *comp;
const char *uid;
- char *new_uid;
- guint32 *pid = g_new (guint32, 1);
int retval = 0;
g_return_val_if_fail (remote != NULL, -1);
@@ -890,11 +878,9 @@ add_record (GnomePilotConduitSyncAbs *conduit,
comp = comp_from_remote_record (conduit, remote, NULL);
update_comp (conduit, comp, ctxt);
- *pid = remote->ID;
cal_component_get_uid (comp, &uid);
- new_uid = g_strdup (uid);
- g_hash_table_insert (ctxt->pid_map, pid, new_uid);
- g_hash_table_insert (ctxt->uid_map, new_uid, pid);
+
+ e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
return retval;
}
@@ -988,7 +974,7 @@ match (GnomePilotConduitSyncAbs *conduit,
g_return_val_if_fail (remote != NULL, -1);
*local = NULL;
- uid = g_hash_table_lookup (ctxt->pid_map, &remote->ID);
+ uid = g_hash_table_lookup (ctxt->map->pid_map, &remote->ID);
if (!uid)
return 0;
diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h
index b0065610fb..91900fcb90 100644
--- a/calendar/conduits/calendar/calendar-conduit.h
+++ b/calendar/conduits/calendar/calendar-conduit.h
@@ -33,7 +33,7 @@
#include <gpilotd/gnome-pilot-conduit.h>
#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
#include <cal-client/cal-client.h>
-
+#include <e-pilot-map.h>
/* This is the local record structure for the Evolution Calendar conduit. */
typedef struct _ECalLocalRecord ECalLocalRecord;
@@ -67,12 +67,11 @@ struct _ECalConduitContext {
GList *uids;
GList *changed;
+ EPilotMap *map;
+
GHashTable *added;
GHashTable *modified;
GHashTable *deleted;
-
- GHashTable *uid_map;
- GHashTable *pid_map;
};
#endif __CALENDAR_CONDUIT_H__
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 992f36eb0d..9158f55c30 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -41,7 +41,6 @@
#include <pi-dlp.h>
#include <pi-version.h>
#include <libical/src/libical/icaltypes.h>
-#include <e-pilot-map.h>
#define TODO_CONFIG_LOAD 1
#define TODO_CONFIG_DESTROY 1
@@ -220,7 +219,7 @@ compute_pid (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid
{
guint32 *pid;
- pid = g_hash_table_lookup (ctxt->uid_map, uid);
+ pid = g_hash_table_lookup (ctxt->map->uid_map, uid);
if (pid)
local->local.ID = *pid;
@@ -470,7 +469,7 @@ check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
int count, map_count;
count = g_list_length (ctxt->uids);
- map_count = g_hash_table_size (ctxt->pid_map);
+ map_count = g_hash_table_size (ctxt->map->pid_map);
/* If there are no objects or objects but no log */
if ((count == 0) || (count > 0 && map_count == 0)) {
@@ -513,12 +512,9 @@ pre_sync (GnomePilotConduit *conduit,
/* Get the local database */
ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_TODO);
- /* Load the uid <--> pilot id mappings */
- ctxt->pid_map = g_hash_table_new (g_int_hash, g_int_equal);
- ctxt->uid_map = g_hash_table_new (g_str_hash, g_str_equal);
-
+ /* Load the uid <--> pilot id map */
filename = map_name (ctxt);
- e_pilot_map_read (filename, ctxt->pid_map, ctxt->uid_map, &ctxt->since);
+ e_pilot_map_read (filename, &ctxt->map);
g_free (filename);
/* Find the added, modified and deleted items */
@@ -528,13 +524,13 @@ pre_sync (GnomePilotConduit *conduit,
ctxt->changed = cal_client_get_changed_uids (ctxt->client,
CALOBJ_TYPE_TODO,
- ctxt->since + 1);
+ ctxt->map->since + 1);
for (l = ctxt->changed; l != NULL; l = l->next) {
CalObjChange *coc = l->data;
switch (coc->type) {
case CALOBJ_UPDATED:
- if (g_hash_table_lookup (ctxt->uid_map, coc->uid))
+ if (g_hash_table_lookup (ctxt->map->uid_map, coc->uid))
g_hash_table_insert (ctxt->modified, coc->uid, coc);
else
g_hash_table_insert (ctxt->added, coc->uid, coc);
@@ -587,7 +583,8 @@ post_sync (GnomePilotConduit *conduit,
LOG ("---------------------------------------------------------\n");
filename = map_name (ctxt);
- e_pilot_map_write (filename, ctxt->pid_map);
+ e_pilot_map_write (filename, ctxt->map);
+ e_pilot_map_destroy (ctxt->map);
g_free (filename);
return 0;
@@ -600,16 +597,11 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit,
EToDoConduitContext *ctxt)
{
const char *uid;
- char *new_uid;
- guint32 *pid = g_new (guint32, 1);
LOG ("set_pilot_id: setting to %d\n", ID);
cal_component_get_uid (local->comp, &uid);
- *pid = ID;
- new_uid = g_strdup (uid);
- g_hash_table_insert (ctxt->pid_map, pid, new_uid);
- g_hash_table_insert (ctxt->uid_map, new_uid, pid);
+ e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
return 0;
}
@@ -757,8 +749,6 @@ add_record (GnomePilotConduitSyncAbs *conduit,
{
CalComponent *comp;
const char *uid;
- char *new_uid;
- guint32 *pid = g_new (guint32, 1);
int retval = 0;
g_return_val_if_fail (remote != NULL, -1);
@@ -768,11 +758,9 @@ add_record (GnomePilotConduitSyncAbs *conduit,
comp = comp_from_remote_record (conduit, remote, NULL);
update_comp (conduit, comp, ctxt);
- *pid = remote->ID;
cal_component_get_uid (comp, &uid);
- new_uid = g_strdup (uid);
- g_hash_table_insert (ctxt->pid_map, pid, new_uid);
- g_hash_table_insert (ctxt->uid_map, new_uid, pid);
+
+ e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
return retval;
}
@@ -866,7 +854,7 @@ match (GnomePilotConduitSyncAbs *conduit,
g_return_val_if_fail (remote != NULL, -1);
*local = NULL;
- uid = g_hash_table_lookup (ctxt->pid_map, &remote->ID);
+ uid = g_hash_table_lookup (ctxt->map->pid_map, &remote->ID);
if (!uid)
return 0;
diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
index ecec89c35a..6e1f109a87 100644
--- a/calendar/conduits/todo/todo-conduit.h
+++ b/calendar/conduits/todo/todo-conduit.h
@@ -33,7 +33,7 @@
#include <gpilotd/gnome-pilot-conduit.h>
#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
#include <cal-client/cal-client.h>
-
+#include <e-pilot-map.h>
/* This is the local record structure for the Evolution ToDo conduit. */
typedef struct _EToDoLocalRecord EToDoLocalRecord;
@@ -63,16 +63,14 @@ struct _EToDoConduitContext {
gboolean calendar_load_tried;
gboolean calendar_load_success;
- time_t since;
GList *uids;
GList *changed;
+ EPilotMap *map;
+
GHashTable *added;
GHashTable *modified;
GHashTable *deleted;
-
- GHashTable *uid_map;
- GHashTable *pid_map;
};
#endif __TODO_CONDUIT_H__
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:33:43 +0800