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

[Matthew Barnes <mbarnes src gnome org>]

commit 6fb1d10ca9ddc885c68fc399689d034174357662
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Mar 2 14:37:46 2011 -0500

    Modularize e-calendar-factory migration.
    
    Rename e_data_cal_migrate() to e_data_cal_migrate_basedir() and rename
    the source file similarly.  Makes room for other kinds of migration.

 calendar/libedata-cal/Makefile.am                  |    2 +-
 calendar/libedata-cal/e-data-cal-factory.c         |    4 ++--
 ...-cal-migrate.c => e-data-cal-migrate-basedir.c} |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index 326c27d..d9f71cf 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -93,7 +93,7 @@ factory_PROGRAMS = e-calendar-factory
 e_calendar_factory_SOURCES =		\
 	e-data-cal-factory.c		\
 	e-data-cal-factory.h		\
-	e-data-cal-migrate.c		\
+	e-data-cal-migrate-basedir.c	\
 	e-cal-backend-loader-factory.c	\
 	e-cal-backend-loader-factory.h
 
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 9013035..326ef01 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -104,7 +104,7 @@ struct _EDataCalFactoryPrivate {
 };
 
 /* Forward Declarations */
-void e_data_cal_migrate (void);
+void e_data_cal_migrate_basedir (void);
 
 /* Create the EDataCalFactory error quark */
 GQuark
@@ -985,7 +985,7 @@ main (gint argc, gchar **argv)
 		NULL);
 
 	/* Migrate user data from ~/.evolution to XDG base directories. */
-	e_data_cal_migrate ();
+	e_data_cal_migrate_basedir ();
 
 #ifndef G_OS_WIN32
 	setup_quit_signal ();
diff --git a/calendar/libedata-cal/e-data-cal-migrate.c b/calendar/libedata-cal/e-data-cal-migrate-basedir.c
similarity index 99%
rename from calendar/libedata-cal/e-data-cal-migrate.c
rename to calendar/libedata-cal/e-data-cal-migrate-basedir.c
index 7207c9e..4c17608 100644
--- a/calendar/libedata-cal/e-data-cal-migrate.c
+++ b/calendar/libedata-cal/e-data-cal-migrate-basedir.c
@@ -1,5 +1,5 @@
 /*
- * e-data-cal-migrate.c
+ * e-data-cal-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_cal_migrate (void);
+void e_data_cal_migrate_basedir (void);
 
 static gboolean
 data_cal_migrate_rename (const gchar *old_filename,
@@ -358,7 +358,7 @@ data_cal_migrate_to_user_data_dir (const gchar *old_base_dir)
 }
 
 void
-e_data_cal_migrate (void)
+e_data_cal_migrate_basedir (void)
 {
 	const gchar *home_dir;
 	gchar *old_base_dir;