Remove gnome-pilot integration.

It just doesn't belong in Evolution anymore.  We don't support syncing
with more modern devices -- see Conduits or SyncEvolution for that -- so
it does not make sense for older model Palm Pilot PDAs to be the lone
exception.

I have repackaged the Evolution-Data-Server conduit modules to be
provided by gnome-pilot itself in bug #619315.  This should provide
eqivalent Palm Pilot syncing functionality; it's just being moved to
gnome-pilot.

This completely severs our dependency on deprecated GNOME 2.x libraries
which were still being dragged in by way of gnome-pilot dependencies.
It was also interfereing with our bundling of libgnomecanvas.

4 files changed, 1 insertions, 2304 deletions

diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index ca0916e74d..45802a5ffc 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,9 +1,5 @@
 
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR = conduit
-endif
-
-SUBDIRS = util printing importers gui tools $(CONDUIT_SUBDIR)
+SUBDIRS = util printing importers gui tools
 
 error_DATA = addressbook.error
 errordir = $(privdatadir)/errors
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index 3ac06da3e9..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# Address Conduit
-privconduit_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_CPPFLAGS =		\
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	-I$(top_srcdir)/widgets/misc		\
-	-I$(top_builddir)/widgets/misc		\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
-
-libeaddress_conduit_la_SOURCES = address-conduit.c
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la                           \
-	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-
-e-address.conduit: e-address.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-address.conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-address.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
--include $(top_srcdir)/git.mk
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 73fb68b0ee..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,2250 +0,0 @@
-/*
- * Evolution addressbook - Address Conduit
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Eskil Heyn Olsen <deity@eskil.dk>
- *      JP Rosevear <jpr@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define G_LOG_DOMAIN "eaddrconduit"
-
-/* Work around deprecated API usage in GnomePilot. */
-#undef GTK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_SINGLE_INCLUDES
-
-#include <glib/gi18n.h>
-#include <libxml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-address.h>
-#include <pi-appinfo.h>
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-url.h>
-#include <libedataserverui/e-passwords.h>
-#include <libebook/e-book.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-dialog-widgets.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.2"
-
-#define DEBUG_CONDUIT 1
-/* #undef DEBUG_CONDUIT */
-
-#ifdef DEBUG_CONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif
-
-#define WARN g_warning
-#define INFO g_message
-#define PILOT_MAX_CATEGORIES 16
-
-enum {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_OTHER,
-	LABEL_EMAIL,
-	LABEL_MAIN,
-	LABEL_PAGER,
-	LABEL_MOBILE
-};
-
-static EContactField priority [] = {
-	E_CONTACT_PHONE_BUSINESS,
-	E_CONTACT_PHONE_HOME,
-	E_CONTACT_PHONE_BUSINESS_FAX,
-	E_CONTACT_EMAIL_1,
-	E_CONTACT_PHONE_PAGER,
-	E_CONTACT_PHONE_MOBILE,
-	E_CONTACT_PHONE_BUSINESS_2,
-	E_CONTACT_PHONE_HOME_2,
-	E_CONTACT_PHONE_HOME_FAX,
-	E_CONTACT_EMAIL_2,
-	E_CONTACT_PHONE_OTHER,
-	E_CONTACT_PHONE_PRIMARY,
-	E_CONTACT_PHONE_OTHER_FAX,
-	E_CONTACT_EMAIL_3,
-	E_CONTACT_FIELD_LAST
-};
-
-static gint priority_label [] = {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_PAGER,
-	LABEL_MOBILE,
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_OTHER,
-	LABEL_MAIN,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	-1
-};
-
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-typedef struct _EAddrConduitGui EAddrConduitGui;
-typedef struct _EAddrConduitContext EAddrConduitContext;
-
-/* Local Record */
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	EContact *contact;
-
-        /* pilot-link address structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-static void
-addrconduit_destroy_record (EAddrLocalRecord *local)
-{
-	g_object_unref (local->contact);
-	free_Address (local->addr);
-	g_free (local->addr);
-	g_free (local);
-}
-
-/* Configuration */
-struct _EAddrConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	ESourceList *source_list;
-	ESource *source;
-	gboolean secret;
-	EContactField default_address;
-
-	gchar *last_uri;
-};
-
-/* NOTE: copied from calendar/conduit/common/libecalendar-common-conduit.c
- * Adds a category to the category app info structure (name and ID),
- * sets category->renamed[i] to true if possible to rename.
- *
- * This will be packed and written to the app info block during post_sync.
- *
- * NOTE: cat_to_add MUST be in PCHAR format. Evolution stores categories
- *       in UTF-8 format. A conversion must take place before calling
- *       this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c)
- */
-static gint
-e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category)
-{
-	gint i, j;
-	gint retval = 0; /* 0 is the Unfiled category */
-	LOG(g_message("e_pilot_add_category_if_possible\n"));
-
-	for (i=0; i<PILOT_MAX_CATEGORIES; i++) {
-		/* if strlen is 0, then the category is empty
-		   the PalmOS doesn't let 0-length strings for
-		   categories */
-		if (strlen(category->name[i]) == 0) {
-			gint cat_to_add_len;
-			gint desktopUniqueID;
-
-			cat_to_add_len = strlen(cat_to_add);
-			retval = i;
-
-			if (cat_to_add_len > 15) {
-				gchar tmpstr[17];
-				strncpy(tmpstr, cat_to_add,16);
-				tmpstr[16] = '\0';
-				/* Have to truncate the category name */
-				LOG (g_warning ("*** Desktop category '%s' too long for PDA."
-						    "Truncating to '%s' ***",cat_to_add, tmpstr));
-				cat_to_add_len = 15;
-			}
-
-			/* only 15 characters for category, 16th is
-			 * '\0' can't do direct mem transfer due to
-			 * declaration type
-			 */
-			for (j=0; j<cat_to_add_len; j++) {
-				category->name[i][j] = cat_to_add[j];
-			}
-
-			for (j=cat_to_add_len; j<16; j++) {
-				category->name[i][j] = '\0';
-			}
-
-			/* find a desktop id that is not in use between 128 and 255 */
-			/* XXX desktopUniqueID should really be used for tracking
-			 * categories across renaming operations, but as Evo
-			 * doesn't have a concept of category UIDs or renaming,
-			 * we don't have much use for it at present.
-			 */
-			for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
-				gint found = 0;
-				for (j=0; j<PILOT_MAX_CATEGORIES; j++) {
-					if (category->ID[j] == desktopUniqueID) {
-						found = 1;
-					}
-				}
-				if (found == 0) {
-					break;
-				}
-				if (desktopUniqueID == 255) {
-					LOG (g_warning ("*** no more categories available on PC ***"));
-				}
-			}
-			category->ID[i] = desktopUniqueID;
-
-			category->renamed[i] = TRUE;
-
-			break;
-		}
-	}
-
-	if (retval == 0) {
-		LOG (g_warning ("*** not adding category - category list already full ***"));
-	}
-
-	return retval;
-}
-
-/*
- * conversion from an evolution category to a palm category.
- * we iterate over the list of desktop categories to see if
- * there is matching palm category.  If not, we create
- * a new palm category from the first evo category.
- * If a category was not found and could not be created,
- * or if there are no desktop categories, then *pilotCategory
- * is set to zero ("Unfiled").
- */
-static
-void e_pilot_local_category_to_remote(gint * pilotCategory,
-    EContact *contact, struct CategoryAppInfo *category,
-	const gchar *pilot_charset)
-{
-	GList *c_list = NULL, *l;
-	gchar * category_string, *first_category = NULL;
-	gint i;
-	*pilotCategory = 0; /* default to "Unfiled" */
-	c_list = e_contact_get (contact, E_CONTACT_CATEGORY_LIST);
-	if (c_list) {
-		/* remember the first category */
-		first_category = e_pilot_utf8_to_pchar((const gchar *)c_list->data, pilot_charset);
-	}
-	l = c_list;
-	while (l && *pilotCategory == 0) {
-		/* list != 0, so at least 1 category is assigned */
-		category_string = e_pilot_utf8_to_pchar((const gchar *)l->data, pilot_charset);
-		for (i=0; i < PILOT_MAX_CATEGORIES; i++) {
-			/* only 15 chars + nul in palm category name */
-			if (strncmp(category_string,category->name[i], 15) == 0) {
-				*pilotCategory = i;
-				break;
-			}
-		}
-		g_free(category_string);
-		l = l->next;
-	}
-	if (*pilotCategory == 0 && first_category && *first_category) {
-		/* category not available on palm, try to create it */
-		/* XXX e_pilot_add_category_if_possible can be called
-		 *  when we're doing a 'copy from pilot'.  This should
-		 *  really be avoided.
-		 */
-		*pilotCategory = e_pilot_add_category_if_possible(
-		    first_category,category);
-		g_free(first_category);
-	}
-	g_list_foreach (c_list, (GFunc)g_free, NULL);
-	g_list_free(c_list);
-	/*end category*/
-}
-
-/*
- * conversion from a palm category to an evolution category
- */
-static
-void e_pilot_remote_category_to_local(gint pilotCategory,
-    EContact *contact, struct CategoryAppInfo *category,
-	const gchar *pilot_charset)
-{
-	gchar *category_string = NULL;
-
-	if (pilotCategory != 0) {
-		/* pda has category assigned */
-		category_string = e_pilot_utf8_from_pchar(
-		    category->name[pilotCategory], pilot_charset);
-
-		LOG(g_message("PDA Category: %s\n", category_string));
-
-		if (e_categories_exist(category_string) == FALSE) {
-			/* add if it doesn't exist */
-			LOG(g_message("Category created on pc\n"));
-			e_categories_add(category_string, NULL, NULL, TRUE);
-		}
-	}
-
-	/* store the data in EContact */
-	if (category_string == NULL) {
-		/* remove categories from desktop. */
-		e_contact_set (contact, E_CONTACT_CATEGORY_LIST, NULL);
-	}
-	else {
-
-		/* Since the first first category is synced with the PDA, add the PDA's
-		 * category to the beginning of the category list */
-		GList *c_list = NULL;
-		GList *newcat_in_list;
-		c_list = e_contact_get (contact, E_CONTACT_CATEGORY_LIST);
-
-		/* remove old item from list so we don't have duplicate entries */
-		newcat_in_list = g_list_find_custom(c_list, category_string, (GCompareFunc)strcmp);
-		if (newcat_in_list != NULL)
-		{
-			g_free(newcat_in_list->data);
-			c_list = g_list_remove(c_list, newcat_in_list->data);
-		}
-
-		c_list = g_list_prepend(c_list, category_string);
-		e_contact_set (contact, E_CONTACT_CATEGORY_LIST, c_list);
-
-		g_list_foreach (c_list, (GFunc)g_free, NULL);
-		g_list_free(c_list);
-	}
-}
-
-static gchar *
-build_setup_path (const gchar *path, const gchar *key)
-{
-	return g_strconcat ("/apps/evolution/conduit", "/", path, "/", key, NULL);
-}
-
-static gboolean
-e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def)
-{
-	gboolean res = def;
-	gchar *full_path;
-	GConfValue *value;
-	GConfClient *gconf;
-
-	g_return_val_if_fail (path != NULL, res);
-	g_return_val_if_fail (key != NULL, res);
-
-	gconf = gconf_client_get_default ();
-	full_path = build_setup_path (path, key);
-
-	value = gconf_client_get (gconf, full_path, NULL);
-	if (value) {
-		if (value->type == GCONF_VALUE_BOOL)
-			res = gconf_value_get_bool (value);
-
-		gconf_value_free (value);
-	}
-
-	g_free (full_path);
-	g_object_unref (gconf);
-
-	return res;
-}
-
-static void
-e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value)
-{
-	GError *error = NULL;
-	gchar *full_path;
-	GConfClient *gconf;
-
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (key != NULL);
-
-	gconf = gconf_client_get_default ();
-	full_path = build_setup_path (path, key);
-
-	gconf_client_set_bool (gconf, full_path, value, &error);
-
-	g_free (full_path);
-	g_object_unref (gconf);
-
-	if (error) {
-		g_message ("%s: Failed to write: %s", G_STRFUNC, error->message);
-		g_error_free (error);
-	}
-}
-
-static gchar *
-e_pilot_setup_get_string (const gchar *path, const gchar *key, const gchar *def)
-{
-	gchar *res = g_strdup (def);
-	gchar *full_path;
-	GConfValue *value;
-	GConfClient *gconf;
-
-	g_return_val_if_fail (path != NULL, res);
-	g_return_val_if_fail (key != NULL, res);
-
-	gconf = gconf_client_get_default ();
-	full_path = build_setup_path (path, key);
-
-	value = gconf_client_get (gconf, full_path, NULL);
-	if (value) {
-		if (value->type == GCONF_VALUE_STRING) {
-			g_free (res);
-			res = g_strdup (gconf_value_get_string (value));
-		}
-
-		gconf_value_free (value);
-	}
-
-	g_free (full_path);
-	g_object_unref (gconf);
-
-	return res;
-}
-
-static void
-e_pilot_setup_set_string (const gchar *path, const gchar *key, const gchar *value)
-{
-	GError *error = NULL;
-	gchar *full_path;
-	GConfClient *gconf;
-
-	g_return_if_fail (path != NULL);
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (value != NULL);
-
-	gconf = gconf_client_get_default ();
-	full_path = build_setup_path (path, key);
-
-	gconf_client_set_string (gconf, full_path, value, &error);
-
-	g_free (full_path);
-	g_object_unref (gconf);
-
-	if (error) {
-		g_message ("%s: Failed to write: %s", G_STRFUNC, error->message);
-		g_error_free (error);
-	}
-}
-
-static EAddrConduitCfg *
-addrconduit_load_configuration (guint32 pilot_id)
-{
-	EAddrConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar *address, prefix[256];
-	g_snprintf (prefix, 255, "e-address-conduit/Pilot_%u", pilot_id);
-
-	c = g_new0 (EAddrConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ((gchar *)"e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	g_object_ref_sink (management);
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	g_object_ref_sink (config);
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	g_object_unref (config);
-	g_object_unref (management);
-
-	/* Custom settings */
-	if (!e_book_get_addressbooks (&c->source_list, NULL))
-		c->source_list = NULL;
-	if (c->source_list) {
-		c->source = e_pilot_get_sync_source (c->source_list);
-		if (!c->source)
-			c->source = e_source_list_peek_source_any (c->source_list);
-		if (c->source) {
-			g_object_ref (c->source);
-		} else {
-			g_object_unref (c->source_list);
-			c->source_list = NULL;
-		}
-	}
-
-	c->secret = e_pilot_setup_get_bool (prefix, "secret", FALSE);
-	address = e_pilot_setup_get_string (prefix, "default_address", "business");
-	if (!address || !strcmp (address, "business"))
-		c->default_address = E_CONTACT_ADDRESS_WORK;
-	else if (!strcmp (address, "home"))
-		c->default_address = E_CONTACT_ADDRESS_HOME;
-	else if (!strcmp (address, "other"))
-		c->default_address = E_CONTACT_ADDRESS_OTHER;
-	g_free (address);
-	c->last_uri = e_pilot_setup_get_string (prefix, "last_uri", NULL);
-
-	return c;
-}
-
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c)
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "e-address-conduit/Pilot_%u", c->pilot_id);
-
-	e_pilot_set_sync_source (c->source_list, c->source);
-	e_pilot_setup_set_bool (prefix, "secret", c->secret);
-	switch (c->default_address) {
-	case E_CONTACT_ADDRESS_WORK:
-		e_pilot_setup_set_string (prefix, "default_address", "business");
-		break;
-	case E_CONTACT_ADDRESS_HOME:
-		e_pilot_setup_set_string (prefix, "default_address", "home");
-		break;
-	case E_CONTACT_ADDRESS_OTHER:
-		e_pilot_setup_set_string (prefix, "default_address", "other");
-		break;
-	default:
-		g_warning ("Unknown default_address value");
-	}
-	e_pilot_setup_set_string (prefix, "last_uri", c->last_uri ? c->last_uri : "");
-}
-
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c)
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->pilot_id = c->pilot_id;
-
-	if (c->source_list)
-		retval->source_list = g_object_ref (c->source_list);
-	if (c->source)
-		retval->source = g_object_ref (c->source);
-	retval->secret = c->secret;
-	retval->default_address = c->default_address;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void
-addrconduit_destroy_configuration (EAddrConduitCfg *c)
-{
-	g_return_if_fail (c != NULL);
-
-	g_object_unref (c->source_list);
-	g_object_unref (c->source);
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Gui */
-struct _EAddrConduitGui {
-	GtkWidget *default_address;
-};
-
-static EAddrConduitGui *
-e_addr_gui_new (EPilotSettings *ps)
-{
-	EAddrConduitGui *gui;
-	GtkWidget *lbl;
-	gint rows, i;
-	static const gchar *items[] = {"Business", "Home", "Other", NULL};
-
-	g_return_val_if_fail (ps != NULL, NULL);
-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1,
-			  E_PILOT_SETTINGS_TABLE_COLS);
-
-	gui = g_new0 (EAddrConduitGui, 1);
-
-	rows = E_PILOT_SETTINGS_TABLE_ROWS;
-	lbl = gtk_label_new (_("Default Sync Address:"));
-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
-	gui->default_address = gtk_combo_box_new_text ();
-	for (i = 0; items[i] != NULL; i++) {
-		gtk_combo_box_append_text (GTK_COMBO_BOX (gui->default_address), items[i]);
-	}
-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);
-        gtk_table_attach_defaults (GTK_TABLE (ps), gui->default_address, 1, 2, rows, rows + 1);
-	gtk_widget_show (lbl);
-	gtk_widget_show (gui->default_address);
-
-	return gui;
-}
-
-static const gint default_address_map[] = {
-	E_CONTACT_ADDRESS_WORK,
-	E_CONTACT_ADDRESS_HOME,
-	E_CONTACT_ADDRESS_OTHER,
-	-1
-};
-
-static void
-e_addr_gui_fill_widgets (EAddrConduitGui *gui, EAddrConduitCfg *cfg)
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	e_dialog_combo_box_set (gui->default_address,
-				cfg->default_address,
-				default_address_map);
-}
-
-static void
-e_addr_gui_fill_config (EAddrConduitGui *gui, EAddrConduitCfg *cfg)
-{
-	g_return_if_fail (gui != NULL);
-	g_return_if_fail (cfg != NULL);
-
-	cfg->default_address = e_dialog_combo_box_get (gui->default_address,
-						       default_address_map);
-}
-
-static void
-e_addr_gui_destroy (EAddrConduitGui *gui)
-{
-	g_free (gui);
-}
-
-/* Context */
-struct _EAddrConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EAddrConduitCfg *cfg;
-	EAddrConduitCfg *new_cfg;
-	EAddrConduitGui *gui;
-	GtkWidget *ps;
-
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-
-	EPilotMap *map;
-
-	gchar * pilot_charset;
-};
-
-static EAddrConduitContext *
-e_addr_context_new (guint32 pilot_id)
-{
-	EAddrConduitContext *ctxt = g_new0 (EAddrConduitContext, 1);
-
-	ctxt->cfg = addrconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-	ctxt->gui = NULL;
-	ctxt->ps = NULL;
-	ctxt->ebook = NULL;
-	ctxt->cards = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-	ctxt->pilot_charset = NULL;
-
-	return ctxt;
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext *ctxt)
-{
-	GList *l;
-
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		addrconduit_destroy_configuration (ctxt->new_cfg);
-	if (ctxt->gui != NULL)
-		e_addr_gui_destroy (ctxt->gui);
-
-	if (ctxt->ebook != NULL)
-		g_object_unref (ctxt->ebook);
-
-	if (ctxt->cards != NULL) {
-		for (l = ctxt->cards; l != NULL; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->cards);
-	}
-
-	if (ctxt->changed_hash != NULL)
-		g_hash_table_destroy (ctxt->changed_hash);
-
-	if (ctxt->changed != NULL)
-		e_book_free_change_list (ctxt->changed);
-
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			addrconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static const gchar *
-print_local (EAddrLocalRecord *local)
-{
-	static gchar buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->addr) {
-		g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-			    local->addr->entry[entryLastname] ?
-			    local->addr->entry[entryLastname] : "",
-			    local->addr->entry[entryFirstname] ?
-			    local->addr->entry[entryFirstname] : "",
-			    local->addr->entry[entryCompany] ?
-			    local->addr->entry[entryCompany] : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static gchar *print_remote (GnomePilotRecord *remote)
-{
-	static gchar buff[ 4096 ];
-	struct Address addr;
-#ifdef PILOT_LINK_0_12
-	pi_buffer_t * buffer;
-#endif
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&addr, 0, sizeof (struct Address));
-#ifdef PILOT_LINK_0_12
-	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if (buffer == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-	unpack_Address (&addr, buffer, address_v1);
-	pi_buffer_free(buffer);
-#else
-	unpack_Address (&addr, remote->record, remote->length);
-#endif
-
-	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
-		    addr.entry[entryLastname] ?
-		    addr.entry[entryLastname] : "",
-		    addr.entry[entryFirstname] ?
-		    addr.entry[entryFirstname] : "",
-		    addr.entry[entryCompany] ?
-		    addr.entry[entryCompany] : "");
-
-	free_Address (&addr);
-
-	return buff;
-}
-
-/* Utility routines */
-static gchar *
-map_name (EAddrConduitContext *ctxt)
-{
-	gchar *filename = NULL;
-
-	filename = g_strdup_printf ("%s/.evolution/addressbook/local/system/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static GList *
-next_changed_item (EAddrConduitContext *ctxt, GList *changes)
-{
-	EBookChange *ebc;
-	GList *l;
-
-	for (l = changes; l != NULL; l = l->next) {
-		ebc = l->data;
-
-		if (g_hash_table_lookup (ctxt->changed_hash, e_contact_get_const (ebc->contact, E_CONTACT_UID)))
-			return l;
-	}
-
-	return NULL;
-}
-
-static EContactField
-get_next_mail (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_EMAIL_1;
-
-	switch (*field) {
-	case E_CONTACT_EMAIL_1:
-		return E_CONTACT_EMAIL_2;
-	case E_CONTACT_EMAIL_2:
-		return E_CONTACT_EMAIL_3;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_home (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_HOME;
-
-	switch (*field) {
-	case E_CONTACT_PHONE_HOME:
-		return E_CONTACT_PHONE_HOME_2;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_work (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_BUSINESS;
-
-	switch (*field) {
-	case E_CONTACT_PHONE_BUSINESS:
-		return E_CONTACT_PHONE_BUSINESS_2;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_fax (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_BUSINESS_FAX;
-
-	switch (*field) {
-	case E_CONTACT_PHONE_BUSINESS_FAX:
-		return E_CONTACT_PHONE_HOME_FAX;
-	case E_CONTACT_PHONE_HOME_FAX:
-		return E_CONTACT_PHONE_OTHER_FAX;
-	default:
-		break;
-	}
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_other (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_OTHER;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_main (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_PRIMARY;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_pager (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_PAGER;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static EContactField
-get_next_mobile (EContactField *field)
-{
-	if (field == NULL)
-		return E_CONTACT_PHONE_MOBILE;
-
-	return E_CONTACT_FIELD_LAST;
-}
-
-static void
-get_next_init (EContactField *next_mail,
-	       EContactField *next_home,
-	       EContactField *next_work,
-	       EContactField *next_fax,
-	       EContactField *next_other,
-	       EContactField *next_main,
-	       EContactField *next_pager,
-	       EContactField *next_mobile)
-{
-	*next_mail = get_next_mail (NULL);
-	*next_home = get_next_home (NULL);
-	*next_work = get_next_work (NULL);
-	*next_fax = get_next_fax (NULL);
-	*next_other = get_next_other (NULL);
-	*next_main = get_next_main (NULL);
-	*next_pager = get_next_pager (NULL);
-	*next_mobile = get_next_mobile (NULL);
-}
-
-static gboolean
-is_next_done (EContactField field)
-{
-	if (field == E_CONTACT_FIELD_LAST)
-		return TRUE;
-
-	return FALSE;
-}
-
-static gboolean
-is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local)
-{
-	EContactField next_mail, next_home, next_work, next_fax;
-	EContactField next_other, next_main, next_pager, next_mobile;
-	gboolean syncable = TRUE;
-	gint i, l = 0;
-
-	/* See if there are fields we can't sync or not in priority order */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-
-	for (i = entryPhone1; i <= entryPhone5 && syncable; i++) {
-		gint phonelabel = local->addr->phoneLabel[i - entryPhone1];
-		const gchar *phone_str = local->addr->entry[i];
-		gboolean empty = !(phone_str && *phone_str);
-
-		if (empty)
-			continue;
-
-		for (; priority_label[l] != -1; l++)
-			if (phonelabel == priority_label[l])
-				break;
-
-		if (priority_label[l] == -1) {
-			syncable = FALSE;
-			continue;
-		}
-
-		if (phonelabel == LABEL_EMAIL) {
-			if (is_next_done (next_mail) || next_mail != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME) {
-			if (is_next_done (next_home) || next_home != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK) {
-			if (is_next_done (next_work) || next_work != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX) {
-			if (is_next_done (next_fax) || next_fax != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER) {
-			if (is_next_done (next_other) || next_other != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN) {
-			if (is_next_done (next_main) || next_main != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER) {
-			if (is_next_done (next_pager) || next_pager != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE) {
-			if (is_next_done (next_mobile) || next_mobile != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-	}
-
-	return syncable;
-}
-
-static void
-set_contact_text (EContact *contact, EContactField field, struct Address address,
-	gint entry, const gchar *pilot_charset)
-{
-	gchar *text = NULL;
-
-	if (address.entry[entry])
-		text = e_pilot_utf8_from_pchar (address.entry[entry], pilot_charset);
-
-	e_contact_set (contact, field, text);
-
-	g_free (text);
-}
-
-static gchar *
-get_entry_text (struct Address address, gint entry, const gchar *pilot_charset)
-{
-	if (address.entry[entry])
-		return e_pilot_utf8_from_pchar (address.entry[entry], pilot_charset);
-
-	return NULL;
-}
-
-static void
-clear_entry_text (struct Address address, gint field)
-{
-	if (address.entry[field]) {
-		free (address.entry[field]);
-		address.entry[field] = NULL;
-	}
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const gchar *uid)
-{
-	EBookChange *ebc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ebc = g_hash_table_lookup (ctxt->changed_hash, uid);
-
-	if (ebc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-
-	switch (ebc->change_type) {
-	case E_BOOK_CHANGE_CARD_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;
-	case E_BOOK_CHANGE_CARD_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case E_BOOK_CHANGE_CARD_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-#ifdef PILOT_LINK_0_12
-	pi_buffer_t * buffer;
-#else
-	static gchar record[0xffff];
-#endif
-
-	g_assert (local->addr != NULL );
-
-	LOG (g_message ( "local_record_to_pilot_record\n" ));
-
-	memset (&p, 0, sizeof (GnomePilotRecord));
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-
-#ifdef PILOT_LINK_0_12
-	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if (buffer == NULL) {
-		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
-		return p;
-	}
-
-	pack_Address (local->addr, buffer, address_v1);
-
-	p.record = g_new0(unsigned char, buffer->used);
-	p.length = buffer->used;
-	memcpy(p.record, buffer->data, buffer->used);
-
-	pi_buffer_free(buffer);
-#else
-	p.record = (guchar *)record;
-	p.length = pack_Address (local->addr, p.record, 0xffff);
-#endif
-	return p;
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrConduitContext *ctxt)
-{
-	EContactAddress *address = NULL;
-	gint phone = entryPhone1;
-	gboolean syncable;
-	gint i;
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (contact != NULL);
-
-	local->contact = g_object_ref (contact);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, e_contact_get_const (contact, E_CONTACT_UID), TRUE);
-
-	compute_status (ctxt, local, e_contact_get_const (contact, E_CONTACT_UID));
-
-	local->addr = g_new0 (struct Address, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them
-	 */
-	if (local->local.ID != 0) {
-		struct Address addr;
-		gint cat = 0;
-#ifdef PILOT_LINK_0_12
-		pi_buffer_t * record;
-		record = pi_buffer_new(DLP_BUF_SIZE);
-		if (record == NULL) {
-			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
-			return;
-		}
-#else
-		gchar record[0xffff];
-#endif
-
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-					ctxt->dbi->db_handle,
-#ifdef PILOT_LINK_0_12
-					local->local.ID, record,
-					NULL, NULL, &cat) > 0) {
-#else
-					local->local.ID, &record,
-					NULL, NULL, NULL, &cat) > 0) {
-#endif
-			local->local.category = cat;
-			memset (&addr, 0, sizeof (struct Address));
-#ifdef PILOT_LINK_0_12
-			unpack_Address (&addr, record, address_v1);
-#else
-			unpack_Address (&addr, (guchar *)record, 0xffff);
-#endif
-			for (i = 0; i < 5; i++) {
-				if (addr.entry[entryPhone1 + i])
-					local->addr->entry[entryPhone1 + i] =
-						strdup (addr.entry[entryPhone1 + i]);
-				local->addr->phoneLabel[i] = addr.phoneLabel[i];
-			}
-			local->addr->showPhone = addr.showPhone;
-			for (i = 0; i < 4; i++) {
-				if (addr.entry[entryCustom1 + i])
-					local->addr->entry[entryCustom1 + i] =
-						strdup (addr.entry[entryCustom1 + i]);
-			}
-			free_Address (&addr);
-		}
-#ifdef PILOT_LINK_0_12
-		pi_buffer_free (record);
-#endif
-	}
-
-	/*Category support*/
-	e_pilot_local_category_to_remote(&(local->local.category), contact, &(ctxt->ai.category), ctxt->pilot_charset);
-
-	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME), ctxt->pilot_charset);
-	local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME), ctxt->pilot_charset);
-	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG), ctxt->pilot_charset);
-	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE), ctxt->pilot_charset);
-
-	/* See if the default has something in it */
-	address = e_contact_get (contact, ctxt->cfg->default_address);
-	if (address == NULL) {
-		EContactField field;
-
-		/* Try to find a non-empty address field */
-		for (field = E_CONTACT_FIRST_ADDRESS_ID; field <= E_CONTACT_LAST_ADDRESS_ID; field++) {
-			if ((address = e_contact_get (contact, field)))
-				break;
-		}
-	}
-
-	if (address) {
-		gchar *add;
-
-		/* If the address has 2 lines, make sure both get added */
-		if (address->ext != NULL &&
-		    strlen (address->ext) > 0) {
-			add = g_strconcat (address->street, "\n", address->ext, NULL);
-			LOG (g_warning ("Address has two lines: [%s]\n", add));
-		}
-		else {
-			add = g_strdup (address->street);
-			LOG (g_warning ("Address has only one line: [%s]\n", add));
-		}
-		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add, ctxt->pilot_charset);
-		g_free (add);
-
-		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality, ctxt->pilot_charset);
-		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region, ctxt->pilot_charset);
-		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code, ctxt->pilot_charset);
-		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country, ctxt->pilot_charset);
-
-		e_contact_address_free (address);
-	}
-
-	/* Phone numbers */
-
-	/* See if everything is syncable */
-	syncable = is_syncable (ctxt, local);
-
-	if (syncable) {
-		INFO ("Syncable");
-
-		/* Sync by priority */
-		for (i = 0, phone = entryPhone1;
-		     priority[i] != E_CONTACT_FIELD_LAST && phone <= entryPhone5; i++) {
-			const gchar *phone_str;
-
-			phone_str = e_contact_get_const (contact, priority[i]);
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, phone);
-				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str, ctxt->pilot_charset);
-				local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
-				phone++;
-			}
-		}
-		for (; phone <= entryPhone5; phone++)
-			local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
-		local->addr->showPhone = 0;
-	} else {
-		EContactField next_mail, next_home, next_work, next_fax;
-		EContactField next_other, next_main, next_pager, next_mobile;
-
-		INFO ("Not Syncable");
-		get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-			       &next_other, &next_main, &next_pager, &next_mobile);
-
-		/* Not completely syncable, so do the best we can */
-		for (i = entryPhone1; i <= entryPhone5; i++) {
-			gint phonelabel = local->addr->phoneLabel[i - entryPhone1];
-			const gchar *phone_str = NULL;
-
-			if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-				phone_str = e_contact_get_const (contact, next_mail);
-				next_mail = get_next_mail (&next_mail);
-			} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-				phone_str = e_contact_get_const (contact, next_home);
-				next_home = get_next_home (&next_home);
-			} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-				phone_str = e_contact_get_const (contact, next_work);
-				next_work = get_next_work (&next_work);
-			} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-				phone_str = e_contact_get_const (contact, next_fax);
-				next_fax = get_next_fax (&next_fax);
-			} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-				phone_str = e_contact_get_const (contact, next_other);
-				next_other = get_next_other (&next_other);
-			} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-				phone_str = e_contact_get_const (contact, next_main);
-				next_main = get_next_main (&next_main);
-			} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-				phone_str = e_contact_get_const (contact, next_pager);
-				next_pager = get_next_pager (&next_pager);
-			} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-				phone_str = e_contact_get_const (contact, next_mobile);
-				next_mobile = get_next_mobile (&next_mobile);
-			}
-
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, i);
-				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str, ctxt->pilot_charset);
-			}
-		}
-	}
-
-	/* Note */
-	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE), ctxt->pilot_charset);
-}
-
-static void
-local_record_from_uid (EAddrLocalRecord *local,
-		       const gchar *uid,
-		       EAddrConduitContext *ctxt)
-{
-	EContact *contact = NULL;
-	const gchar *cuid;
-	GList *l;
-
-	g_assert (local != NULL);
-
-	for (l = ctxt->cards; l != NULL; l = l->next) {
-		contact = l->data;
-
-		/* FIXME Do we need to check for the empty string? */
-		if ((cuid = e_contact_get_const (contact, E_CONTACT_UID)) && !strcmp (cuid, uid))
-			break;
-
-		contact = NULL;
-	}
-
-	if (contact != NULL) {
-		local_record_from_ecard (local, contact, ctxt);
-	} else {
-		contact = e_contact_new ();
-		e_contact_set (contact, E_CONTACT_UID, (gpointer) uid);
-		local_record_from_ecard (local, contact, ctxt);
-		g_object_unref (contact);
-	}
-}
-
-static EContact *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 EContact *in_contact)
-{
-	struct Address address;
-	EContact *contact;
-	EContactName *name;
-	EContactAddress *eaddress;
-	EContactField mailing_address;
-	gchar *txt, *find, *full_name;
-	EContactField next_mail, next_home, next_work, next_fax;
-	EContactField next_other, next_main, next_pager, next_mobile;
-	gint i;
-#ifdef PILOT_LINK_0_12
-	pi_buffer_t * buffer;
-#endif
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-#ifdef PILOT_LINK_0_12
-	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if (buffer == NULL) {
-		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
-		return NULL;
-	}
-
-	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
-		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
-		return NULL;
-	}
-	unpack_Address (&address, buffer, address_v1);
-	pi_buffer_free(buffer);
-#else
-	unpack_Address (&address, remote->record, remote->length);
-#endif
-	if (in_contact == NULL)
-		contact = e_contact_new ();
-	else
-		contact = e_contact_duplicate (in_contact);
-
-	/*Category support*/
-	e_pilot_remote_category_to_local(remote->category, contact, &(ctxt->ai.category), ctxt->pilot_charset);
-
-	/* Name */
-	name = e_contact_name_new ();
-	name->given = get_entry_text (address, entryFirstname, ctxt->pilot_charset);
-	name->family = get_entry_text (address, entryLastname, ctxt->pilot_charset);
-
-	/* set the name, respecting the pilot's given/family names */
-	e_contact_set (contact, E_CONTACT_NAME, name);
-	/* now set the full_name */
-	full_name = e_contact_name_to_string (name);
-	e_contact_set (contact, E_CONTACT_FULL_NAME, full_name);
-	e_contact_name_free (name);
-
-	/* File As */
-	if (!full_name || !*full_name)
-		set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany, ctxt->pilot_charset);
-
-	g_free (full_name);
-
-	/* Title and Company */
-	set_contact_text (contact, E_CONTACT_TITLE, address, entryTitle, ctxt->pilot_charset);
-	set_contact_text (contact, E_CONTACT_ORG, address, entryCompany, ctxt->pilot_charset);
-
-	/* Address */
-	mailing_address = -1;
-	if ((eaddress = e_contact_get (contact, ctxt->cfg->default_address))) {
-		mailing_address = ctxt->cfg->default_address;
-		e_contact_address_free (eaddress);
-	} else {
-		for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
-			if ((eaddress = e_contact_get (contact, i))) {
-				e_contact_address_free (eaddress);
-				mailing_address = i;
-				break;
-			}
-		}
-	}
-
-	if (mailing_address == -1)
-		mailing_address = ctxt->cfg->default_address;
-
-	eaddress = g_new0 (EContactAddress, 1);
-
-	txt = get_entry_text (address, entryAddress, ctxt->pilot_charset);
-	if (txt && (find = strchr (txt, '\n')) != NULL) {
-		*find = '\0';
-		find++;
-	} else {
-		find = NULL;
-	}
-
-	eaddress->street = txt;
-	eaddress->ext = find != NULL ? g_strdup (find) : g_strdup ("");
-	eaddress->locality = get_entry_text (address, entryCity, ctxt->pilot_charset);
-	eaddress->region = get_entry_text (address, entryState, ctxt->pilot_charset);
-	eaddress->country = get_entry_text (address, entryCountry, ctxt->pilot_charset);
-	eaddress->code = get_entry_text (address, entryZip, ctxt->pilot_charset);
-
-	e_contact_set (contact, mailing_address, eaddress);
-	e_contact_address_free (eaddress);
-
-	/* Phone numbers */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		gint phonelabel = address.phoneLabel[i - entryPhone1];
-		gchar *phonenum = get_entry_text (address, i, ctxt->pilot_charset);
-
-		if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-			e_contact_set (contact, next_mail, phonenum);
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-			e_contact_set (contact, next_home, phonenum);
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-			e_contact_set (contact, next_work, phonenum);
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-			e_contact_set (contact, next_fax, phonenum);
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-			e_contact_set (contact, next_other, phonenum);
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-			e_contact_set (contact, next_main, phonenum);
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-			e_contact_set (contact, next_pager, phonenum);
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-			e_contact_set (contact, next_mobile, phonenum);
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-
-		g_free (phonenum);
-	}
-
-	/* Note */
-	set_contact_text (contact, E_CONTACT_NOTE, address, entryNote, ctxt->pilot_charset);
-
-	free_Address(&address);
-
-	return contact;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	gint map_count;
-	const gchar *uri;
-
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_book_get_uri (ctxt->ebook);
-	LOG (g_message ("  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>"));
-	if (ctxt->cfg->last_uri != NULL && strcmp (ctxt->cfg->last_uri, uri)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}
-}
-
-static void
-addressbook_authenticate (EBook *book,
-			  gpointer data)
-{
-	gchar *auth;
-	const gchar *user;
-	gchar *passwd;
-	gchar *str_uri;
-	gchar *pass_key;
-	gchar *auth_domain;
-	const gchar *component_name;
-	EUri *e_uri;
-
-	ESource *source = (ESource *)data;
-
-	auth = (gchar *)e_source_get_property (source, "auth");
-	auth_domain = (gchar *)e_source_get_property (source, "auth-domain");
-	component_name = auth_domain ? auth_domain : "Addressbook";
-
-	if (auth && !strcmp ("plain/password", auth))
-		user = e_source_get_property (source, "user");
-	else
-		user = e_source_get_property (source, "email_addr");
-	if (!user)
-		user = "";
-
-	str_uri = e_source_get_uri (source);
-	e_uri = e_uri_new (str_uri);
-	pass_key = e_uri_to_string (e_uri, FALSE);
-	e_uri_free (e_uri);
-
-	passwd = e_passwords_get_password (component_name, pass_key);
-	if (!passwd)
-		passwd = g_strdup ("");
-
-	if (book)
-		if (!e_book_authenticate_user (book, user, passwd, auth, NULL))
-			LOG (g_warning ("Authentication failed"));
-	g_free (pass_key);
-	g_free (str_uri);
-	g_free (passwd);
-
-	return;
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	EBookQuery *query;
-	GList *l;
-	gint len;
-	gchar *filename;
-	gchar *change_id;
-	gchar *auth;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-#ifdef PILOT_LINK_0_12
-	pi_buffer_t *buffer;
-#else
-	guchar *buf;
-#endif
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION ));
-	/* g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION); */
-
-	ctxt->dbi = dbi;
-
-#ifdef PILOT_LINK_0_12
-	if (NULL == dbi->pilotInfo->pilot_charset)
-		ctxt->pilot_charset = NULL;
-	else
-		ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
-#endif
-
-	if (ctxt->cfg->source) {
-		ctxt->ebook = e_book_new (ctxt->cfg->source, NULL);
-	} else {
-		ctxt->ebook = e_book_new_default_addressbook (NULL);
-	}
-	auth = (gchar *)e_source_get_property (ctxt->cfg->source, "auth");
-	if (auth) {
-		LOG (g_message ("contacts needs authentication\n"));
-		g_signal_connect (ctxt->ebook, "auth_required",
-				  G_CALLBACK (addressbook_authenticate), ctxt->cfg->source);
-	}
-	if (!ctxt->ebook || !e_book_open (ctxt->ebook, TRUE, NULL)) {
-		WARN(_("Could not load address book"));
-		gnome_pilot_conduit_error (conduit, _("Could not load address book"));
-
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mappings */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get a list of all contacts */
-	if (!(query = e_book_query_any_field_contains (""))) {
-		LOG (g_warning ("Failed to get EBookQuery"));
-		return -1;
-	}
-
-	if (!e_book_get_contacts (ctxt->ebook, query, &ctxt->cards, NULL)) {
-		LOG (g_warning ("Failed to get Contacts"));
-		e_book_query_unref (query);
-		return -1;
-	}
-
-	e_book_query_unref (query);
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	if (!e_book_get_changes (ctxt->ebook, change_id, &ctxt->changed, NULL))
-		return -1;
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		EBookChange *ebc = l->data;
-		const gchar *uid;
-
-		uid = e_contact_get_const (ebc->contact, E_CONTACT_UID);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ebc);
-
-			switch (ebc->change_type) {
-			case E_BOOK_CHANGE_CARD_ADDED:
-				add_records++;
-				break;
-			case E_BOOK_CHANGE_CARD_MODIFIED:
-				mod_records++;
-				break;
-			case E_BOOK_CHANGE_CARD_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-
-	/* Set the count information */
-	num_records = g_list_length (ctxt->cards);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-#ifdef PILOT_LINK_0_12
-	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if (buffer == NULL) {
-		return pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
-	}
-
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      DLP_BUF_SIZE, buffer);
-#else
-	buf = (guchar *)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (guchar *)buf, 0xffff);
-#endif
-	if (len < 0) {
-		WARN (_("Could not read pilot's Address application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Address application block"));
-		return -1;
-	}
-#ifdef PILOT_LINK_0_12
-	unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
-	pi_buffer_free (buffer);
-#else
-	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-#endif
-	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	guchar *buf;
-	gint dlpRetVal, len;
-
-	LOG (g_message ( "post_sync: Address Conduit v.%s", CONDUIT_VERSION ));
-
-	/* Write AppBlock to PDA - updates categories */
-	buf = (guchar *)g_malloc (0xffff);
-
-	len = pack_AddressAppInfo (&(ctxt->ai), buf, 0xffff);
-
-	dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle,
-			      (guchar *)buf, len);
-
-	g_free (buf);
-
-	if (dlpRetVal < 0) {
-		WARN ( ("Could not write pilot's Address application block"));
-		WARN ("dlp_WriteAppBlock(...) = %d", dlpRetVal);
-		/*gnome_pilot_conduit_error (conduit,
-					   _("Could not write pilot's Address application block"));*/
-		return -1;
-	}
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_book_get_uri (ctxt->ebook));
-	addrconduit_save_configuration (ctxt->cfg);
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	if (e_book_get_changes (ctxt->ebook, change_id, &changed, NULL))
-		e_book_free_change_list (changed);
-	g_free (change_id);
-	if (ctxt->pilot_charset)
-		g_free (ctxt->pilot_charset);
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      guint32 ID,
-	      EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-
-	e_pilot_map_insert (ctxt->map, ID, e_contact_get_const (local->contact, E_CONTACT_UID), FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EAddrLocalRecord *local,
-		    EAddrConduitContext *ctxt)
-{
-	const gchar *uid;
-
-	LOG (g_message ( "set_status_cleared: clearing status\n" ));
-
-	if ((uid = e_contact_get_const (local->contact, E_CONTACT_UID)))
-		g_hash_table_remove (ctxt->changed_hash, uid);
-
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EAddrLocalRecord **local,
-	  EAddrConduitContext *ctxt)
-{
-	static GList *cards, *iterator;
-	static gint count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		cards = ctxt->cards;
-		count = 0;
-
-		if (cards != NULL) {
-			LOG (g_message ( "iterating over %d records", g_list_length (cards) ));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, cards->data, ctxt);
-			ctxt->locals = g_list_prepend (ctxt->locals, *local);
-
-			iterator = cards;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, iterator->data, ctxt);
-			ctxt->locals = g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each ending" ));
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EAddrLocalRecord **local,
-		   EAddrConduitContext *ctxt)
-{
-	static GList *iterator;
-	static gint count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG (g_message ( "for_each_modified beginning\n" ));
-
-		iterator = ctxt->changed;
-
-		count = 0;
-
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			EBookChange *ebc = iterator->data;
-
-			LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash)));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, ebc->contact, ctxt);
-			ctxt->locals = g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			EBookChange *ebc = iterator->data;
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, ebc->contact, ctxt);
-			ctxt->locals = g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each_modified ending" ));
-
-			/* Signal the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord local_pilot;
-	gint retval = 0;
-
-	LOG (g_message ("compare: local=%s remote=%s...\n",
-			print_local (local), print_remote (remote)));
-
-	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 (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	EContact *contact;
-	gint retval = 0;
-
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	contact = ecard_from_remote_record (ctxt, remote, NULL);
-
-	/* add the ecard to the server */
-	if (!e_book_add_contact (ctxt->ebook, contact, NULL)) {
-		WARN ("add_record: failed to add card to ebook\n");
-		g_object_unref (contact);
-
-		return -1;
-	}
-
-	e_pilot_map_insert (ctxt->map, remote->ID, e_contact_get (contact, E_CONTACT_UID), FALSE);
-
-	g_object_unref (contact);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	EContact *new_contact;
-	EBookChange *ebc;
-	gchar *old_id;
-	gint retval = 0;
-
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote)));
-
-	old_id = e_contact_get (local->contact, E_CONTACT_UID);
-	ebc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-
-	new_contact = ecard_from_remote_record (ctxt, remote, local->contact);
-	g_object_unref (local->contact);
-	local->contact = new_contact;
-
-	if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-		if (!e_book_add_contact (ctxt->ebook, local->contact, NULL)) {
-			WARN (G_STRLOC ": failed to add card\n");
-
-			return -1;
-		}
-
-	} else {
-		if (!e_book_commit_contact (ctxt->ebook, local->contact, NULL)) {
-			WARN (G_STRLOC ": failed to commit card\n");
-
-			return -1;
-		}
-	}
-
-	/* Adding a record causes wombat to assign a new uid so we must tidy */
-	if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) {
-		const gchar *uid = e_contact_get_const (local->contact, E_CONTACT_UID);
-		gboolean arch;
-
-		arch = e_pilot_map_uid_is_archived (ctxt->map, uid);
-		e_pilot_map_insert (ctxt->map, remote->ID, uid, arch);
-
-		ebc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-		if (ebc) {
-			g_hash_table_remove (ctxt->changed_hash, old_id);
-			g_object_unref (ebc->contact);
-			g_object_ref (local->contact);
-			ebc->contact = local->contact;
-			/* FIXME We should possibly be duplicating the uid */
-			g_hash_table_insert (ctxt->changed_hash, (gpointer) uid, ebc);
-		}
-	}
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-	GError *error = NULL;
-	gint retval = 0;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->contact != NULL, -1);
-
-	LOG (g_message ( "delete_record: delete %s\n", print_local (local) ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, e_contact_get_const (local->contact, E_CONTACT_UID));
-	if (!e_book_remove_contact (ctxt->ebook, e_contact_get_const (local->contact, E_CONTACT_UID), &error) && error->code != E_BOOK_ERROR_CONTACT_NOT_FOUND) {
-		WARN ("delete_record: failed to delete card in ebook\n");
-		g_error_free (error);
-
-		retval = -1;
-	}
-
-	return retval;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		gboolean archive,
-		EAddrConduitContext *ctxt)
-{
-	gint retval = 0;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_pilot_map_insert (ctxt->map, local->local.ID, e_contact_get_const (local->contact, E_CONTACT_UID), archive);
-
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *ctxt)
-{
-	const gchar *uid;
-
-	LOG (g_message ("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);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  matched\n" ));
-
-	*local = g_new0 (EAddrLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EAddrLocalRecord *local,
-	    EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	ctxt->locals = g_list_remove (ctxt->locals, local);
-
-	addrconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EAddrConduitContext *ctxt)
-{
-	if (ctxt->cfg->source)
-		e_pilot_settings_set_source (E_PILOT_SETTINGS (ctxt->ps),
-					     ctxt->cfg->source);
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-
-	e_addr_gui_fill_widgets (ctxt->gui, ctxt->cfg);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-
-	if (!ctxt->cfg->source_list)
-		return -1;
-
-	ctxt->ps = e_pilot_settings_new (ctxt->cfg->source_list);
-	ctxt->gui = e_addr_gui_new (E_PILOT_SETTINGS (ctxt->ps));
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-
-	return 0;
-}
-static void
-display_settings (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-        LOG (g_message ( "save_settings" ));
-
-       if (ctxt->new_cfg->source)
-               g_object_unref (ctxt->new_cfg->source);
-	ctxt->new_cfg->source = e_pilot_settings_get_source (E_PILOT_SETTINGS (ctxt->ps));
-	g_object_ref (ctxt->new_cfg->source);
-	ctxt->new_cfg->secret =
-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	e_addr_gui_fill_config (ctxt->gui, ctxt->new_cfg);
-
-	addrconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	addrconduit_save_configuration (ctxt->cfg);
-	addrconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = addrconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ((gchar *)"AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	ctxt = e_addr_context_new (pilot_id);
-	g_object_set_data (G_OBJECT (retval), "addrconduit_context", ctxt);
-
-	g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
-	g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
-
-	g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
-	g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
-
-	g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
-	g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
-	g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
-
-	g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
-	g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
-	g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
-	g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
-
-	g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
-	g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
-
-	g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
-
-	/* Gui Settings */
-	g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
-	g_signal_connect (retval, "display_settings", G_CALLBACK (display_settings), ctxt);
-	g_signal_connect (retval, "save_settings", G_CALLBACK (save_settings), ctxt);
-	g_signal_connect (retval, "revert_settings", G_CALLBACK (revert_settings), ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{
-	EAddrConduitContext *ctxt;
-
-	ctxt = g_object_get_data (G_OBJECT (conduit),
-				  "addrconduit_context");
-
-	e_addr_context_destroy (ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index 669a506001..0000000000
--- a/addressbook/conduit/e-address.conduit.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-	<conduit id="e_address_conduit" type="shlib" location="@privconduitdir@/libeaddress_conduit.so"/>
-	<name value="EAddress"/>
-	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
-</gnome-pilot-conduit>