[gnome-initial-setup] Put GOA page before accounts

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

commit af1e94f5c0443833a9dbd2833320751d7d0d74f2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Oct 22 00:42:08 2013 -0400

    Put GOA page before accounts
    
    And fix up the order in the rest of the files

 .gitignore                                |    4 ++--
 configure.ac                              |    6 +++---
 gnome-initial-setup/Makefile.am           |    2 +-
 gnome-initial-setup/gnome-initial-setup.c |    2 +-
 gnome-initial-setup/pages/Makefile.am     |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 10997ed..7c6c7db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,12 +52,12 @@ gnome-initial-setup/pages/language/language-resources.[ch]
 gnome-initial-setup/pages/keyboard/keyboard-resources.[ch]
 gnome-initial-setup/pages/eulas/eulas-resources.[ch]
 gnome-initial-setup/pages/network/network-resources.[ch]
-gnome-initial-setup/pages/account/account-resources.[ch]
-gnome-initial-setup/pages/account/um-realm-generated.[ch]
 gnome-initial-setup/pages/timezone/timedated.[ch]
 gnome-initial-setup/pages/timezone/cc-datetime-resources.[ch]
 gnome-initial-setup/pages/timezone/timezone-resources.[ch]
 gnome-initial-setup/pages/goa/goa-resources.[ch]
+gnome-initial-setup/pages/account/account-resources.[ch]
+gnome-initial-setup/pages/account/um-realm-generated.[ch]
 gnome-initial-setup/pages/summary/summary-resources.[ch]
 
 gnome-initial-setup-first-login.desktop
diff --git a/configure.ac b/configure.ac
index 51bb412..9ed91df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,13 +101,13 @@ data/Makefile
 gnome-initial-setup/Makefile
 gnome-initial-setup/pages/Makefile
 gnome-initial-setup/pages/language/Makefile
+gnome-initial-setup/pages/keyboard/Makefile
 gnome-initial-setup/pages/eulas/Makefile
-gnome-initial-setup/pages/account/Makefile
-gnome-initial-setup/pages/timezone/Makefile
 gnome-initial-setup/pages/network/Makefile
+gnome-initial-setup/pages/timezone/Makefile
 gnome-initial-setup/pages/goa/Makefile
+gnome-initial-setup/pages/account/Makefile
 gnome-initial-setup/pages/summary/Makefile
-gnome-initial-setup/pages/keyboard/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 04ba0e6..478f7f5 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -33,8 +33,8 @@ gnome_initial_setup_LDADD =   \
        pages/eulas/libgiseulas.la \
        pages/network/libgisnetwork.la \
        pages/timezone/libgistimezone.la \
-       pages/account/libgisaccount.la \
        pages/goa/libgisgoa.la \
+       pages/account/libgisaccount.la \
        pages/summary/libgissummary.la \
        $(INITIAL_SETUP_LIBS) \
        -lm
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 8188c4a..852837d 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -69,9 +69,9 @@ static PageData page_table[] = {
   PAGE (keyboard),
   PAGE (eula),
   PAGE (network),
-  PAGE (account),
   PAGE (timezone),
   PAGE (goa),
+  PAGE (account),
   PAGE (summary),
   { NULL },
 };
diff --git a/gnome-initial-setup/pages/Makefile.am b/gnome-initial-setup/pages/Makefile.am
index fac7bd9..c52def6 100644
--- a/gnome-initial-setup/pages/Makefile.am
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
        keyboard \
        eulas \
        network \
-       account \
        timezone \
        goa \
+       account \
        summary