[gnome-initial-setup] Reorder page lists in various modules to reflect actual page order

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

commit 5fdfba4d5b607cfc53c926cbe26a2c3d8f5fa4c9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jan 24 17:55:06 2013 -0500

    Reorder page lists in various modules to reflect actual page order

 gnome-initial-setup/Makefile.am           |    8 ++++----
 gnome-initial-setup/gnome-initial-setup.c |    6 +++---
 gnome-initial-setup/pages/Makefile.am     |    8 ++++----
 gnome-initial-setup/setup.gresource.xml   |    8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 72c4469..81d1f4a 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -17,14 +17,14 @@ UI_FILES = \
 	pages/welcome/welcome-image.png \
 	pages/welcome/gis-welcome-page.ui \
 	pages/language/gis-language-page.ui \
+	pages/keyboard/gis-keyboard-page.ui \
+	pages/keyboard/gnome-region-panel-input-chooser.ui \
 	pages/eulas/gis-eula-page.ui \
 	pages/network/gis-network-page.ui \
 	pages/account/gis-account-page.ui \
 	pages/location/gis-location-page.ui \
 	pages/goa/gis-goa-page.ui \
-	pages/summary/gis-summary-page.ui \
-	pages/keyboard/gis-keyboard-page.ui \
-	pages/keyboard/gnome-region-panel-input-chooser.ui
+	pages/summary/gis-summary-page.ui
 
 setup_resources.c: setup.gresource.xml $(UI_FILES)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
@@ -49,13 +49,13 @@ endif
 gnome_initial_setup_LDADD =	\
 	pages/welcome/libgiswelcome.la \
 	pages/language/libgislanguage.la \
+	pages/keyboard/libgiskeyboard.la \
 	pages/eulas/libgiseulas.la \
 	pages/network/libgisnetwork.la \
 	pages/location/libgislocation.la \
 	pages/account/libgisaccount.la \
 	pages/goa/libgisgoa.la \
 	pages/summary/libgissummary.la \
-	pages/keyboard/libgiskeyboard.la \
 	$(INITIAL_SETUP_LIBS) \
 	-lm
 
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index f4d530f..77e4a6c 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -42,13 +42,13 @@
 
 #include "pages/welcome/gis-welcome-page.h"
 #include "pages/language/gis-language-page.h"
+#include "pages/keyboard/gis-keyboard-page.h"
 #include "pages/eulas/gis-eula-pages.h"
-#include "pages/location/gis-location-page.h"
-#include "pages/account/gis-account-page.h"
 #include "pages/network/gis-network-page.h"
+#include "pages/account/gis-account-page.h"
+#include "pages/location/gis-location-page.h"
 #include "pages/goa/gis-goa-page.h"
 #include "pages/summary/gis-summary-page.h"
-#include "pages/keyboard/gis-keyboard-page.h"
 
 /* main {{{1 */
 
diff --git a/gnome-initial-setup/pages/Makefile.am b/gnome-initial-setup/pages/Makefile.am
index 1bfb4a2..2cd99b2 100644
--- a/gnome-initial-setup/pages/Makefile.am
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -1,11 +1,11 @@
 
 SUBDIRS = \
+	welcome \
 	language \
+	keyboard \
 	eulas \
+	network \
 	account \
 	location \
-	network \
 	goa \
-	summary \
-	keyboard \
-	welcome
+	summary
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index a41da5d..0b23310 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/ui">
-    <file alias="welcome-image.png">pages/welcome/welcome-image.png</file>
     <file preprocess="xml-stripblanks" alias="gis-welcome-page.ui">pages/welcome/gis-welcome-page.ui</file>
+    <file alias="welcome-image.png">pages/welcome/welcome-image.png</file>
     <file preprocess="xml-stripblanks" alias="gis-language-page.ui">pages/language/gis-language-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-keyboard-page.ui">pages/keyboard/gis-keyboard-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gnome-region-panel-input-chooser.ui">pages/keyboard/gnome-region-panel-input-chooser.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-eula-page.ui">pages/eulas/gis-eula-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-network-page.ui">pages/network/gis-network-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-account-page.ui">pages/account/gis-account-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-location-page.ui">pages/location/gis-location-page.ui</file>
-    <file preprocess="xml-stripblanks" alias="gis-network-page.ui">pages/network/gis-network-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-goa-page.ui">pages/goa/gis-goa-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-summary-page.ui">pages/summary/gis-summary-page.ui</file>
-    <file preprocess="xml-stripblanks" alias="gis-keyboard-page.ui">pages/keyboard/gis-keyboard-page.ui</file>
-    <file preprocess="xml-stripblanks" alias="gnome-region-panel-input-chooser.ui">pages/keyboard/gnome-region-panel-input-chooser.ui</file>
   </gresource>
 </gresources>