Drop support for migrating from Evolution < 2.0.

There's too much ancient, crufty code there that we can't realistically
support anymore.  A workaround for those poor users still on 1.x is to
upgrade to some 2.x release first, then upgrade again to 3.x.  An error
dialog explaining this will be shown at startup.

3 files changed, 3 insertions, 2058 deletions

diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index 55246ce047..5cc22a50d6 100644
--- a/modules/addressbook/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
@@ -45,7 +45,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-xml-utils.h"
-#include "e-util/e-folder-map.h"
 
 #include "e-book-shell-migrate.h"
 
@@ -67,378 +66,6 @@ typedef struct {
 	GtkWidget *progress;
 } MigrationContext;
 
-static void
-setup_progress_dialog (MigrationContext *context)
-{
-	GtkWidget *vbox, *hbox;
-
-	context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title (GTK_WINDOW (context->window), _("Migrating..."));
-	gtk_window_set_modal (GTK_WINDOW (context->window), TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (context->window), 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add (GTK_CONTAINER (context->window), vbox);
-
-	context->label = gtk_label_new ("");
-	gtk_label_set_line_wrap (GTK_LABEL (context->label), TRUE);
-	gtk_widget_show (context->label);
-	gtk_box_pack_start (GTK_BOX (vbox), context->label, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
-	context->folder_label = gtk_label_new ("");
-	gtk_widget_show (context->folder_label);
-	gtk_box_pack_start (GTK_BOX (hbox), context->folder_label, TRUE, TRUE, 0);
-
-	context->progress = gtk_progress_bar_new ();
-	gtk_widget_show (context->progress);
-	gtk_box_pack_start (GTK_BOX (hbox), context->progress, TRUE, TRUE, 0);
-
-	gtk_widget_show (context->window);
-}
-
-static void
-dialog_close (MigrationContext *context)
-{
-	gtk_widget_destroy (context->window);
-}
-
-static void
-dialog_set_label (MigrationContext *context, const gchar *str)
-{
-	gtk_label_set_text (GTK_LABEL (context->label), str);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static void
-dialog_set_folder_name (MigrationContext *context, const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (GTK_LABEL (context->folder_label), text);
-	g_free (text);
-
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), 0.0);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static void
-dialog_set_progress (MigrationContext *context, double percent)
-{
-	gchar text[5];
-
-	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
-
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), percent);
-	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (context->progress), text);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-#ifdef SLOW_MIGRATION
-	sleep (1);
-#endif
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, gchar *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gchar *
-get_source_name (ESourceGroup *group, const gchar *path)
-{
-#ifndef G_OS_WIN32
-	gchar **p = g_strsplit (path, "/", 0);
-#else
-	gchar **p = g_strsplit_set (path, "\\/", 0);
-#endif
-	gint i, j, starting_index;
-	gint num_elements;
-	gboolean conflict;
-	GString *s = g_string_new ("");
-
-	for (i = 0; p[i]; i ++);
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		g_string_assign (s, "");
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-
-	g_strfreev (p);
-
-	return g_string_free (s, FALSE);
-}
-
-static void
-migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book)
-{
-	EBookQuery *query = e_book_query_any_field_contains ("");
-	GList *l, *contacts;
-	gint num_added = 0;
-	gint num_contacts;
-
-	/* both books are loaded, start the actual migration */
-	e_book_get_contacts (old_book, query, &contacts, NULL);
-	e_book_query_unref (query);
-
-	num_contacts = g_list_length (contacts);
-	for (l = contacts; l; l = l->next) {
-		EContact *contact = l->data;
-		GError *e = NULL;
-		GList *attrs, *attr;
-
-		/* do some last minute massaging of the contact's attributes */
-
-		attrs = e_vcard_get_attributes (E_VCARD (contact));
-		for (attr = attrs; attr;) {
-			EVCardAttribute *a = attr->data;
-
-			/* evo 1.4 used the non-standard X-EVOLUTION-OFFICE attribute,
-			   evo 1.5 uses the third element in the ORG list attribute. */
-			if (!strcmp ("X-EVOLUTION-OFFICE", e_vcard_attribute_get_name (a))) {
-				GList *v = e_vcard_attribute_get_values (a);
-				GList *next_attr;
-
-				if (v && v->data)
-					e_contact_set (contact, E_CONTACT_OFFICE, v->data);
-
-				next_attr = attr->next;
-				e_vcard_remove_attribute (E_VCARD (contact), a);
-				attr = next_attr;
-			}
-			/* evo 1.4 didn't put TYPE=VOICE in for phone numbers.
-			   evo 1.5 does.
-
-			   so we search through the attribute params for
-			   either TYPE=VOICE or TYPE=FAX.  If we find
-			   either we do nothing.  If we find neither, we
-			   add TYPE=VOICE.
-			*/
-			else if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					EVCardAttributeParam *p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						while (v && v->data) {
-							if (!strcmp ("VOICE", v->data)
-							    || !strcmp ("FAX", v->data)) {
-								found = TRUE;
-								break;
-							}
-							v = v->next;
-						}
-					}
-				}
-
-				if (!found)
-					e_vcard_attribute_add_param_with_value (a,
-										e_vcard_attribute_param_new (EVC_TYPE),
-										"VOICE");
-				attr = attr->next;
-			}
-			/* Replace "POSTAL" (1.4) addresses with "OTHER" (1.5) */
-			else if (!strcmp ("ADR", e_vcard_attribute_get_name (a))) {
-				GList *params, *param;
-				gboolean found = FALSE;
-				EVCardAttributeParam *p;
-
-				params = e_vcard_attribute_get_params (a);
-				for (param = params; param; param = param->next) {
-					p = param->data;
-					if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-						GList *v = e_vcard_attribute_param_get_values (p);
-						while (v && v->data ) {
-							if (!strcmp ("POSTAL", v->data)) {
-								found = TRUE;
-								break;
-							}
-							v = v->next;
-						}
-						if (found)
-							break;
-					}
-				}
-
-				if (found) {
-					e_vcard_attribute_param_remove_values (p);
-					e_vcard_attribute_param_add_value (p, "OTHER");
-				}
-
-				attr = attr->next;
-			}
-			/* this is kinda gross.  The new vcard parser
-			   needs ';'s to be escaped by \'s.  but the
-			   1.4 vcard generator would put unescaped xml
-			   (including entities like &gt;) in the value
-			   of attributes, so we need to go through and
-			   escape those ';'s. */
-			else if (!strcmp ("EMAIL", e_vcard_attribute_get_name (a))) {
-				GList *params;
-				GList *v = e_vcard_attribute_get_values (a);
-
-				/* Add TYPE=OTHER if there is no type set */
-				params = e_vcard_attribute_get_params (a);
-				if (!params)
-					e_vcard_attribute_add_param_with_value (a,
-							e_vcard_attribute_param_new (EVC_TYPE),
-							"OTHER");
-
-				if (v && v->data) {
-					if (!strncmp ((gchar *)v->data, "<?xml", 5)) {
-						/* k, this is the nasty part.  we glomb all the
-						   value strings back together again (if there is
-						   more than one), then work our magic */
-						GString *str = g_string_new ("");
-						while (v) {
-							g_string_append (str, v->data);
-							if (v->next)
-								g_string_append_c (str, ';');
-							v = v->next;
-						}
-
-						e_vcard_attribute_remove_values (a);
-						e_vcard_attribute_add_value (a, str->str);
-						g_string_free (str, TRUE);
-					}
-				}
-
-				attr = attr->next;
-			}
-			else {
-				attr = attr->next;
-			}
-		}
-
-		if (!e_book_add_contact (new_book,
-					 contact,
-					 &e))
-			g_warning ("contact add failed: '%s'", e->message);
-
-		num_added ++;
-
-		dialog_set_progress (context, (double)num_added / num_contacts);
-	}
-
-	g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-	g_list_free (contacts);
-}
-
-static void
-migrate_contact_folder_to_source (MigrationContext *context, gchar *old_path, ESource *new_source)
-{
-	gchar *old_uri = g_filename_to_uri (old_path, NULL, NULL);
-	GError *e = NULL;
-
-	EBook *old_book = NULL, *new_book = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (context, e_source_peek_name (new_source));
-
-	old_book = e_book_new (old_source, &e);
-	if (!old_book
-	    || !e_book_open (old_book, TRUE, &e)) {
-		g_warning ("failed to load source book for migration: '%s'", e->message);
-		goto finish;
-	}
-
-	new_book = e_book_new (new_source, &e);
-	if (!new_book
-	    || !e_book_open (new_book, FALSE, &e)) {
-		g_warning ("failed to load destination book for migration: '%s'", e->message);
-		goto finish;
-	}
-
-	migrate_contacts (context, old_book, new_book);
-
- finish:
-	g_object_unref (old_source);
-	g_object_unref (group);
-	if (old_book)
-		g_object_unref (old_book);
-	if (new_book)
-		g_object_unref (new_book);
-	g_free (old_uri);
-}
-
-static void
-migrate_contact_folder (MigrationContext *context, gchar *old_path, ESourceGroup *dest_group, gchar *source_name)
-{
-	ESource *new_source;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	g_hash_table_insert (context->folder_uid_map, g_strdup (old_path), g_strdup (e_source_peek_uid (new_source)));
-
-	migrate_contact_folder_to_source (context, old_path, new_source);
-
-	g_object_unref (new_source);
-}
-
 #define LDAP_BASE_URI "ldap://"
 #define PERSONAL_RELATIVE_URI "system"
 
@@ -524,562 +151,6 @@ create_groups (MigrationContext *context,
 	g_free (base_uri);
 }
 
-static gboolean
-migrate_local_folders (MigrationContext *context, ESourceGroup *on_this_computer, ESource *personal_source)
-{
-	gchar *old_path = NULL;
-	GSList *dirs, *l;
-	gchar *local_contact_folder = NULL;
-
-	old_path = g_strdup_printf ("%s/evolution/local", g_get_home_dir ());
-
-	dirs = e_folder_map_local_folders (old_path, "contacts");
-
-	/* migrate the local addressbook first, to local/system */
-	local_contact_folder = g_build_filename (g_get_home_dir (),
-						 "evolution", "local", "Contacts",
-						 NULL);
-
-	for (l = dirs; l; l = l->next) {
-		gchar *source_name;
-		/* we handle the system folder differently */
-		if (personal_source && !strcmp ((gchar *)l->data, local_contact_folder)) {
-			g_hash_table_insert (context->folder_uid_map, g_strdup (l->data), g_strdup (e_source_peek_uid (personal_source)));
-			migrate_contact_folder_to_source (context, local_contact_folder, personal_source);
-			continue;
-		}
-
-		source_name = get_source_name (on_this_computer, (gchar *)l->data);
-		migrate_contact_folder (context, l->data, on_this_computer, source_name);
-		g_free (source_name);
-	}
-
-	g_slist_foreach (dirs, (GFunc)g_free, NULL);
-	g_slist_free (dirs);
-	g_free (local_contact_folder);
-	g_free (old_path);
-
-	return TRUE;
-}
-
-static gchar *
-get_string_child (xmlNode *node,
-		  const gchar *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	gchar *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((gchar *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gint
-get_integer_child (xmlNode *node,
-		   const gchar *name,
-		   gint defval)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	gint retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return defval;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the default */
-		return defval;
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = atoi ((gchar *)xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
-{
-	gchar *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml",
-					     g_get_home_dir ());
-
-	printf ("trying to migrate from %s\n", sources_xml);
-
-	if (g_file_test (sources_xml, G_FILE_TEST_EXISTS)) {
-		xmlDoc  *doc = xmlParseFile (sources_xml);
-		xmlNode *root;
-		xmlNode *child;
-		gint num_contactservers;
-		gint servernum;
-
-		if (!doc)
-			return FALSE;
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp ((const gchar *)root->name, "addressbooks") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		/* count the number of servers, so we can give progress */
-		num_contactservers = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp ((const gchar *)child->name, "contactserver")) {
-				num_contactservers++;
-			}
-		}
-		printf ("found %d contact servers to migrate\n", num_contactservers);
-
-		dialog_set_folder_name (context, _("LDAP Servers"));
-
-		servernum = 0;
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp ((const gchar *)child->name, "contactserver")) {
-				gchar *port, *host, *rootdn, *scope, *authmethod, *ssl;
-				gchar *emailaddr, *binddn, *limitstr;
-				gint limit;
-				gchar *name, *description;
-				GString *uri = g_string_new ("");
-				ESource *source;
-
-				name        = get_string_child (child, "name");
-				description = get_string_child (child, "description");
-				port        = get_string_child (child, "port");
-				host        = get_string_child (child, "host");
-				rootdn      = get_string_child (child, "rootdn");
-				scope       = get_string_child (child, "scope");
-				authmethod  = get_string_child (child, "authmethod");
-				ssl         = get_string_child (child, "ssl");
-				emailaddr   = get_string_child (child, "emailaddr");
-				binddn      = get_string_child (child, "binddn");
-				limit       = get_integer_child (child, "limit", 100);
-				limitstr    = g_strdup_printf ("%d", limit);
-
-				g_string_append_printf (uri,
-							"%s:%s/%s?"/*trigraph prevention*/"?%s",
-							host, port, rootdn, scope);
-
-				source = e_source_new (name, uri->str);
-				e_source_set_property (source, "description", description);
-				e_source_set_property (source, "limit", limitstr);
-				e_source_set_property (source, "ssl", ssl);
-				e_source_set_property (source, "auth", authmethod);
-				if (emailaddr)
-					e_source_set_property (source, "email_addr", emailaddr);
-				if (binddn)
-					e_source_set_property (source, "binddn", binddn);
-
-				e_source_group_add_source (on_ldap_servers, source, -1);
-
-				g_string_free (uri, TRUE);
-				g_free (port);
-				g_free (host);
-				g_free (rootdn);
-				g_free (scope);
-				g_free (authmethod);
-				g_free (ssl);
-				g_free (emailaddr);
-				g_free (binddn);
-				g_free (limitstr);
-				g_free (name);
-				g_free (description);
-
-				servernum++;
-				dialog_set_progress (context, (double)servernum/num_contactservers);
-			}
-		}
-
-		xmlFreeDoc (doc);
-	}
-
-	g_free (sources_xml);
-
-	return TRUE;
-}
-
-static ESource*
-get_source_by_name (ESourceList *source_list, const gchar *name)
-{
-	GSList *groups;
-	GSList *g;
-
-	groups = e_source_list_peek_groups (source_list);
-	if (!groups)
-		return NULL;
-
-	for (g = groups; g; g = g->next) {
-		GSList *sources;
-		GSList *s;
-		ESourceGroup *group = E_SOURCE_GROUP (g->data);
-
-		sources = e_source_group_peek_sources (group);
-		if (!sources)
-			continue;
-
-		for (s = sources; s; s = s->next) {
-			ESource *source = E_SOURCE (s->data);
-			const gchar *source_name = e_source_peek_name (source);
-
-			if (!strcmp (name, source_name))
-				return source;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-migrate_completion_folders (MigrationContext *context)
-{
-	GConfClient *client;
-	const gchar *key;
-	gchar *uris_xml;
-
-	printf ("trying to migrate completion folders\n");
-
-	client = gconf_client_get_default ();
-	key = "/apps/evolution/addressbook/completion/uris";
-	uris_xml = gconf_client_get_string (client, key, NULL);
-	g_object_unref (client);
-
-	if (uris_xml) {
-		xmlDoc  *doc = xmlParseMemory (uris_xml, strlen (uris_xml));
-		xmlNode *root;
-		xmlNode *child;
-
-		if (!doc)
-			return FALSE;
-
-		dialog_set_folder_name (context, _("Autocompletion Settings"));
-
-		root = xmlDocGetRootElement (doc);
-		if (root == NULL || strcmp ((const gchar *)root->name, "EvolutionFolderList") != 0) {
-			xmlFreeDoc (doc);
-			return FALSE;
-		}
-
-		for (child = root->children; child; child = child->next) {
-			if (!strcmp ((const gchar *)child->name, "folder")) {
-				gchar *physical_uri = e_xml_get_string_prop_by_name (child, (const guchar *)"physical-uri");
-				ESource *source = NULL;
-
-				/* if the physical uri is file://...
-				   we look it up in our folder_uid_map
-				   hashtable.  If it's a folder we
-				   converted over, we should get back
-				   a uid we can search for.
-
-				   if the physical_uri is anything
-				   else, we strip off the args
-				   (anything after;) before searching
-				   for the uri. */
-
-				if (!strncmp (physical_uri, "file://", 7)) {
-					gchar *filename = g_filename_from_uri (physical_uri, NULL, NULL);
-					gchar *uid = NULL;
-
-					if (filename)
-						uid  = g_hash_table_lookup (context->folder_uid_map,
-									    filename);
-					g_free (filename);
-					if (uid)
-						source = e_source_list_peek_source_by_uid (context->source_list, uid);
-				}
-				else {
-					gchar *name = e_xml_get_string_prop_by_name (child, (const guchar *)"display-name");
-
-					source = get_source_by_name (context->source_list, name);
-
-					g_free (name);
-				}
-
-				if (source) {
-					e_source_set_property (source, "completion", "true");
-				}
-				else {
-					g_warning ("found completion folder with uri '%s' that "
-						   "doesn't correspond to anything we migrated.", physical_uri);
-				}
-
-				g_free (physical_uri);
-			}
-		}
-
-		g_free (uris_xml);
-	}
-	else {
-		g_message ("no completion folder settings to migrate");
-	}
-
-	return TRUE;
-}
-
-static void
-migrate_contact_lists_for_local_folders (MigrationContext *context, ESourceGroup *on_this_computer)
-{
-	GSList *sources, *s;
-
-	sources = e_source_group_peek_sources (on_this_computer);
-	for (s = sources; s; s = s->next) {
-		ESource *source = s->data;
-		EBook *book;
-		EBookQuery *query;
-		GList *l, *contacts;
-		gint num_contacts, num_converted;
-
-		dialog_set_folder_name (context, e_source_peek_name (source));
-
-		book = e_book_new (source, NULL);
-		if (!book
-		    || !e_book_open (book, TRUE, NULL)) {
-			gchar *uri = e_source_get_uri (source);
-			g_warning ("failed to migrate contact lists for source %s", uri);
-			g_free (uri);
-			continue;
-		}
-
-		query = e_book_query_any_field_contains ("");
-		e_book_get_contacts (book, query, &contacts, NULL);
-		e_book_query_unref (query);
-
-		num_converted = 0;
-		num_contacts = g_list_length (contacts);
-		for (l = contacts; l; l = l->next) {
-			EContact *contact = l->data;
-			GError *e = NULL;
-			GList *attrs, *attr;
-			gboolean converted = FALSE;
-
-			attrs = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
-			for (attr = attrs; attr; attr = attr->next) {
-				EVCardAttribute *a = attr->data;
-				GList *v = e_vcard_attribute_get_values (a);
-
-				if (v && v->data) {
-					if (!strncmp ((gchar *)v->data, "<?xml", 5)) {
-						EDestination *dest = e_destination_import ((gchar *)v->data);
-
-						e_destination_export_to_vcard_attribute (dest, a);
-
-						g_object_unref (dest);
-
-						converted = TRUE;
-					}
-				}
-			}
-
-			if (converted) {
-				e_contact_set_attributes (contact, E_CONTACT_EMAIL, attrs);
-
-				if (!e_book_commit_contact (book,
-							    contact,
-							    &e))
-					g_warning ("contact commit failed: '%s'", e->message);
-			}
-
-			num_converted ++;
-
-			dialog_set_progress (context, (double)num_converted / num_contacts);
-		}
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-migrate_company_phone_for_local_folders (MigrationContext *context, ESourceGroup *on_this_computer)
-{
-	GSList *sources, *s;
-
-	sources = e_source_group_peek_sources (on_this_computer);
-	for (s = sources; s; s = s->next) {
-		ESource *source = s->data;
-		EBook *book;
-		EBookQuery *query;
-		GList *l, *contacts;
-		gint num_contacts, num_converted;
-
-		dialog_set_folder_name (context, e_source_peek_name (source));
-
-		book = e_book_new (source, NULL);
-		if (!book
-		    || !e_book_open (book, TRUE, NULL)) {
-			gchar *uri = e_source_get_uri (source);
-			g_warning ("failed to migrate company phone numbers for source %s", uri);
-			g_free (uri);
-			continue;
-		}
-
-		query = e_book_query_any_field_contains ("");
-		e_book_get_contacts (book, query, &contacts, NULL);
-		e_book_query_unref (query);
-
-		num_converted = 0;
-		num_contacts = g_list_length (contacts);
-		for (l = contacts; l; l = l->next) {
-			EContact *contact = l->data;
-			GError *e = NULL;
-			GList *attrs, *attr;
-			gboolean converted = FALSE;
-			gint num_work_voice = 0;
-
-			attrs = e_vcard_get_attributes (E_VCARD (contact));
-			for (attr = attrs; attr;) {
-				EVCardAttribute *a = attr->data;
-				GList *next_attr = attr->next;
-
-				if (!strcmp ("TEL", e_vcard_attribute_get_name (a))) {
-					GList *params, *param;
-					gboolean found_voice = FALSE;
-					gboolean found_work = FALSE;
-
-					params = e_vcard_attribute_get_params (a);
-					for (param = params; param; param = param->next) {
-						EVCardAttributeParam *p = param->data;
-						if (!strcmp (EVC_TYPE, e_vcard_attribute_param_get_name (p))) {
-							GList *v = e_vcard_attribute_param_get_values (p);
-							while (v && v->data) {
-								if (!strcmp ("VOICE", v->data))
-									found_voice = TRUE;
-								else if (!strcmp ("WORK", v->data))
-									found_work = TRUE;
-								v = v->next;
-							}
-						}
-
-						if (found_work && found_voice)
-							num_work_voice++;
-
-						if (num_work_voice == 3) {
-							GList *v = e_vcard_attribute_get_values (a);
-
-							if (v && v->data)
-								e_contact_set (contact, E_CONTACT_PHONE_COMPANY, v->data);
-
-							e_vcard_remove_attribute (E_VCARD (contact), a);
-
-							converted = TRUE;
-							break;
-						}
-					}
-				}
-
-				attr = next_attr;
-
-				if (converted)
-					break;
-			}
-
-			if (converted) {
-				if (!e_book_commit_contact (book,
-							    contact,
-							    &e))
-					g_warning ("contact commit failed: '%s'", e->message);
-			}
-
-			num_converted ++;
-
-			dialog_set_progress (context, (double)num_converted / num_contacts);
-		}
-
-		g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
-		g_list_free (contacts);
-
-		g_object_unref (book);
-	}
-}
-
-static void
-migrate_pilot_data (const gchar *old_path, const gchar *new_path)
-{
-	const gchar *dent;
-	const gchar *ext;
-	gchar *filename;
-	GDir *dir;
-
-	if (!(dir = g_dir_open (old_path, 0, NULL)))
-		return;
-
-	while ((dent = g_dir_read_name (dir))) {
-		if ((!strncmp (dent, "pilot-map-", 10) &&
-		     ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) ||
-		    (!strncmp (dent, "pilot-sync-evolution-addressbook-", 33) &&
-		     ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db")))) {
-			/* src and dest file formats are identical for both map and changelog files */
-			guchar inbuf[4096];
-			gsize nread, nwritten;
-			gint fd0, fd1;
-			gssize n;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if ((fd0 = g_open (filename, O_RDONLY | O_BINARY, 0)) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			g_free (filename);
-			filename = g_build_filename (new_path, dent, NULL);
-			if ((fd1 = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-
-				if (n < 1)
-					break;
-
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-
-				if (n == -1)
-					break;
-			} while (1);
-
-			if (n != -1)
-				n = fsync (fd1);
-
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent, g_strerror (errno));
-				g_unlink (filename);
-			}
-
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		}
-	}
-
-	g_dir_close (dir);
-}
-
 static MigrationContext *
 migration_context_new (const gchar *data_dir)
 {
@@ -1121,7 +192,6 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend,
 	ESourceGroup *on_ldap_servers;
 	ESource *personal_source;
 	MigrationContext *context;
-	gboolean need_dialog = FALSE;
 	const gchar *data_dir;
 
 	g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), FALSE);
@@ -1134,87 +204,6 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend,
 	   groups/sources. */
 	create_groups (context, &on_this_computer, &on_ldap_servers, &personal_source);
 
-	/* figure out if we need the dialog displayed */
-	if (major == 1
-	    /* we only need the most recent upgrade point here.
-	       further decomposition will happen below. */
-	    && (minor < 5 || (minor == 5 && micro <= 10)))
-		need_dialog = TRUE;
-
-	if (need_dialog)
-		setup_progress_dialog (context);
-
-	if (major == 1) {
-
-		if (minor < 5 || (minor == 5 && micro <= 2)) {
-			/* initialize our dialog */
-			dialog_set_label (context,
-					  _("The location and hierarchy of the Evolution contact "
-					    "folders has changed since Evolution 1.x.\n\nPlease be "
-					    "patient while Evolution migrates your folders..."));
-
-			if (on_this_computer)
-				migrate_local_folders (context, on_this_computer, personal_source);
-			if (on_ldap_servers)
-				migrate_ldap_servers (context, on_ldap_servers);
-
-			migrate_completion_folders (context);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 7)) {
-			dialog_set_label (context,
-					  _("The format of mailing list contacts has changed.\n\n"
-					    "Please be patient while Evolution migrates your "
-					    "folders..."));
-
-			migrate_contact_lists_for_local_folders (context, on_this_computer);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 8)) {
-			dialog_set_label (context,
-					  _("The way Evolution stores some phone numbers has changed.\n\n"
-					    "Please be patient while Evolution migrates your "
-					    "folders..."));
-
-			migrate_company_phone_for_local_folders (context, on_this_computer);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			gchar *old_path, *new_path;
-
-			dialog_set_label (context, _("Evolution's Palm Sync changelog and map files have changed.\n\n"
-						     "Please be patient while Evolution migrates your Pilot Sync data..."));
-
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Contacts", NULL);
-			new_path = g_build_filename (data_dir, "local", "system", NULL);
-			migrate_pilot_data (old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && micro <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (context->source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-	}
-
-	if (need_dialog)
-		dialog_close (context);
-
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_ldap_servers)
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index 0e5dee9363..c7511f69f8 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -36,8 +36,6 @@
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-xml-hash-utils.h>
 
-#include "e-util/e-bconf-map.h"
-#include "e-util/e-folder-map.h"
 #include "e-util/e-util-private.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/calendar-config-keys.h"
@@ -49,427 +47,6 @@
 #define BAD_CONTACTS_BASE_URI "contact://"
 #define PERSONAL_RELATIVE_URI "system"
 
-static e_gconf_map_t calendar_display_map[] = {
-	/* /Calendar/Display */
-	{ "Timezone", "calendar/display/timezone", E_GCONF_MAP_STRING },
-	{ "Use24HourFormat", "calendar/display/use_24hour_format", E_GCONF_MAP_BOOL },
-	{ "WeekStartDay", "calendar/display/week_start_day", E_GCONF_MAP_INT },
-	{ "DayStartHour", "calendar/display/day_start_hour", E_GCONF_MAP_INT },
-	{ "DayStartMinute", "calendar/display/day_start_minute", E_GCONF_MAP_INT },
-	{ "DayEndHour", "calendar/display/day_end_hour", E_GCONF_MAP_INT },
-	{ "DayEndMinute", "calendar/display/day_end_minute", E_GCONF_MAP_INT },
-	{ "TimeDivisions", "calendar/display/time_divisions", E_GCONF_MAP_INT },
-	{ "View", "calendar/display/default_view", E_GCONF_MAP_INT },
-	{ "HPanePosition", "calendar/display/hpane_position", E_GCONF_MAP_FLOAT },
-	{ "VPanePosition", "calendar/display/vpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthHPanePosition", "calendar/display/month_hpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthVPanePosition", "calendar/display/month_vpane_position", E_GCONF_MAP_FLOAT },
-	{ "CompressWeekend", "calendar/display/compress_weekend", E_GCONF_MAP_BOOL },
-	{ "ShowEventEndTime", "calendar/display/show_event_end", E_GCONF_MAP_BOOL },
-	{ "WorkingDays", "calendar/display/working_days", E_GCONF_MAP_INT },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_other_map[] = {
-	/* /Calendar/Other */
-	{ "ConfirmDelete", "calendar/prompts/confirm_delete", E_GCONF_MAP_BOOL },
-	{ "ConfirmExpunge", "calendar/prompts/confirm_purge", E_GCONF_MAP_BOOL },
-	{ "UseDefaultReminder", "calendar/other/use_default_reminder", E_GCONF_MAP_BOOL },
-	{ "DefaultReminderInterval", "calendar/other/default_reminder_interval", E_GCONF_MAP_INT },
-	{ "DefaultReminderUnits", "calendar/other/default_reminder_units", E_GCONF_MAP_STRING },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_datenavigator_map[] = {
-	/* /Calendar/DateNavigator */
-	{ "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_alarmnotify_map[] = {
-	/* /Calendar/AlarmNotify */
-	{ "LastNotificationTime", "calendar/notify/last_notification_time", E_GCONF_MAP_INT },
-	{ "CalendarToLoad%i", "calendar/notify/calendars", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ "BlessedProgram%i", "calendar/notify/programs", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ NULL },
-};
-
-static e_gconf_map_list_t calendar_remap_list[] = {
-
-	{ "/Calendar/Display", calendar_display_map },
-	{ "/Calendar/Other/Map", calendar_other_map },
-	{ "/Calendar/DateNavigator", calendar_datenavigator_map },
-	{ "/Calendar/AlarmNotify", calendar_alarmnotify_map },
-
-	{ NULL },
-};
-
-static GtkWidget *window;
-static GtkLabel *label;
-static GtkProgressBar *progress;
-
-#ifndef G_OS_WIN32
-
-/* No previous versions have been available on Win32, so don't
- * bother with upgrade support from 1.x on Win32.
- */
-
-static void
-setup_progress_dialog (void)
-{
-	GtkWidget *vbox, *hbox, *w;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
-	gtk_window_set_modal ((GtkWindow *) window, TRUE);
-	gtk_container_set_border_width ((GtkContainer *) window, 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add ((GtkContainer *) window, vbox);
-
-	w = gtk_label_new (_("The location and hierarchy of the Evolution calendar "
-			     "folders has changed since Evolution 1.x.\n\nPlease be "
-			     "patient while Evolution migrates your folders..."));
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
-
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
-	gtk_widget_show (window);
-}
-
-static void
-dialog_close (void)
-{
-	gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-dialog_set_folder_name (const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (label, text);
-	g_free (text);
-
-	gtk_progress_bar_set_fraction (progress, 0.0);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-dialog_set_progress (double percent)
-{
-	gchar text[5];
-
-	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
-
-	gtk_progress_bar_set_fraction (progress, percent);
-	gtk_progress_bar_set_text (progress, text);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, gchar *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gchar *
-get_source_name (ESourceGroup *group, const gchar *path)
-{
-	gchar **p = g_strsplit (path, "/", 0);
-	gint i, j, starting_index;
-	gint num_elements;
-	gboolean conflict;
-	GString *s = g_string_new (NULL);
-
-	for (i = 0; p[i]; i ++);
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-	g_strfreev (p);
-
-	return g_string_free (s, FALSE);
-}
-
-static gboolean
-migrate_ical (ECal *old_ecal, ECal *new_ecal)
-{
-	GList *l, *objects;
-	gint num_added = 0;
-	gint num_objects;
-	gboolean retval = TRUE;
-
-	/* both ecals are loaded, start the actual migration */
-	if (!e_cal_get_object_list (old_ecal, "#t", &objects, NULL))
-		return FALSE;
-
-	num_objects = g_list_length (objects);
-	for (l = objects; l; l = l->next) {
-		icalcomponent *ical_comp = l->data;
-		GError *error = NULL;
-
-		if (!e_cal_create_object (new_ecal, ical_comp, NULL, &error)) {
-			g_warning ("Migration of object failed: %s", error->message);
-			retval = FALSE;
-		}
-
-		g_clear_error (&error);
-
-		num_added ++;
-		dialog_set_progress ((double)num_added / num_objects);
-	}
-
-	g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
-	g_list_free (objects);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type)
-{
-	ECal *old_ecal = NULL, *new_ecal = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-	gchar *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *error = NULL;
-	gboolean retval = FALSE;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (e_source_peek_name (new_source));
-
-	if (!(old_ecal = e_cal_new (old_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (old_source));
-		goto finish;
-	}
-	if (!e_cal_open (old_ecal, FALSE, &error)) {
-		g_warning ("failed to load source ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (old_source));
-		goto finish;
-	}
-
-	if (!(new_ecal = e_cal_new (new_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (new_source));
-		goto finish;
-	}
-	if (!e_cal_open (new_ecal, FALSE, &error)) {
-		g_warning ("failed to load destination ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (new_source));
-		goto finish;
-	}
-
-	retval = migrate_ical (old_ecal, new_ecal);
-
-finish:
-	g_clear_error (&error);
-	if (old_ecal)
-		g_object_unref (old_ecal);
-	g_object_unref (group);
-	if (new_ecal)
-		g_object_unref (new_ecal);
-	g_free (old_uri);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type)
-{
-	ESource *new_source;
-	gboolean retval;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	retval = migrate_ical_folder_to_source (old_path, new_source, type);
-
-	g_object_unref (new_source);
-
-	return retval;
-}
-
-#endif	/* !G_OS_WIN32 */
-
-#ifndef G_OS_WIN32
-
-static void
-migrate_pilot_db_key (const gchar *key, gpointer user_data)
-{
-	EXmlHash *xmlhash = user_data;
-
-	e_xmlhash_add (xmlhash, key, "");
-}
-
-static void
-migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path)
-{
-	gchar *changelog, *map;
-	const gchar *dent;
-	const gchar *ext;
-	gchar *filename;
-	GDir *dir;
-
-	if (!(dir = g_dir_open (old_path, 0, NULL)))
-		return;
-
-	map = g_alloca (12 + strlen (conduit));
-	sprintf (map, "pilot-map-%s-", conduit);
-
-	changelog = g_alloca (24 + strlen (conduit));
-	sprintf (changelog, "pilot-sync-evolution-%s-", conduit);
-
-	while ((dent = g_dir_read_name (dir))) {
-		if (!strncmp (dent, map, strlen (map)) &&
-		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
-			/* pilot map file - src and dest file formats are identical */
-			guchar inbuf[4096];
-			gsize nread, nwritten;
-			gint fd0, fd1;
-			gssize n;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			g_free (filename);
-			filename = g_build_filename (new_path, dent, NULL);
-			if ((fd1 = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-
-				if (n < 1)
-					break;
-
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-
-				if (n == -1)
-					break;
-			} while (1);
-
-			if (n != -1)
-				n = fsync (fd1);
-
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent, strerror (errno));
-				g_unlink (filename);
-			}
-
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		} else if (!strncmp (dent, changelog, strlen (changelog)) &&
-			   ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db"))) {
-			/* src and dest formats differ, src format is db3 while dest format is xml */
-			EXmlHash *xmlhash;
-			EDbHash *dbhash;
-			struct stat st;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if (g_stat (filename, &st) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			dbhash = e_dbhash_new (filename);
-			g_free (filename);
-
-			filename = g_strdup_printf ("%s/%s.ics-%s", new_path, component, dent);
-			if (g_stat (filename, &st) != -1)
-				g_unlink (filename);
-			xmlhash = e_xmlhash_new (filename);
-			g_free (filename);
-
-			e_dbhash_foreach_key (dbhash, migrate_pilot_db_key, xmlhash);
-
-			e_dbhash_destroy (dbhash);
-
-			e_xmlhash_write (xmlhash);
-			e_xmlhash_destroy (xmlhash);
-		}
-	}
-
-	g_dir_close (dir);
-}
-
-#endif
-
 static ESourceGroup *
 create_calendar_contact_source (ESourceList *source_list)
 {
@@ -624,7 +201,6 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 	ESourceList *source_list;
 	ECalEvent *ece;
 	ECalEventTargetBackend *target;
-	gboolean retval = FALSE;
 
 	g_object_get (shell_backend, "source-list", &source_list, NULL);
 
@@ -635,133 +211,6 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 		shell_backend, source_list, &on_this_computer,
 		&personal_source, &on_the_web, &contacts);
 
-#ifndef G_OS_WIN32
-	if (major == 1) {
-		xmlDocPtr config_doc = NULL;
-		gchar *conf_file;
-		struct stat st;
-
-		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-		if (lstat (conf_file, &st) == 0 && S_ISREG (st.st_mode))
-			config_doc = xmlParseFile (conf_file);
-		g_free (conf_file);
-
-		if (config_doc && minor <= 2) {
-			GConfClient *gconf;
-			gint res = 0;
-
-			/* move bonobo config to gconf */
-			gconf = gconf_client_get_default ();
-
-			res = e_bconf_import (gconf, config_doc, calendar_remap_list);
-
-			g_object_unref (gconf);
-
-			xmlFreeDoc(config_doc);
-
-			if (res != 0) {
-				/* FIXME: set proper domain/code */
-				g_set_error(error, 0, 0, _("Unable to migrate old settings from evolution/config.xmldb"));
-				goto fail;
-			}
-		}
-
-		if (minor <= 4) {
-			GSList *migration_dirs, *l;
-			gchar *path, *local_cal_folder;
-
-			setup_progress_dialog ();
-
-			path = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-			migration_dirs = e_folder_map_local_folders (path, "calendar");
-			local_cal_folder = g_build_filename (path, "Calendar", NULL);
-			g_free (path);
-
-			if (personal_source)
-				migrate_ical_folder_to_source (local_cal_folder, personal_source, E_CAL_SOURCE_TYPE_EVENT);
-
-			for (l = migration_dirs; l; l = l->next) {
-				gchar *source_name;
-
-				if (personal_source && !strcmp ((gchar *)l->data, local_cal_folder))
-					continue;
-
-				source_name = get_source_name (on_this_computer, (gchar *)l->data);
-
-				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) {
-					/* FIXME: domain/code */
-					g_set_error(error, 0, 0, _("Unable to migrate calendar '%s'"), source_name);
-					g_free(source_name);
-					goto fail;
-				}
-
-				g_free (source_name);
-			}
-
-			g_free (local_cal_folder);
-
-			dialog_close ();
-		}
-
-		if (minor <= 4 || (minor == 5 && micro < 5)) {
-			GConfClient *gconf;
-			GConfValue *gconf_val;
-			gint i;
-			const gchar *keys[] = {
-				CALENDAR_CONFIG_HPANE_POS,
-				CALENDAR_CONFIG_VPANE_POS,
-				CALENDAR_CONFIG_MONTH_HPANE_POS,
-				CALENDAR_CONFIG_MONTH_VPANE_POS,
-				NULL
-			};
-
-			gconf = gconf_client_get_default ();
-
-			for (i = 0; keys[i]; i++) {
-				gconf_val = gconf_client_get (gconf, keys[i], NULL);
-				if (gconf_val) {
-					if (gconf_val->type != GCONF_VALUE_INT)
-						gconf_client_unset (gconf, keys[i], NULL);
-					gconf_value_free (gconf_val);
-				}
-			}
-
-			g_object_unref (gconf);
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			gchar *old_path, *new_path;
-
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Calendar", NULL);
-			new_path = g_build_filename (e_shell_backend_get_data_dir (shell_backend),
-						     "local", "system", NULL);
-			migrate_pilot_data ("calendar", "calendar", old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && micro <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-
-	}
-#endif	/* !G_OS_WIN32 */
-
 	e_source_list_sync (source_list, NULL);
 
 	/** @Event: component.migration
@@ -778,8 +227,6 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend,
 	target = e_cal_event_target_new_module (ece, shell_backend, source_list, 0);
 	e_event_emit ((EEvent *) ece, "module.migration", (EEventTarget *) target);
 
-	retval = TRUE;
-fail:
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_the_web)
@@ -789,6 +236,6 @@ fail:
 	if (personal_source)
 		g_object_unref (personal_source);
 
-	return retval;
+	return TRUE;
 }
 
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index 3c3210b472..9fe9870c73 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -37,8 +37,6 @@
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libedataserver/e-xml-utils.h>
 
-#include "e-util/e-bconf-map.h"
-#include "e-util/e-folder-map.h"
 #include "e-util/e-util-private.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/calendar-config-keys.h"
@@ -47,396 +45,6 @@
 #define WEBCAL_BASE_URI "webcal://"
 #define PERSONAL_RELATIVE_URI "system"
 
-static e_gconf_map_t calendar_tasks_map[] = {
-	/* /Calendar/Tasks */
-	{ "HideCompletedTasks", "calendar/tasks/hide_completed", E_GCONF_MAP_BOOL },
-	{ "HideCompletedTasksUnits", "calendar/tasks/hide_completed_units", E_GCONF_MAP_STRING },
-	{ "HideCompletedTasksValue", "calendar/tasks/hide_completed_value", E_GCONF_MAP_INT },
-	{ NULL },
-};
-
-static e_gconf_map_t calendar_tasks_colours_map[] = {
-	/* /Calendar/Tasks/Colors */
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ "TasksOverDue", "calendar/tasks/colors/overdue", E_GCONF_MAP_STRING },
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ NULL },
-};
-
-static e_gconf_map_list_t task_remap_list[] = {
-
-	{ "/Calendar/Tasks", calendar_tasks_map },
-	{ "/Calendar/Tasks/Colors", calendar_tasks_colours_map },
-
-	{ NULL },
-};
-
-static GtkWidget *window;
-static GtkLabel *label;
-static GtkProgressBar *progress;
-
-#ifndef G_OS_WIN32
-
-/* No previous versions have been available on Win32, so don't
- * bother with upgrade support from 1.x on Win32.
- */
-
-static void
-setup_progress_dialog (void)
-{
-	GtkWidget *vbox, *hbox, *w;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
-	gtk_window_set_modal ((GtkWindow *) window, TRUE);
-	gtk_container_set_border_width ((GtkContainer *) window, 6);
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_widget_show (vbox);
-	gtk_container_add ((GtkContainer *) window, vbox);
-
-	w = gtk_label_new (_("The location and hierarchy of the Evolution task "
-			     "folders has changed since Evolution 1.x.\n\nPlease be "
-			     "patient while Evolution migrates your folders..."));
-
-	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_widget_show (w);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
-
-	label = (GtkLabel *) gtk_label_new ("");
-	gtk_widget_show ((GtkWidget *) label);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
-	progress = (GtkProgressBar *) gtk_progress_bar_new ();
-	gtk_widget_show ((GtkWidget *) progress);
-	gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
-	gtk_widget_show (window);
-}
-
-static void
-dialog_close (void)
-{
-	gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-dialog_set_folder_name (const gchar *folder_name)
-{
-	gchar *text;
-
-	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
-	gtk_label_set_text (label, text);
-	g_free (text);
-
-	gtk_progress_bar_set_fraction (progress, 0.0);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-dialog_set_progress (double percent)
-{
-	gchar text[5];
-
-	snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
-
-	gtk_progress_bar_set_fraction (progress, percent);
-	gtk_progress_bar_set_text (progress, text);
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static gboolean
-check_for_conflict (ESourceGroup *group, gchar *name)
-{
-	GSList *sources;
-	GSList *s;
-
-	sources = e_source_group_peek_sources (group);
-
-	for (s = sources; s; s = s->next) {
-		ESource *source = E_SOURCE (s->data);
-
-		if (!strcmp (e_source_peek_name (source), name))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gchar *
-get_source_name (ESourceGroup *group, const gchar *path)
-{
-	gchar **p = g_strsplit (path, "/", 0);
-	gint i, j, starting_index;
-	gint num_elements;
-	gboolean conflict;
-	GString *s = g_string_new (NULL);
-
-	for (i = 0; p[i]; i ++);
-
-	num_elements = i;
-	i--;
-
-	/* p[i] is now the last path element */
-
-	/* check if it conflicts */
-	starting_index = i;
-	do {
-		for (j = starting_index; j < num_elements; j += 2) {
-			if (j != starting_index)
-				g_string_append_c (s, '_');
-			g_string_append (s, p[j]);
-		}
-
-		conflict = check_for_conflict (group, s->str);
-
-		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
-		if (conflict)
-			starting_index -= 2;
-
-		/* we always break out if we can't go any further,
-		   regardless of whether or not we conflict. */
-		if (starting_index < 0)
-			break;
-
-	} while (conflict);
-	g_strfreev (p);
-
-	return g_string_free (s, FALSE);
-}
-
-static gboolean
-migrate_ical (ECal *old_ecal, ECal *new_ecal)
-{
-	GList *l, *objects;
-	gint num_added = 0;
-	gint num_objects;
-	gboolean retval = TRUE;
-
-	/* both ecals are loaded, start the actual migration */
-	if (!e_cal_get_object_list (old_ecal, "#t", &objects, NULL))
-		return FALSE;
-
-	num_objects = g_list_length (objects);
-	for (l = objects; l; l = l->next) {
-		icalcomponent *ical_comp = l->data;
-		GError *error = NULL;
-
-		if (!e_cal_create_object (new_ecal, ical_comp, NULL, &error)) {
-			g_warning ("Migration of object failed: %s", error->message);
-			retval = FALSE;
-		}
-
-		g_clear_error (&error);
-
-		num_added ++;
-		dialog_set_progress ((double)num_added / num_objects);
-	}
-
-	g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
-	g_list_free (objects);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type)
-{
-	ECal *old_ecal = NULL, *new_ecal = NULL;
-	ESource *old_source;
-	ESourceGroup *group;
-	gchar *old_uri = g_strdup_printf ("file://%s", old_path);
-	GError *error = NULL;
-	gboolean retval = FALSE;
-
-	group = e_source_group_new ("", old_uri);
-	old_source = e_source_new ("", "");
-	e_source_group_add_source (group, old_source, -1);
-
-	dialog_set_folder_name (e_source_peek_name (new_source));
-
-	if (!(old_ecal = e_cal_new (old_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (old_source));
-		goto finish;
-	}
-	if (!e_cal_open (old_ecal, FALSE, &error)) {
-		g_warning ("failed to load source ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (old_source));
-		goto finish;
-	}
-
-	if (!(new_ecal = e_cal_new (new_source, type))) {
-		g_warning ("could not find a backend for '%s'", e_source_get_uri (new_source));
-		goto finish;
-	}
-	if (!e_cal_open (new_ecal, FALSE, &error)) {
-		g_warning ("failed to load destination ecal for migration: '%s' (%s)", error->message,
-			   e_source_get_uri (new_source));
-		goto finish;
-	}
-
-	retval = migrate_ical (old_ecal, new_ecal);
-
-finish:
-	g_clear_error (&error);
-	if (old_ecal)
-		g_object_unref (old_ecal);
-	g_object_unref (group);
-	if (new_ecal)
-		g_object_unref (new_ecal);
-	g_free (old_uri);
-
-	return retval;
-}
-
-static gboolean
-migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type)
-{
-	ESource *new_source;
-	gboolean retval;
-
-	new_source = e_source_new (source_name, source_name);
-	e_source_set_relative_uri (new_source, e_source_peek_uid (new_source));
-	e_source_group_add_source (dest_group, new_source, -1);
-
-	retval = migrate_ical_folder_to_source (old_path, new_source, type);
-
-	g_object_unref (new_source);
-
-	return retval;
-}
-
-#endif	/* !G_OS_WIN32 */
-
-#ifndef G_OS_WIN32
-
-static void
-migrate_pilot_db_key (const gchar *key, gpointer user_data)
-{
-	EXmlHash *xmlhash = user_data;
-
-	e_xmlhash_add (xmlhash, key, "");
-}
-
-static void
-migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path)
-{
-	gchar *changelog, *map;
-	const gchar *dent;
-	const gchar *ext;
-	gchar *filename;
-	GDir *dir;
-
-	if (!(dir = g_dir_open (old_path, 0, NULL)))
-		return;
-
-	map = g_alloca (12 + strlen (conduit));
-	sprintf (map, "pilot-map-%s-", conduit);
-
-	changelog = g_alloca (24 + strlen (conduit));
-	sprintf (changelog, "pilot-sync-evolution-%s-", conduit);
-
-	while ((dent = g_dir_read_name (dir))) {
-		if (!strncmp (dent, map, strlen (map)) &&
-		    ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
-			/* pilot map file - src and dest file formats are identical */
-			guchar inbuf[4096];
-			gsize nread, nwritten;
-			gint fd0, fd1;
-			gssize n;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			g_free (filename);
-			filename = g_build_filename (new_path, dent, NULL);
-			if ((fd1 = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666)) == -1) {
-				g_free (filename);
-				close (fd0);
-				continue;
-			}
-
-			do {
-				do {
-					n = read (fd0, inbuf, sizeof (inbuf));
-				} while (n == -1 && errno == EINTR);
-
-				if (n < 1)
-					break;
-
-				nread = n;
-				nwritten = 0;
-				do {
-					do {
-						n = write (fd1, inbuf + nwritten, nread - nwritten);
-					} while (n == -1 && errno == EINTR);
-
-					if (n > 0)
-						nwritten += n;
-				} while (nwritten < nread && n != -1);
-
-				if (n == -1)
-					break;
-			} while (1);
-
-			if (n != -1)
-				n = fsync (fd1);
-
-			if (n == -1) {
-				g_warning ("Failed to migrate %s: %s", dent, strerror (errno));
-				g_unlink (filename);
-			}
-
-			close (fd0);
-			close (fd1);
-			g_free (filename);
-		} else if (!strncmp (dent, changelog, strlen (changelog)) &&
-			   ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db"))) {
-			/* src and dest formats differ, src format is db3 while dest format is xml */
-			EXmlHash *xmlhash;
-			EDbHash *dbhash;
-			struct stat st;
-
-			filename = g_build_filename (old_path, dent, NULL);
-			if (g_stat (filename, &st) == -1) {
-				g_free (filename);
-				continue;
-			}
-
-			dbhash = e_dbhash_new (filename);
-			g_free (filename);
-
-			filename = g_strdup_printf ("%s/%s.ics-%s", new_path, component, dent);
-			if (g_stat (filename, &st) != -1)
-				g_unlink (filename);
-			xmlhash = e_xmlhash_new (filename);
-			g_free (filename);
-
-			e_dbhash_foreach_key (dbhash, migrate_pilot_db_key, xmlhash);
-
-			e_dbhash_destroy (dbhash);
-
-			e_xmlhash_write (xmlhash);
-			e_xmlhash_destroy (xmlhash);
-		}
-	}
-
-	g_dir_close (dir);
-}
-
-#endif
-
 static void
 create_task_sources (EShellBackend *shell_backend,
 		     ESourceList *source_list,
@@ -553,7 +161,6 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 	ESourceGroup *on_the_web = NULL;
 	ESource *personal_source = NULL;
 	ESourceList *source_list;
-	gboolean retval = FALSE;
 
 	g_object_get (shell_backend, "source-list", &source_list, NULL);
 
@@ -564,106 +171,8 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend,
 		shell_backend, source_list, &on_this_computer,
 		&on_the_web, &personal_source);
 
-#ifndef G_OS_WIN32
-	if (major == 1) {
-		xmlDocPtr config_doc = NULL;
-		gchar *conf_file;
-
-		conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
-		if (g_file_test (conf_file, G_FILE_TEST_IS_REGULAR))
-			config_doc = e_xml_parse_file (conf_file);
-		g_free (conf_file);
-
-		if (config_doc && minor <= 2) {
-			GConfClient *gconf;
-			gint res = 0;
-
-			/* move bonobo config to gconf */
-			gconf = gconf_client_get_default ();
-
-			res = e_bconf_import (gconf, config_doc, task_remap_list);
-
-			g_object_unref (gconf);
-
-			xmlFreeDoc(config_doc);
-
-			if (res != 0) {
-				g_set_error(error, 0, 0, _("Unable to migrate old settings from evolution/config.xmldb"));
-				goto fail;
-			}
-		}
-
-		if (minor <= 4) {
-			GSList *migration_dirs, *l;
-			gchar *path, *local_task_folder;
-
-			setup_progress_dialog ();
-
-			path = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
-			migration_dirs = e_folder_map_local_folders (path, "tasks");
-			local_task_folder = g_build_filename (path, "Tasks", NULL);
-			g_free (path);
-
-			if (personal_source)
-				migrate_ical_folder_to_source (local_task_folder, personal_source, E_CAL_SOURCE_TYPE_TODO);
-
-			for (l = migration_dirs; l; l = l->next) {
-				gchar *source_name;
-
-				if (personal_source && !strcmp ((gchar *)l->data, local_task_folder))
-					continue;
-
-				source_name = get_source_name (on_this_computer, (gchar *)l->data);
-
-				if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) {
-					/* FIXME: domain/code */
-					g_set_error(error, 0, 0, _("Unable to migrate tasks '%s'"), source_name);
-					g_free(source_name);
-					goto fail;
-				}
-
-				g_free (source_name);
-			}
-
-			g_free (local_task_folder);
-
-			dialog_close ();
-		}
-
-		if (minor < 5 || (minor == 5 && micro <= 10)) {
-			gchar *old_path, *new_path;
-
-			old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Tasks", NULL);
-			new_path = g_build_filename (e_shell_backend_get_data_dir (shell_backend),
-						     "local", "system", NULL);
-			migrate_pilot_data ("tasks", "todo", old_path, new_path);
-			g_free (new_path);
-			g_free (old_path);
-		}
-
-		/* we only need to do this next step if people ran
-		   older versions of 1.5.  We need to clear out the
-		   absolute URI's that were assigned to ESources
-		   during one phase of development, as they take
-		   precedent over relative uris (but aren't updated
-		   when editing an ESource). */
-		if (minor == 5 && micro <= 11) {
-			GSList *g;
-			for (g = e_source_list_peek_groups (source_list); g; g = g->next) {
-				ESourceGroup *group = g->data;
-				GSList *s;
-
-				for (s = e_source_group_peek_sources (group); s; s = s->next) {
-					ESource *source = s->data;
-					e_source_set_absolute_uri (source, NULL);
-				}
-			}
-		}
-	}
-#endif	/* !G_OS_WIN32 */
 	e_source_list_sync (source_list, NULL);
-	retval = TRUE;
-fail:
+
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_the_web)
@@ -671,5 +180,5 @@ fail:
 	if (personal_source)
 		g_object_unref (personal_source);
 
-        return retval;
+	return TRUE;
 }