[gnome-initial-setup] summary, copy-worker: Use a more X-macros-like approach to define files

[Jasper St. Pierre <jstpierre src gnome org>]

commit 7c718ff5d1e692ae00764292cfe4920ea9df1e06
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Oct 4 18:35:44 2012 -0300

    summary, copy-worker: Use a more X-macros-like approach to define files

 .../gnome-initial-setup-copy-worker.c              |    8 ++++----
 .../pages/summary/gis-summary-page.c               |    9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/gnome-initial-setup/gnome-initial-setup-copy-worker.c b/gnome-initial-setup/gnome-initial-setup-copy-worker.c
index 7a39f35..1280714 100644
--- a/gnome-initial-setup/gnome-initial-setup-copy-worker.c
+++ b/gnome-initial-setup/gnome-initial-setup-copy-worker.c
@@ -65,13 +65,13 @@ main (int    argc,
 
   ret = 1;
 
-#define MOVE(d, x)                                                      \
+#define FILE(d, x)                                                      \
   if (!move_file_from_tmpfs (src, g_get_user_##d##_dir (), x))          \
     goto out;
 
-  MOVE (config, "dconf/user");
-  MOVE (config, "goa-1.0/accounts.conf");
-  MOVE (data, "keyrings/Default.keyring");
+  FILE (config, "dconf/user");
+  FILE (config, "goa-1.0/accounts.conf");
+  FILE (data, "keyrings/Default.keyring");
 
   if (!g_file_delete (src, NULL, &error))
     {
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index f4461ad..ed5dbad 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -155,9 +155,12 @@ copy_files_to_tmpfs (SummaryData *data)
     goto out;
   }
 
-  copy_file_to_tmpfs (dest, g_get_user_config_dir (), "dconf/user", user);
-  copy_file_to_tmpfs (dest, g_get_user_config_dir (), "goa-1.0/accounts.conf", user);
-  copy_file_to_tmpfs (dest, g_get_user_data_dir (), "keyrings/Default.keyring", user);
+#define FILE(d, x)                                                      \
+  copy_file_to_tmpfs (dest, g_get_user_##d##_dir (), x, user);          \
+
+  FILE (config, "dconf/user");
+  FILE (config, "goa-1.0/accounts.conf");
+  FILE (data, "keyrings/Default.keyring");
 
  out:
   g_free (dest);