[gnome-initial-setup] gis-page: Remove get_builder vfunc

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

commit 0e06bbcbc6a5ed39dba5040c8e768de56a0e46b7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Oct 30 17:26:13 2013 -0400

    gis-page: Remove get_builder vfunc
    
    All pages now use composite widget templates

 gnome-initial-setup/gis-page.c                     |   38 --------------------
 gnome-initial-setup/gis-page.h                     |    2 -
 .../pages/account/gis-account-page.c               |    8 ----
 gnome-initial-setup/pages/eulas/gis-eula-page.c    |    8 ----
 gnome-initial-setup/pages/goa/gis-goa-page.c       |    8 ----
 .../pages/keyboard/gis-keyboard-page.c             |    8 ----
 .../pages/language/gis-language-page.c             |    8 ----
 .../pages/network/gis-network-page.c               |    8 ----
 .../pages/summary/gis-summary-page.c               |    8 ----
 .../pages/timezone/gis-timezone-page.c             |    8 ----
 10 files changed, 0 insertions(+), 104 deletions(-)
---
diff --git a/gnome-initial-setup/gis-page.c b/gnome-initial-setup/gis-page.c
index d27547d..65d597a 100644
--- a/gnome-initial-setup/gis-page.c
+++ b/gnome-initial-setup/gis-page.c
@@ -140,51 +140,14 @@ gis_page_dispose (GObject *object)
     g_cancellable_cancel (priv->apply_cancel);
 
   g_clear_object (&page->driver);
-  g_clear_object (&page->builder);
 
   G_OBJECT_CLASS (gis_page_parent_class)->dispose (object);
 }
 
-static GtkBuilder *
-gis_page_real_get_builder (GisPage *page)
-{
-  GisPageClass *klass = GIS_PAGE_GET_CLASS (page);
-  GtkBuilder *builder;
-  gchar *resource_path;
-  GError *error = NULL;
-
-  if (klass->page_id == NULL)
-    {
-      g_warning ("Null page ID. Won't construct builder.");
-      return NULL;
-    }
-
-  resource_path = g_strdup_printf ("/org/gnome/initial-setup/gis-%s-page.ui", klass->page_id);
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, resource_path, &error);
-
-  if (error != NULL) {
-    g_warning ("Error while loading %s: %s", resource_path, error->message);
-    g_free (resource_path);
-    g_error_free (error);
-    goto err;
-  }
-
-  g_free (resource_path);
-  return builder;
- err:
-  g_object_unref (builder);
-  return NULL;
-}
-
 static void
 gis_page_constructed (GObject *object)
 {
   GisPage *page = GIS_PAGE (object);
-  GisPageClass *klass = GIS_PAGE_GET_CLASS (page);
-
-  page->builder = klass->get_builder (page);
 
   gis_page_locale_changed (page);
 
@@ -209,7 +172,6 @@ gis_page_class_init (GisPageClass *klass)
   object_class->get_property = gis_page_get_property;
   object_class->set_property = gis_page_set_property;
 
-  klass->get_builder = gis_page_real_get_builder;
   klass->apply = gis_page_real_apply;
 
   obj_props[PROP_DRIVER] =
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index 2be72df..77cf953 100644
--- a/gnome-initial-setup/gis-page.h
+++ b/gnome-initial-setup/gis-page.h
@@ -48,7 +48,6 @@ struct _GisPage
   GtkBin parent;
 
   GisDriver *driver;
-  GtkBuilder *builder;
 
   GisAssistantPagePrivate *assistant_priv;
 };
@@ -58,7 +57,6 @@ struct _GisPageClass
   GtkBinClass parent_class;
   char *page_id;
 
-  GtkBuilder * (*get_builder) (GisPage *page);
   void         (*locale_changed) (GisPage *page);
   gboolean     (*apply) (GisPage *page,
                          GCancellable *cancellable);
diff --git a/gnome-initial-setup/pages/account/gis-account-page.c 
b/gnome-initial-setup/pages/account/gis-account-page.c
index d849895..c073a77 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.c
+++ b/gnome-initial-setup/pages/account/gis-account-page.c
@@ -1157,13 +1157,6 @@ gis_account_page_locale_changed (GisPage *page)
   gis_page_set_title (GIS_PAGE (page), _("Login"));
 }
 
-static GtkBuilder *
-gis_account_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static void
 gis_account_page_class_init (GisAccountPageClass *klass)
 {
@@ -1196,7 +1189,6 @@ gis_account_page_class_init (GisAccountPageClass *klass)
 
   page_class->page_id = PAGE_ID;
   page_class->locale_changed = gis_account_page_locale_changed;
-  page_class->get_builder = gis_account_page_get_builder;
   page_class->apply = gis_account_page_apply;
   page_class->save_data = gis_account_page_save_data;
   object_class->constructed = gis_account_page_constructed;
diff --git a/gnome-initial-setup/pages/eulas/gis-eula-page.c b/gnome-initial-setup/pages/eulas/gis-eula-page.c
index 9922749..2c3ee08 100644
--- a/gnome-initial-setup/pages/eulas/gis-eula-page.c
+++ b/gnome-initial-setup/pages/eulas/gis-eula-page.c
@@ -316,13 +316,6 @@ gis_eula_page_locale_changed (GisPage *page)
   gis_page_set_title (GIS_PAGE (page), _("License Agreements"));
 }
 
-static GtkBuilder *
-gis_eula_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static void
 gis_eula_page_class_init (GisEulaPageClass *klass)
 {
@@ -336,7 +329,6 @@ gis_eula_page_class_init (GisEulaPageClass *klass)
 
   page_class->page_id = PAGE_ID;
   page_class->locale_changed = gis_eula_page_locale_changed;
-  page_class->get_builder = gis_eula_page_get_builder;
   object_class->get_property = gis_eula_page_get_property;
   object_class->set_property = gis_eula_page_set_property;
   object_class->constructed = gis_eula_page_constructed;
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
index c467f25..88eae3b 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -334,13 +334,6 @@ gis_goa_page_locale_changed (GisPage *page)
   gis_page_set_title (GIS_PAGE (page), _("Online Accounts"));
 }
 
-static GtkBuilder *
-gis_goa_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static void
 gis_goa_page_class_init (GisGoaPageClass *klass)
 {
@@ -353,7 +346,6 @@ gis_goa_page_class_init (GisGoaPageClass *klass)
 
   page_class->page_id = PAGE_ID;
   page_class->locale_changed = gis_goa_page_locale_changed;
-  page_class->get_builder = gis_goa_page_get_builder;
   object_class->constructed = gis_goa_page_constructed;
   object_class->dispose = gis_goa_page_dispose;
 }
diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 
b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
index 804cdfe..8ee5353 100644
--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
@@ -160,13 +160,6 @@ gis_keyboard_page_locale_changed (GisPage *page)
         gis_page_set_title (GIS_PAGE (page), _("Typing"));
 }
 
-static GtkBuilder *
-gis_keyboard_page_get_builder (GisPage *page)
-{
-        /* handled by widget templates */
-        return NULL;
-}
-
 static void
 gis_keyboard_page_class_init (GisKeyboardPageClass * klass)
 {
@@ -184,7 +177,6 @@ gis_keyboard_page_class_init (GisKeyboardPageClass * klass)
 
         page_class->page_id = PAGE_ID;
         page_class->locale_changed = gis_keyboard_page_locale_changed;
-        page_class->get_builder = gis_keyboard_page_get_builder;
         object_class->constructed = gis_keyboard_page_constructed;
        object_class->finalize = gis_keyboard_page_finalize;
 }
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c 
b/gnome-initial-setup/pages/language/gis-language-page.c
index 4da367b..576d8ab 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -227,13 +227,6 @@ gis_language_page_locale_changed (GisPage *page)
   gis_page_set_title (GIS_PAGE (page), _("Welcome"));
 }
 
-static GtkBuilder *
-gis_language_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static void
 gis_language_page_dispose (GObject *object)
 {
@@ -258,7 +251,6 @@ gis_language_page_class_init (GisLanguagePageClass *klass)
 
   page_class->page_id = PAGE_ID;
   page_class->locale_changed = gis_language_page_locale_changed;
-  page_class->get_builder = gis_language_page_get_builder;
   object_class->constructed = gis_language_page_constructed;
   object_class->dispose = gis_language_page_dispose;
 }
diff --git a/gnome-initial-setup/pages/network/gis-network-page.c 
b/gnome-initial-setup/pages/network/gis-network-page.c
index 80d1631..485e365 100644
--- a/gnome-initial-setup/pages/network/gis-network-page.c
+++ b/gnome-initial-setup/pages/network/gis-network-page.c
@@ -600,13 +600,6 @@ gis_network_page_locale_changed (GisPage *page)
   gis_page_set_title (GIS_PAGE (page), _("Network"));
 }
 
-static GtkBuilder *
-gis_network_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static void
 gis_network_page_class_init (GisNetworkPageClass *klass)
 {
@@ -622,7 +615,6 @@ gis_network_page_class_init (GisNetworkPageClass *klass)
 
   page_class->page_id = PAGE_ID;
   page_class->locale_changed = gis_network_page_locale_changed;
-  page_class->get_builder = gis_network_page_get_builder;
   object_class->constructed = gis_network_page_constructed;
   object_class->dispose = gis_network_page_dispose;
 }
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c 
b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 50d9eec..c418d8c 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -273,13 +273,6 @@ gis_summary_page_shown (GisPage *page)
                                    &priv->user_password);
 }
 
-static GtkBuilder *
-gis_summary_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static char *
 get_item (const char *buffer, const char *name)
 {
@@ -373,7 +366,6 @@ gis_summary_page_class_init (GisSummaryPageClass *klass)
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisSummaryPage, 
start_button_label);
 
   page_class->page_id = PAGE_ID;
-  page_class->get_builder = gis_summary_page_get_builder;
   page_class->locale_changed = gis_summary_page_locale_changed;
   page_class->shown = gis_summary_page_shown;
   object_class->constructed = gis_summary_page_constructed;
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.c 
b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
index 6a70169..3b6f214 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.c
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
@@ -344,13 +344,6 @@ gis_timezone_page_locale_changed (GisPage *page)
   gis_page_set_title (GIS_PAGE (page), _("Time Zone"));
 }
 
-static GtkBuilder *
-gis_timezone_page_get_builder (GisPage *page)
-{
-  /* handled by widget templates */
-  return NULL;
-}
-
 static void
 gis_timezone_page_class_init (GisTimezonePageClass *klass)
 {
@@ -367,7 +360,6 @@ gis_timezone_page_class_init (GisTimezonePageClass *klass)
 
   page_class->page_id = PAGE_ID;
   page_class->locale_changed = gis_timezone_page_locale_changed;
-  page_class->get_builder = gis_timezone_page_get_builder;
   object_class->constructed = gis_timezone_page_constructed;
   object_class->dispose = gis_timezone_page_dispose;
 }