i2004-01-24 Chris Toshok <toshok@ximian.com>

	* gui/component/addressbook-migrate.c (migrate_local_folders):
	don't create/add the source here.  it's done in

svn path=/trunk/; revision=24406

2 files changed, 6 insertions, 7 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 50148a2e9b..29a25899a2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
 2004-01-24  Chris Toshok  <toshok@ximian.com>
 
+	* gui/component/addressbook-migrate.c (migrate_local_folders):
+	don't create/add the source here.  it's done in
+	migrate_contact_folder.
+
+2004-01-24  Chris Toshok  <toshok@ximian.com>
+
 	* gui/component/addressbook-migrate.c (migrate_local_folders): use
 	e_folder_map_local_folders.
 	(find_addressbook_dirs): nuke.
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 07d461b75e..ef370412bf 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -423,18 +423,11 @@ migrate_local_folders (AddressbookComponent *component, ESourceGroup *on_this_co
 	migrate_contact_folder (local_contact_folder, on_this_computer, source_name);
 
 	for (l = dirs; l; l = l->next) {
-		ESource *source;
-
 		/* skip the local contact folder, since we handle that
 		   specifically, mapping it to Personal */
 		if (!strcmp ((char*)l->data, local_contact_folder))
 			continue;
 
-		source_name = get_source_name (on_this_computer, (char*)l->data + strlen (old_path) + 1);
-
-		source = e_source_new (source_name, source_name);
-		e_source_group_add_source (on_this_computer, source, -1);
-
 		migrate_contact_folder (l->data, on_this_computer, source_name);
 		g_free (source_name);
 	}