[epiphany/profile-migrator-diego: 9/12] e-profile-migrator: update gnome2_to_xdg

[Diego Escalante Urrelo <diegoe src gnome org>]

commit 01a63ff8e81973a72caed1933f83300610bac31d
Author: Diego Escalante Urrelo <diegoe igalia com>
Date:   Mon Sep 3 05:19:11 2012 -0500

    e-profile-migrator: update gnome2_to_xdg

 lib/ephy-profile-migrator.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index 8eeb391..62a0985 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -767,8 +767,11 @@ migrate_profile (const char *old_dir,
   g_free (updated);
 }
 
-static void
-migrate_profile_gnome2_to_xdg ()
+static gboolean
+migrate_profile_gnome2_to_xdg (const char *profile_dir,
+                               const char *dest_dir,
+                               gboolean dry_run,
+                               gpointer data)
 {
   char *old_dir;
   char *new_dir;
@@ -781,10 +784,15 @@ migrate_profile_gnome2_to_xdg ()
                               "epiphany",
                               NULL);
 
-  migrate_profile (old_dir, new_dir);
+  if (dry_run)
+    LOG ("[gnome2_to_xdg] DR: Moving from %s to %s", old_dir, new_dir);
+  else
+    migrate_profile (old_dir, new_dir);
 
   g_free (new_dir);
   g_free (old_dir);
+
+  return TRUE;
 }
 
 static char *
@@ -966,7 +974,7 @@ ephy_migrator ()
 
   /* Always try to migrate the data from the old profile dir at the
    * very beginning. */
-  migrate_profile_gnome2_to_xdg ();
+  migrate_profile_gnome2_to_xdg (NULL, NULL, FALSE, NULL);
 
   /* If after this point there's no profile dir, there's no point in
    * running anything because Epiphany has never run in this sytem, so