[evolution-data-server] Modularize e-addressbook-factory migration.

[Matthew Barnes <mbarnes src gnome org>]

commit c65499703689a86bd1a3bb291886d4a03a80ae8c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Mar 2 14:33:01 2011 -0500

    Modularize e-addressbook-factory migration.
    
    Rename e_data_book_migrate() to e_data_book_migrate_basedir() and rename
    the source file similarly.  Makes room for other kinds of migration.

 addressbook/libedata-book/Makefile.am              |    2 +-
 addressbook/libedata-book/e-data-book-factory.c    |    4 ++--
 ...ook-migrate.c => e-data-book-migrate-basedir.c} |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 492edb2..5975f8d 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -79,7 +79,7 @@ e_addressbook_factory_CPPFLAGS = \
 e_addressbook_factory_SOURCES = \
 	e-data-book-factory.c \
 	e-data-book-factory.h \
-	e-data-book-migrate.c
+	e-data-book-migrate-basedir.c
 
 e_addressbook_factory_LDADD =					\
 	libedata-book-1.2.la					\
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 8308191..d74a9f7 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -89,7 +89,7 @@ struct _EDataBookFactoryPrivate {
 };
 
 /* Forward Declarations */
-void e_data_book_migrate (void);
+void e_data_book_migrate_basedir (void);
 
 /* Create the EDataBookFactory error quark */
 GQuark
@@ -663,7 +663,7 @@ main (gint argc, gchar **argv)
 		NULL);
 
 	/* Migrate user data from ~/.evolution to XDG base directories. */
-	e_data_book_migrate ();
+	e_data_book_migrate_basedir ();
 
 #ifndef G_OS_WIN32
 	setup_quit_signal ();
diff --git a/addressbook/libedata-book/e-data-book-migrate.c b/addressbook/libedata-book/e-data-book-migrate-basedir.c
similarity index 98%
rename from addressbook/libedata-book/e-data-book-migrate.c
rename to addressbook/libedata-book/e-data-book-migrate-basedir.c
index 9004f57..76e711e 100644
--- a/addressbook/libedata-book/e-data-book-migrate.c
+++ b/addressbook/libedata-book/e-data-book-migrate-basedir.c
@@ -1,5 +1,5 @@
 /*
- * e-data-book-migrate.c
+ * e-data-book-migrate-basedir.c
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #include <glib/gstdio.h>
 #include <libedataserver/e-data-server-util.h>
 
-void e_data_book_migrate (void);
+void e_data_book_migrate_basedir (void);
 
 static gboolean
 data_book_migrate_rename (const gchar *old_filename,
@@ -289,7 +289,7 @@ data_book_migrate_to_user_data_dir (const gchar *old_base_dir)
 }
 
 void
-e_data_book_migrate (void)
+e_data_book_migrate_basedir (void)
 {
 	const gchar *home_dir;
 	gchar *old_base_dir;