[gnome-initial-setup] welcome-page: Rename to language-page

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

commit 2893dab9a96e616ebbbb858d4392d0a19b14f9d4
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jul 12 20:04:13 2012 -0400

    welcome-page: Rename to language-page

 gnome-initial-setup/Makefile.am                    |    4 +-
 .../{gis-welcome-page.c => gis-language-page.c}    |   22 ++++++++++----------
 gnome-initial-setup/gis-language-page.h            |   14 ++++++++++++
 .../{gis-welcome-page.ui => gis-language-page.ui}  |    4 +-
 gnome-initial-setup/gis-welcome-page.h             |   14 ------------
 gnome-initial-setup/gnome-initial-setup.c          |    4 +-
 gnome-initial-setup/setup.gresource.xml            |    2 +-
 7 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 45c39f6..80f1d1b 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -28,7 +28,7 @@ BUILT_SOURCES += timedated.c timedated.h
 
 UI_FILES = \
 	setup.ui \
-	gis-welcome-page.ui \
+	gis-language-page.ui \
 	gis-network-page.ui \
 	gis-account-page.ui \
 	gis-location-page.ui \
@@ -50,7 +50,7 @@ gnome_initial_setup_SOURCES =	\
 	cc-notebook.c cc-notebook.h \
 	gis-assistant.c gis-assistant.h \
 	gis-utils.c gis-utils.h \
-	gis-welcome-page.c gis-welcome-page.h \
+	gis-language-page.c gis-language-page.h \
 	gis-eula-pages.c gis-eula-pages.h \
 	gis-location-page.c gis-location-page.h \
 	gis-account-page.c gis-account-page.h \
diff --git a/gnome-initial-setup/gis-welcome-page.c b/gnome-initial-setup/gis-language-page.c
similarity index 93%
rename from gnome-initial-setup/gis-welcome-page.c
rename to gnome-initial-setup/gis-language-page.c
index fae06c3..8eedd0e 100644
--- a/gnome-initial-setup/gis-welcome-page.c
+++ b/gnome-initial-setup/gis-language-page.c
@@ -1,9 +1,9 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-/* Welcome page {{{1 */
+/* Language page {{{1 */
 
 #include "config.h"
-#include "gis-welcome-page.h"
+#include "gis-language-page.h"
 
 #include <locale.h>
 #include <glib/gi18n.h>
@@ -17,9 +17,9 @@
 #define OBJ(type,name) ((type)gtk_builder_get_object(builder,(name)))
 #define WID(name) OBJ(GtkWidget*,name)
 
-typedef struct _WelcomeData WelcomeData;
+typedef struct _LanguageData LanguageData;
 
-struct _WelcomeData {
+struct _LanguageData {
   SetupData *setup;
 
   GtkWidget *show_all;
@@ -36,7 +36,7 @@ enum {
 };
 
 static void
-sync_language (WelcomeData *data)
+sync_language (LanguageData *data)
 {
   setlocale (LC_MESSAGES, data->locale_id);
 
@@ -184,7 +184,7 @@ language_visible (GtkTreeModel *model,
                   GtkTreeIter  *iter,
                   gpointer      user_data)
 {
-  WelcomeData *data = user_data;
+  LanguageData *data = user_data;
   gboolean is_extra;
 
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->show_all)))
@@ -198,11 +198,11 @@ language_visible (GtkTreeModel *model,
 }
 
 void
-gis_prepare_welcome_page (SetupData *setup)
+gis_prepare_language_page (SetupData *setup)
 {
-  WelcomeData *data;
+  LanguageData *data;
   GisAssistant *assistant = gis_get_assistant (setup);
-  GtkBuilder *builder = gis_builder ("gis-welcome-page");
+  GtkBuilder *builder = gis_builder ("gis-language-page");
   GtkListStore *liststore;
   GtkTreeModel *filter;
   GtkTreeView *treeview;
@@ -212,10 +212,10 @@ gis_prepare_welcome_page (SetupData *setup)
                                   G_TYPE_STRING,
                                   G_TYPE_BOOLEAN);
 
-  data = g_slice_new0 (WelcomeData);
+  data = g_slice_new0 (LanguageData);
   data->setup = setup;
   data->locale_id = cc_common_language_get_current_language ();
-  data->page = WID ("welcome-page");
+  data->page = WID ("language-page");
   data->show_all = WID ("language-show-all");
   data->liststore = GTK_TREE_MODEL (liststore);
   gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (liststore),
diff --git a/gnome-initial-setup/gis-language-page.h b/gnome-initial-setup/gis-language-page.h
new file mode 100644
index 0000000..b6b2058
--- /dev/null
+++ b/gnome-initial-setup/gis-language-page.h
@@ -0,0 +1,14 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef __GIS_LANGUAGE_PAGE_H__
+#define __GIS_LANGUAGE_PAGE_H__
+
+#include "gnome-initial-setup.h"
+
+G_BEGIN_DECLS
+
+void gis_prepare_language_page (SetupData *setup);
+
+G_END_DECLS
+
+#endif /* __GIS_LANGUAGE_PAGE_H__ */
diff --git a/gnome-initial-setup/gis-welcome-page.ui b/gnome-initial-setup/gis-language-page.ui
similarity index 95%
rename from gnome-initial-setup/gis-welcome-page.ui
rename to gnome-initial-setup/gis-language-page.ui
index 2f59c30..0fe48d0 100644
--- a/gnome-initial-setup/gis-welcome-page.ui
+++ b/gnome-initial-setup/gis-language-page.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <object class="GtkBox" id="welcome-page">
-    <property name="name">welcome-page</property>
+  <object class="GtkBox" id="language-page">
+    <property name="name">language-page</property>
     <property name="visible">True</property>
     <property name="orientation">vertical</property>
     <child>
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 83f8758..96430a5 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -14,7 +14,7 @@
 
 #include "gis-assistant.h"
 
-#include "gis-welcome-page.h"
+#include "gis-language-page.h"
 #include "gis-eula-pages.h"
 #include "gis-location-page.h"
 #include "gis-account-page.h"
@@ -87,7 +87,7 @@ prepare_main_window (SetupData *setup)
   g_signal_connect (setup->assistant, "prepare",
                     G_CALLBACK (prepare_cb), setup);
 
-  gis_prepare_welcome_page (setup);
+  gis_prepare_language_page (setup);
   gis_prepare_eula_pages (setup);
   gis_prepare_network_page (setup);
   gis_prepare_account_page (setup);
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index c09e697..07ebb61 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">setup.ui</file>
-    <file preprocess="xml-stripblanks">gis-welcome-page.ui</file>
+    <file preprocess="xml-stripblanks">gis-language-page.ui</file>
     <file preprocess="xml-stripblanks">gis-network-page.ui</file>
     <file preprocess="xml-stripblanks">gis-account-page.ui</file>
     <file preprocess="xml-stripblanks">gis-location-page.ui</file>