[empathy] Display the salut page after the create one

[Guillaume Desmottes <gdesmott src gnome org>]

commit cc1003c0f40aa8165194c0412a63da672ce0e869
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Jan 21 17:34:31 2010 +0000

    Display the salut page after the create one

 src/empathy-account-assistant.c |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 689147e..565da70 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -236,7 +236,7 @@ account_assistant_reset_enter_create_page (EmpathyAccountAssistant *self)
   page = account_assistant_build_enter_or_create_page (self);
   idx = gtk_assistant_append_page (GTK_ASSISTANT (self), page);
   gtk_assistant_set_page_type (GTK_ASSISTANT (self), page,
-      GTK_ASSISTANT_PAGE_CONFIRM);
+      GTK_ASSISTANT_PAGE_INTRO);
   priv->enter_or_create_page = page;
 
   gtk_assistant_set_current_page (GTK_ASSISTANT (self), idx);
@@ -510,19 +510,21 @@ account_assistant_page_forward_func (gint current_page,
       else if (priv->first_resp == RESPONSE_SALUT_ONLY)
         retval = PAGE_SALUT;
     }
-
-  if (current_page == PAGE_IMPORT)
-    retval = PAGE_SALUT;
-
+  else if (current_page == PAGE_IMPORT)
+    {
+      retval = PAGE_SALUT;
+    }
   else if (current_page >= PAGE_ENTER_CREATE)
-    /* don't forward anymore */
-    retval = -1;
-
-  if (current_page >= PAGE_ENTER_CREATE &&
-      priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
     {
-      priv->enter_create_forward = TRUE;
-      retval = current_page;
+      if (priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
+        {
+          priv->enter_create_forward = TRUE;
+          retval = current_page;
+        }
+      else
+        {
+          retval = PAGE_SALUT;
+        }
     }
 
   return retval;
@@ -727,11 +729,6 @@ account_assistant_radio_create_again_clicked_cb (GtkButton *button,
           "response"));
 
   priv->create_enter_resp = response;
-
-  gtk_assistant_set_page_type (GTK_ASSISTANT (self),
-      priv->enter_or_create_page,
-      (response == RESPONSE_CREATE_AGAIN) ?
-      GTK_ASSISTANT_PAGE_CONTENT : GTK_ASSISTANT_PAGE_CONFIRM);
 }
 
 static GtkWidget *
@@ -1164,7 +1161,7 @@ do_constructed (GObject *object)
   /* third page (enter account details) */
   page = account_assistant_build_enter_or_create_page (self);
   gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
+  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_INTRO);
   priv->enter_or_create_page = page;
 
   /* fourth page (salut details) */