[gnome-initial-setup] Define and have a standard set of page IDs everywhere

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

commit 752745a37caab44bd2b38ce3f70fd2b69b34997b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Oct 31 15:17:54 2012 -0400

    Define and have a standard set of page IDs everywhere

 gnome-initial-setup/gis-page.c                     |    4 ++--
 .../pages/account/gis-account-page.c               |    4 +++-
 gnome-initial-setup/pages/goa/gis-goa-page.c       |    4 +++-
 .../pages/language/gis-language-page.c             |    4 +++-
 .../pages/location/gis-location-page.c             |    4 +++-
 .../pages/network/gis-network-page.c               |    4 +++-
 .../pages/summary/gis-summary-page.c               |    4 +++-
 7 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/gnome-initial-setup/gis-page.c b/gnome-initial-setup/gis-page.c
index 9049cc2..c9180e7 100644
--- a/gnome-initial-setup/gis-page.c
+++ b/gnome-initial-setup/gis-page.c
@@ -8,10 +8,10 @@
 #include <stdlib.h>
 
 GtkBuilder *
-gis_builder (gchar *resource)
+gis_builder (gchar *page_id)
 {
   GtkBuilder *builder;
-  gchar *resource_path = g_strdup_printf ("/ui/%s.ui", resource);
+  gchar *resource_path = g_strdup_printf ("/ui/gis-%s-page.ui", page_id);
   GError *error = NULL;
 
   builder = gtk_builder_new ();
diff --git a/gnome-initial-setup/pages/account/gis-account-page.c b/gnome-initial-setup/pages/account/gis-account-page.c
index 297d982..2a94653 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.c
+++ b/gnome-initial-setup/pages/account/gis-account-page.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#define PAGE_ID "account"
+
 /* Account page {{{1 */
 
 #include "config.h"
@@ -929,7 +931,7 @@ gis_prepare_account_page (SetupData *setup)
   GtkWidget *local_account_avatar_button;
   AccountData *data = g_slice_new0 (AccountData);
   GisAssistant *assistant = gis_get_assistant (setup);
-  data->builder = gis_builder ("gis-account-page");
+  data->builder = gis_builder (PAGE_ID);
   data->setup = setup;
   data->widget = WID("account-page");
 
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
index db006f1..1575d34 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#define PAGE_ID "goa"
+
 /* Online accounts page {{{1 */
 
 #include "config.h"
@@ -277,7 +279,7 @@ gis_prepare_online_page (SetupData *setup)
   GoaData *data = g_slice_new0 (GoaData);
   GisAssistant *assistant = gis_get_assistant (setup);
   data->setup = setup;
-  data->builder = gis_builder ("gis-goa-page");
+  data->builder = gis_builder (PAGE_ID);
   data->goa_client = goa_client_new_sync (NULL, &error);
 
   if (data->goa_client == NULL)
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c b/gnome-initial-setup/pages/language/gis-language-page.c
index 23427ad..cd52a26 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#define PAGE_ID "language"
+
 /* Language page {{{1 */
 
 #include "config.h"
@@ -234,7 +236,7 @@ gis_prepare_language_page (SetupData *setup)
 {
   LanguageData *data;
   GisAssistant *assistant = gis_get_assistant (setup);
-  GtkBuilder *builder = gis_builder ("gis-language-page");
+  GtkBuilder *builder = gis_builder (PAGE_ID);
   GtkListStore *liststore;
   GtkTreeModel *filter;
   GtkTreeView *treeview;
diff --git a/gnome-initial-setup/pages/location/gis-location-page.c b/gnome-initial-setup/pages/location/gis-location-page.c
index 5c6248c..d864afe 100644
--- a/gnome-initial-setup/pages/location/gis-location-page.c
+++ b/gnome-initial-setup/pages/location/gis-location-page.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#define PAGE_ID "location"
+
 /* Location page {{{1 */
 
 #include "config.h"
@@ -243,7 +245,7 @@ gis_prepare_location_page (SetupData *setup)
   const gchar *timezone;
   LocationData *data = g_slice_new0 (LocationData);
   GisAssistant *assistant = gis_get_assistant (setup);
-  data->builder = gis_builder ("gis-location-page");;
+  data->builder = gis_builder (PAGE_ID);
 
   frame = WID("location-map-frame");
 
diff --git a/gnome-initial-setup/pages/network/gis-network-page.c b/gnome-initial-setup/pages/network/gis-network-page.c
index d32a643..d940b4b 100644
--- a/gnome-initial-setup/pages/network/gis-network-page.c
+++ b/gnome-initial-setup/pages/network/gis-network-page.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#define PAGE_ID "network"
+
 /* Network page {{{1 */
 
 #include "config.h"
@@ -604,7 +606,7 @@ gis_prepare_network_page (SetupData *setup)
   GisAssistant *assistant = gis_get_assistant (setup);
 
   data->setup = setup;
-  data->builder = gis_builder ("gis-network-page");
+  data->builder = gis_builder (PAGE_ID);
 
   col = OBJ(GtkTreeViewColumn*, "network-list-column");
 
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 4622d1a..0948d0a 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#define PAGE_ID "summary"
+
 #include "config.h"
 #include "gis-summary-page.h"
 
@@ -288,7 +290,7 @@ get_builder (void)
   g_clear_error (&error);
 
   {
-    char *resource_path = "/ui/gis-summary-page.ui";
+    char *resource_path = "/ui/gis-" PAGE_ID "-page.ui";
     gtk_builder_add_from_resource (builder, resource_path, &error);
 
     if (error != NULL) {