aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/conduits/todo
diff options
context:
space:
mode:
authorJP Rosevear <jpr@helixcode.com>2000-10-10 11:52:41 +0800
committerJP Rosevear <jpr@src.gnome.org>2000-10-10 11:52:41 +0800
commitcde356b32b161e110c3024eb414660fe5b8f516c (patch)
tree21dfd0104c871e9d48adf08413a4dfec2938c2eb /calendar/conduits/todo
parenteb33178c5cd15a24fc23569d2d4fa9a61edd7079 (diff)
downloadgsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.tar
gsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.tar.gz
gsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.tar.bz2
gsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.tar.lz
gsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.tar.xz
gsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.tar.zst
gsoc2013-evolution-cde356b32b161e110c3024eb414660fe5b8f516c.zip
Adjust to using gnome-pilot-sync-abs conduit which is based on the latest
2000-10-09 JP Rosevear <jpr@helixcode.com> * conduits/*: Adjust to using gnome-pilot-sync-abs conduit which is based on the latest pilot link changes. svn path=/trunk/; revision=5812
Diffstat (limited to 'calendar/conduits/todo')
-rw-r--r--calendar/conduits/todo/Makefile.am4
-rw-r--r--calendar/conduits/todo/todo-conduit.c631
-rw-r--r--calendar/conduits/todo/todo-conduit.h13
3 files changed, 277 insertions, 371 deletions
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 94eb5251b5..619a11657b 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
- $(BONOBO_VFS_GNOME_CFLAGS) \
+ $(BONOBO_VFS_GNOME_CFLAGS) \
$(GNOME_PILOT_CFLAGS)
# ToDo Capplet
@@ -22,8 +22,6 @@ e_todo_conduit_control_applet_LDADD = \
$(GNOMEUI_LIBS) \
$(INTLLIBS)
-
-
# ToDo Conduit
e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 4253000598..427e50d8dc 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -30,6 +30,9 @@
#include <signal.h>
#include <errno.h>
+#include <liboaf/liboaf.h>
+#include <bonobo.h>
+#include <gnome-xml/parser.h>
#include <cal-client/cal-client.h>
#include <cal-util/timeutil.h>
#include <pi-source.h>
@@ -37,14 +40,10 @@
#include <pi-file.h>
#include <pi-dlp.h>
#include <pi-version.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-standard-abs.h>
#include <todo-conduit-config.h>
#include <todo-conduit.h>
#include <libical/src/libical/icaltypes.h>
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
@@ -95,7 +94,7 @@ static char *print_local (EToDoLocalRecord *local)
/* debug spew DELETE ME */
-static char *print_remote (PilotRecord *remote)
+static char *print_remote (GnomePilotRecord *remote)
{
static char buff[ 4096 ];
struct ToDo todo;
@@ -150,7 +149,6 @@ static char *
map_name (EToDoConduitContext *ctxt)
{
char *filename;
-
filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
@@ -318,7 +316,6 @@ static const char *
status_to_string (gint status)
{
switch(status) {
- case GnomePilotRecordPending: return "GnomePilotRecordPending";
case GnomePilotRecordNothing: return "GnomePilotRecordNothing";
case GnomePilotRecordDeleted: return "GnomePilotRecordDeleted";
case GnomePilotRecordNew: return "GnomePilotRecordNew";
@@ -328,11 +325,27 @@ status_to_string (gint status)
return "Unknown";
}
-static PilotRecord *
+static void
+compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
+{
+ local->local.archived = FALSE;
+ local->local.secret = FALSE;
+
+ if (g_hash_table_lookup (ctxt->added, uid))
+ local->local.attr = GnomePilotRecordNew;
+ else if (g_hash_table_lookup (ctxt->modified, uid))
+ local->local.attr = GnomePilotRecordModified;
+ else if (g_hash_table_lookup (ctxt->deleted, uid))
+ local->local.attr = GnomePilotRecordNew;
+ else
+ local->local.attr = GnomePilotRecordDeleted;
+}
+
+static GnomePilotRecord *
local_record_to_pilot_record (EToDoLocalRecord *local,
EToDoConduitContext *ctxt)
{
- PilotRecord *p = NULL;
+ GnomePilotRecord *p = NULL;
g_return_val_if_fail (local != NULL, NULL);
g_assert (local->comp != NULL);
@@ -340,9 +353,10 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
LOG ("local_record_to_remote_record\n");
- p = g_new0 (PilotRecord, 1);
+ p = g_new0 (GnomePilotRecord, 1);
p->ID = local->local.ID;
+ p->category = 0;
p->attr = local->local.attr;
p->archived = local->local.archived;
p->secret = local->local.secret;
@@ -454,6 +468,7 @@ local_record_from_uid (EToDoLocalRecord *local,
if (status == CAL_CLIENT_GET_SUCCESS) {
local_record_from_comp (local, comp);
+ compute_status (ctxt, local, uid);
} else {
INFO ("Object did not exist");
}
@@ -461,8 +476,8 @@ local_record_from_uid (EToDoLocalRecord *local,
static CalComponent *
-comp_from_remote_record (GnomePilotConduitStandardAbs *conduit,
- PilotRecord *remote,
+comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ GnomePilotRecord *remote,
CalComponent *in_comp)
{
CalComponent *comp;
@@ -526,9 +541,6 @@ comp_from_remote_record (GnomePilotConduitStandardAbs *conduit,
else
cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
- cal_component_set_pilot_id (comp, &remote->ID);
- cal_component_set_pilot_status (comp, &pilot_status);
-
cal_component_commit_sequence (comp);
free_ToDo(&todo);
@@ -537,7 +549,7 @@ comp_from_remote_record (GnomePilotConduitStandardAbs *conduit,
}
static void
-update_comp (GnomePilotConduitStandardAbs *conduit, CalComponent *comp,
+update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
EToDoConduitContext *ctxt)
{
gboolean success;
@@ -573,21 +585,74 @@ check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
}
}
+static gint
+update_record (GnomePilotConduitSyncAbs *conduit,
+ GnomePilotRecord *remote,
+ EToDoConduitContext *ctxt)
+{
+ CalComponent *comp;
+ CalClientGetStatus status;
+ struct ToDo todo;
+ const char *uid;
+
+ LOG ("update_record\n");
+
+ g_return_val_if_fail (remote != NULL, -1);
+
+ memset (&todo, 0, sizeof (struct ToDo));
+ unpack_ToDo (&todo, remote->record, remote->length);
+
+ uid = g_hash_table_lookup (ctxt->map, &remote->ID);
+
+ if (uid)
+ status = cal_client_get_object (ctxt->client, uid, &comp);
+ else
+ status = CAL_CLIENT_LOAD_ERROR;
+
+ if (status != CAL_CLIENT_GET_SUCCESS) {
+ LOG (" new record being created\n");
+ comp = comp_from_remote_record (conduit, remote, NULL);
+ } else {
+ CalComponent *new_comp;
+
+ LOG (" record found\n");
+
+ new_comp = comp_from_remote_record (conduit, remote, comp);
+ gtk_object_unref (GTK_OBJECT (comp));
+ comp = new_comp;
+ }
+
+ update_comp (conduit, comp, ctxt);
+
+ if (!uid) {
+ guint32 *pid = g_new (guint32, 1);
+
+ *pid = remote->ID;
+ cal_component_get_uid (comp, &uid);
+ g_hash_table_insert (ctxt->map, pid, g_strdup (uid));
+ }
+
+ gtk_object_unref (GTK_OBJECT (comp));
+ free_ToDo(&todo);
+
+ return 0;
+}
+
/* Pilot syncing callbacks */
static gint
pre_sync (GnomePilotConduit *conduit,
GnomePilotDBInfo *dbi,
EToDoConduitContext *ctxt)
{
- GnomePilotConduitStandardAbs *abs_conduit;
- int len, ret;
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *l;
+ int len;
unsigned char *buf;
char *filename;
xmlSAXHandler handler;
- GList *changes, *l;
gint num_records;
- abs_conduit = GNOME_PILOT_CONDUIT_STANDARD_ABS (conduit);
+ abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
LOG ("---------------------------------------------------------\n");
LOG ("pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
@@ -619,34 +684,38 @@ pre_sync (GnomePilotConduit *conduit,
g_free (filename);
/* Find the added, modified and deleted items */
- changes = cal_client_get_changed_uids (ctxt->client, CALOBJ_TYPE_TODO,
- ctxt->since);
- for (l = changes; l != NULL; l = l->next) {
+ ctxt->added = g_hash_table_new (g_str_hash, g_str_equal);
+ ctxt->modified = g_hash_table_new (g_str_hash, g_str_equal);
+ ctxt->deleted = g_hash_table_new (g_str_hash, g_str_equal);
+
+ ctxt->changed = cal_client_get_changed_uids (ctxt->client,
+ CALOBJ_TYPE_TODO,
+ ctxt->since);
+ 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->map, coc->uid))
- ctxt->modified = g_list_prepend (ctxt->modified, coc);
+ g_hash_table_insert (ctxt->modified, coc->uid, coc);
else
- ctxt->added = g_list_prepend (ctxt->added, coc);
+ g_hash_table_insert (ctxt->added, coc->uid, coc);
break;
case CALOBJ_REMOVED:
- ctxt->deleted = g_list_prepend (ctxt->deleted, coc);
+ g_hash_table_insert (ctxt->deleted, coc->uid, coc);
break;
}
}
- g_list_free (changes);
-
+
/* Set the count information */
num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
- gnome_pilot_conduit_standard_abs_set_num_local_records(abs_conduit, num_records);
- num_records = g_list_length (ctxt->added);
- gnome_pilot_conduit_standard_abs_set_num_new_local_records (abs_conduit, num_records);
- num_records = g_list_length (ctxt->modified);
- gnome_pilot_conduit_standard_abs_set_num_updated_local_records (abs_conduit, num_records);
- num_records = g_list_length (ctxt->deleted);
- gnome_pilot_conduit_standard_abs_set_num_deleted_local_records(abs_conduit, num_records);
+ gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
+ num_records = g_hash_table_size (ctxt->added);
+ gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, num_records);
+ num_records = g_hash_table_size (ctxt->modified);
+ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, num_records);
+ num_records = g_hash_table_size (ctxt->deleted);
+ gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, num_records);
gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
@@ -670,165 +739,42 @@ pre_sync (GnomePilotConduit *conduit,
}
static gint
-update_record (GnomePilotConduitStandardAbs *conduit,
- PilotRecord *remote,
- EToDoConduitContext *ctxt)
+post_sync (GnomePilotConduit *conduit,
+ GnomePilotDBInfo *dbi,
+ EToDoConduitContext *ctxt)
{
- CalComponent *comp;
- CalClientGetStatus status;
- struct ToDo todo;
- const char *uid;
-
- LOG ("update_record\n");
-
- g_return_val_if_fail (remote != NULL, -1);
-
- memset (&todo, 0, sizeof (struct ToDo));
- unpack_ToDo (&todo, remote->record, remote->length);
-
- uid = g_hash_table_lookup (ctxt->map, &remote->ID);
-
- if (uid)
- status = cal_client_get_object (ctxt->client, uid, &comp);
- else
- status = CAL_CLIENT_LOAD_ERROR;
+ gchar *filename;
- if (status != CAL_CLIENT_GET_SUCCESS) {
- LOG (" new record being created\n");
- comp = comp_from_remote_record (conduit, remote, NULL);
- } else {
- CalComponent *new_comp;
-
- LOG (" record found\n");
-
- new_comp = comp_from_remote_record (conduit, remote, comp);
- gtk_object_unref (GTK_OBJECT (comp));
- comp = new_comp;
- }
-
- update_comp (conduit, comp, ctxt);
-
- if (!uid) {
- guint32 *pid = g_new (guint32, 1);
+ LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
+ LOG ("---------------------------------------------------------\n");
- *pid = remote->ID;
- cal_component_get_uid (comp, &uid);
- g_hash_table_insert (ctxt->map, pid, g_strdup (uid));
- }
+ filename = map_name (ctxt);
+ map_write (ctxt, filename);
+ g_free (filename);
- gtk_object_unref (GTK_OBJECT (comp));
- free_ToDo(&todo);
-
return 0;
}
static gint
-match_record (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord **local,
- PilotRecord *remote,
+set_pilot_id (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ guint32 ID,
EToDoConduitContext *ctxt)
{
- char *uid;
-
- LOG ("match_record: looking for local copy of %s\n",
- print_remote (remote));
-
- g_return_val_if_fail (local != NULL, -1);
- g_return_val_if_fail (remote != NULL, -1);
-
- uid = g_hash_table_lookup (ctxt->map, &remote->ID);
-
- if (!uid)
- return -1;
-
- LOG (" matched\n");
-
- *local = g_new0 (EToDoLocalRecord, 1);
- local_record_from_uid (*local, uid, ctxt);
-
- if (*local == NULL)
- return -1;
-
- return 0;
-}
-
-static gint
-free_match (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord **local,
- EToDoConduitContext *ctxt)
-{
- LOG ("free_match: %s\n", print_local (*local));
-
- g_return_val_if_fail (local != NULL, -1);
- g_return_val_if_fail (*local != NULL, -1);
-
- gtk_object_unref (GTK_OBJECT ((*local)->comp));
- g_free (*local);
-
- *local = NULL;
- return 0;
-}
-
-static gint
-archive_local (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- EToDoConduitContext *ctxt)
-{
- LOG ("archive_local: doing nothing with %s\n", print_local (local));
-
- g_return_val_if_fail (local != NULL, -1);
-
- return -1;
-}
-
-static gint
-archive_remote (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- PilotRecord *remote,
- EToDoConduitContext *ctxt)
-{
- LOG ("archive_remote: doing nothing with %s\n",
- print_local (local));
-
- g_return_val_if_fail (remote != NULL, -1);
- g_return_val_if_fail (local != NULL, -1);
+ const char *uid;
+ guint32 *pid = g_new (guint32, 1);
- return -1;
-}
-
-static gint
-store_remote (GnomePilotConduitStandardAbs *conduit,
- PilotRecord *remote,
- EToDoConduitContext *ctxt)
-{
- int ret;
-
- g_return_val_if_fail (remote != NULL, -1);
-
- LOG ("store_remote: copying pilot record %s to desktop\n",
- print_remote (remote));
-
- ret = update_record (conduit, remote, ctxt);
-
- return ret;
-}
-
-static gint
-clear_status_archive_local (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- EToDoConduitContext *ctxt)
-{
- LOG ("clear_status_archive_local: doing nothing\n");
-
- g_return_val_if_fail(local!=NULL,-1);
+ cal_component_get_uid (local->comp, &uid);
+ *pid = ID;
+ g_hash_table_insert (ctxt->map, pid, g_strdup (uid));
- return -1;
+ return 0;
}
static gint
-iterate (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord **local,
- EToDoConduitContext *ctxt)
+for_each (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord **local,
+ EToDoConduitContext *ctxt)
{
static GList *uids, *iterator;
static int count;
@@ -836,7 +782,7 @@ iterate (GnomePilotConduitStandardAbs *conduit,
g_return_val_if_fail (local != NULL, -1);
if (*local == NULL) {
- LOG ("beginning iteration");
+ LOG ("beginning for_each");
uids = ctxt->uids;
count = 0;
@@ -851,7 +797,7 @@ iterate (GnomePilotConduitStandardAbs *conduit,
} else {
LOG ("no events");
(*local) = NULL;
- return -1;
+ return 0;
}
} else {
count++;
@@ -861,7 +807,7 @@ iterate (GnomePilotConduitStandardAbs *conduit,
*local = g_new0 (EToDoLocalRecord, 1);
local_record_from_uid (*local, iterator->data, ctxt);
} else {
- LOG ("iteration ending");
+ LOG ("for_each ending");
/* Tell the pilot the iteration is over */
*local = NULL;
@@ -869,36 +815,24 @@ iterate (GnomePilotConduitStandardAbs *conduit,
return 0;
}
}
- return 1;
+
+ return 0;
}
static gint
-iterate_specific (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord **local,
- gint flag,
- gint archived,
- EToDoConduitContext *ctxt)
+for_each_modified (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord **local,
+ EToDoConduitContext *ctxt)
{
static GList *changes, *iterator;
static int count;
g_return_val_if_fail (local != NULL, 0);
- /* FIX ME Hack - gnome-pilot does not recognize iterate_specific err values */
if (*local == NULL) {
- LOG ("beginning iteration for %s\n", status_to_string (flag));
-
- switch (flag) {
- case GnomePilotRecordNew:
- changes = ctxt->added;
- break;
- case GnomePilotRecordModified:
- changes = ctxt->modified;
- break;
- case GnomePilotRecordDeleted:
- changes = ctxt->deleted;
- break;
- }
+ LOG ("beginning for_each_modified: beginning\n");
+
+ changes = ctxt->changed;
count = 0;
@@ -927,7 +861,7 @@ iterate_specific (GnomePilotConduitStandardAbs *conduit,
*local = g_new0 (EToDoLocalRecord, 1);
local_record_from_uid (*local, coc->uid, ctxt);
} else {
- LOG ("iteration ending");
+ LOG ("for_each_modified ending");
/* Tell the pilot the iteration is over */
(*local) = NULL;
@@ -936,212 +870,183 @@ iterate_specific (GnomePilotConduitStandardAbs *conduit,
}
}
- return 1;
+ return 0;
}
static gint
-purge (GnomePilotConduitStandardAbs *conduit,
- EToDoConduitContext *ctxt)
+compare (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ GnomePilotRecord *remote,
+ EToDoConduitContext *ctxt)
{
- GList *l;
- char *filename;
- int ret = 0;
-
- LOG ("purge\n");
+ /* used by the quick compare */
+ GnomePilotRecord *local_pilot;
+ int retval = 0;
- /* FIX ME report an error */
- for (l = ctxt->deleted; l != NULL; l = l->next) {
- CalObjChange *coc = l->data;
-
- cal_client_remove_object (ctxt->client, coc->uid);
- }
+ LOG ("compare: local=%s remote=%s...\n",
+ print_local (local), print_remote (remote));
- filename = map_name (ctxt);
- ret = map_write (ctxt, filename);
- g_free (filename);
+ g_return_val_if_fail (local!=NULL,-1);
+ g_return_val_if_fail (remote!=NULL,-1);
- return ret;
-}
+ local_pilot = local_record_to_pilot_record (local, ctxt);
+ if (!local_pilot)
+ return -1;
+ if (remote->length != local_pilot->length
+ || memcmp (local_pilot->record, remote->record, remote->length))
+ retval = 1;
+
+ if (retval == 0)
+ LOG (" match.\n");
+ else
+ LOG (" did not match");
+
+ g_free (local_pilot);
+
+ return retval;
+}
static gint
-set_status (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- gint status,
+add_record (GnomePilotConduitSyncAbs *conduit,
+ GnomePilotRecord *remote,
EToDoConduitContext *ctxt)
{
- CalObjChange *coc;
+ int ret;
- g_return_val_if_fail (local != NULL, -1);
- g_assert (local->comp != NULL);
+ g_return_val_if_fail (remote != NULL, -1);
- LOG ("set_status: %s status is now '%s' for %s\n",
- print_local (local),
- status_to_string (status),
- cal_component_get_as_string (local->comp));
-
- /* FIX ME New and modified? */
- switch (status) {
- case GnomePilotRecordNew:
- break;
- case GnomePilotRecordModified:
- break;
- case GnomePilotRecordDeleted:
- coc = g_new0 (CalObjChange, 1);
- ctxt->deleted = g_list_prepend (ctxt->deleted, coc);
- break;
- }
+ LOG ("add_record: adding %s to desktop\n", print_remote (remote));
- return 0;
+ ret = update_record (conduit, remote, ctxt);
+
+ return ret;
}
static gint
-set_archived (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- gint archived,
- EToDoConduitContext *ctxt)
+add_archive_record (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ GnomePilotRecord *remote,
+ EToDoConduitContext *ctxt)
{
- LOG ("set_archived: %s archived flag is now '%d'\n",
- print_local (local), archived);
-
- g_return_val_if_fail(local!=NULL,-1);
- g_assert(local->comp!=NULL);
-
- local->local.archived = archived;
- update_comp (conduit, local->comp, ctxt);
+ g_return_val_if_fail (remote != NULL, -1);
+ g_return_val_if_fail (local != NULL, -1);
- /* FIXME: This should move the entry into a speciel
- calendar file, eg. Archive, or (by config option), simply
- delete it */
+ LOG ("add_archive_record: doing nothing with %s\n",
+ print_local (local));
- return 0;
+ return -1;
}
static gint
-set_pilot_id (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- guint32 ID,
- EToDoConduitContext *ctxt)
+delete_record (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ EToDoConduitContext *ctxt)
{
const char *uid;
- guint32 *pid = g_new (guint32, 1);
-
+
+ g_return_val_if_fail (local != NULL, -1);
+ g_assert (local->comp != NULL);
+
cal_component_get_uid (local->comp, &uid);
- *pid = ID;
- g_hash_table_insert (ctxt->map, pid, g_strdup (uid));
+ LOG ("delete_record: deleting %s\n", uid);
+
+ cal_client_remove_object (ctxt->client, uid);
+
return 0;
}
static gint
-transmit (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- PilotRecord **remote,
- EToDoConduitContext *ctxt)
+delete_archive_record (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ EToDoConduitContext *ctxt)
{
- LOG ("transmit: encoding local %s\n", print_local (local));
+ g_return_val_if_fail(local!=NULL,-1);
- *remote = local_record_to_pilot_record (local, ctxt);
+ LOG ("delete_archive_record: doing nothing\n");
- if (!*remote)
- return -1;
-
- return 0;
+ return -1;
}
static gint
-free_transmit (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- PilotRecord **remote,
- EToDoConduitContext *ctxt)
+match (GnomePilotConduitSyncAbs *conduit,
+ GnomePilotRecord *remote,
+ EToDoLocalRecord **local,
+ EToDoConduitContext *ctxt)
{
- LOG ("free_transmit: freeing %s\n", print_local (local));
-
+ char *uid;
+
+ LOG ("match: looking for local copy of %s\n",
+ print_remote (remote));
+
g_return_val_if_fail (local != NULL, -1);
g_return_val_if_fail (remote != NULL, -1);
- g_free (*remote);
- *remote = NULL;
+ *local = NULL;
+ uid = g_hash_table_lookup (ctxt->map, &remote->ID);
+
+ if (!uid)
+ return 0;
- return 0;
+ LOG (" matched\n");
+
+ *local = g_new0 (EToDoLocalRecord, 1);
+ local_record_from_uid (*local, uid, ctxt);
+
+ return 0;
}
-
static gint
-compare (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- PilotRecord *remote,
- EToDoConduitContext *ctxt)
+free_match (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord **local,
+ EToDoConduitContext *ctxt)
{
- /* used by the quick compare */
- PilotRecord *local_pilot;
- int retval = 0;
-
- LOG ("compare: local=%s remote=%s...\n",
- print_local (local), print_remote (remote));
+ LOG ("free_match: freeing\n");
- g_return_val_if_fail (local!=NULL,-1);
- g_return_val_if_fail (remote!=NULL,-1);
-
- local_pilot = local_record_to_pilot_record (local, ctxt);
- if (!local_pilot)
- return -1;
+ g_return_val_if_fail (local != NULL, -1);
+ g_return_val_if_fail (*local != NULL, -1);
- if (remote->length != local_pilot->length
- || memcmp (local_pilot->record, remote->record, remote->length))
- retval = 1;
+ gtk_object_unref (GTK_OBJECT ((*local)->comp));
+ g_free (*local);
- if (retval == 0)
- LOG (" match.\n");
- else
- LOG (" did not match");
-
- g_free (local_pilot);
-
- return retval;
+ *local = NULL;
+ return 0;
}
-
static gint
-compare_backup (GnomePilotConduitStandardAbs *conduit,
- EToDoLocalRecord *local,
- PilotRecord *remote,
- EToDoConduitContext *ctxt)
+prepare (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ GnomePilotRecord **remote,
+ EToDoConduitContext *ctxt)
{
- LOG ("compare_backup: doing nothing\n");
-
- g_return_val_if_fail(local!=NULL,-1);
- g_return_val_if_fail(remote!=NULL,-1);
+ LOG ("prepare: encoding local %s\n", print_local (local));
- /* FIX ME - What the hell? */
+ *remote = local_record_to_pilot_record (local, ctxt);
- return -1;
+ if (!*remote)
+ return -1;
+
+ return 0;
}
-
static gint
-delete_all (GnomePilotConduitStandardAbs *conduit,
- EToDoConduitContext *ctxt)
+free_prepare (GnomePilotConduitSyncAbs *conduit,
+ EToDoLocalRecord *local,
+ GnomePilotRecord **remote,
+ EToDoConduitContext *ctxt)
{
- GList *uids, *it;
- gboolean success;
+ LOG ("free_prepare: freeing\n");
- LOG ("delete_all: deleting all objects from desktop\n");
-
- uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_TODO);
-
- for (it = uids; it != NULL; it = g_list_next (it)) {
- success = cal_client_remove_object (ctxt->client, it->data);
+ g_return_val_if_fail (local != NULL, -1);
+ g_return_val_if_fail (remote != NULL, -1);
- if (!success)
- INFO ("Object did not exist");
- }
- cal_obj_uid_list_free (uids);
+ g_free (*remote);
+ *remote = NULL;
return 0;
}
-
static ORBit_MessageValidationResult
accept_all_cookies (CORBA_unsigned_long request_id,
CORBA_Principal *principal,
@@ -1175,7 +1080,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
ORBit_set_request_validation_handler (accept_all_cookies);
}
- retval = gnome_pilot_conduit_standard_abs_new ("ToDoDB", 0x746F646F);
+ retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
g_assert (retval != NULL);
gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
@@ -1184,24 +1089,26 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
e_todo_context_new (&ctxt, pilot_id);
gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
- gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
- gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, ctxt);
- gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, ctxt);
- gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, ctxt);
- gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, ctxt);
- gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, ctxt);
- gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, ctxt);
- gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, ctxt);
- gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, ctxt);
- gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
- gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, ctxt);
- gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, ctxt);
- gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, ctxt);
- gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, ctxt);
gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
+ gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+
+ gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
+
+ gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
+ gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
+ gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+
+ gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
+/* gtk_signal_connect (retval, "add_archive_record", (GtkSignalFunc) add_archive_record, ctxt); */
+
+ gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
+/* gtk_signal_connect (retval, "delete_archive_record", (GtkSignalFunc) delete_archive_record, ctxt); */
+
+ gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
+ gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+
+ gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
index 20eb9ddd2d..7b5ec6e43e 100644
--- a/calendar/conduits/todo/todo-conduit.h
+++ b/calendar/conduits/todo/todo-conduit.h
@@ -31,7 +31,7 @@
#include <gnome.h>
#include <pi-todo.h>
#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-standard-abs.h>
+#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
#include <cal-client/cal-client.h>
@@ -42,7 +42,7 @@ struct _EToDoLocalRecord {
Must be first in the structure, or instances of this
structure cannot be used by gnome-pilot-conduit-standard-abs.
*/
- LocalRecord local;
+ GnomePilotDesktopRecord local;
/* The corresponding Comp object */
CalComponent *comp;
@@ -65,11 +65,12 @@ struct _EToDoConduitContext {
time_t since;
GList *uids;
-
- GList *added;
- GList *modified;
- GList *deleted;
+ GList *changed;
+ GHashTable *added;
+ GHashTable *modified;
+ GHashTable *deleted;
+
GHashTable *map;
};