[anjal] BUGFIX: GNOME Bugzilla #593197 - Fix strings in review page

[Srinivasa Ragavan <sragavan src gnome org>]

commit 0243187eb509d535421fc4cd0ab6f05f44efba76
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Thu Aug 27 10:53:52 2009 +0530

    BUGFIX: GNOME Bugzilla #593197 - Fix strings in review page
    	GNOME Bugzilla #593127 - Option for specific providers in edit
    	account.

 src/mail-account-view.c |   30 +++++++++++++++++++++---------
 src/mail-account-view.h |    5 +++--
 2 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/src/mail-account-view.c b/src/mail-account-view.c
index 0681352..66a5c02 100644
--- a/src/mail-account-view.c
+++ b/src/mail-account-view.c
@@ -358,14 +358,18 @@ create_review (MailAccountView *view)
 
 #define RECEIVE_DETAIL N_("Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried  to make a start with the details you just entered but you may need to change them.")
 
+#define RECEIVE_OPT_DETAIL N_("You can specify more options to configure the account.")
+
 #define SEND_DETAIL N_("Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure.")
 
-#define REVIEW_DETAIL N_("Time to check things over before we try and connect to the server and bring down your mail.")
+#define REVIEW_DETAIL N_("Time to check things over before we try and connect to the server and fetch your mail.")
 struct _page_text {
 	int id;
 	char *head;
 	char *next;
 	char *prev;
+	char *next_edit;
+	char *prev_edit;
 	char *detail;
 	char *path;
 	GtkWidget * (*create_page) (MailAccountView *view);
@@ -378,10 +382,12 @@ struct _page_text {
 	//{ MAV_SEND_PAGE, N_("Sending mail"), N_("Next - Review account"), N_("Back - Receiving mail"), SEND_DETAIL, create_send_page, fill_send, save_send},
 	//{ MAV_REVIEW_PAGE, N_("Review account"), N_("Finish"), N_("Back - Sending"), REVIEW_DETAIL, NULL, NULL, save_account},
 
-	{ MAV_IDENTITY_PAGE, N_("Identity"), N_("Next - Receiving mail"), NULL, IDENTITY_DETAIL, "00.identity",NULL, NULL, save_identity, validate_identity},
-	{ MAV_RECV_PAGE, N_("Receiving mail"), N_("Next - Sending mail"), N_("Back - Identity"), RECEIVE_DETAIL, "10.receive", NULL, NULL, NULL, NULL },
-	{ MAV_SEND_PAGE, N_("Sending mail"), N_("Next - Review account"), N_("Back - Receiving mail"), SEND_DETAIL, "30.send", NULL, NULL, NULL, NULL},
-	{ MAV_REVIEW_PAGE, N_("Review account"), N_("Finish"), N_("Back - Sending"), REVIEW_DETAIL, NULL, create_review, NULL, NULL},
+	{ MAV_IDENTITY_PAGE, N_("Identity"), N_("Next - Receiving mail"), NULL, N_("Next - Receiving mail"), NULL, IDENTITY_DETAIL, "00.identity",NULL, NULL, save_identity, validate_identity},
+	{ MAV_RECV_PAGE, N_("Receiving mail"), N_("Next - Sending mail"), N_("Back - Identity"), N_("Next - Receiving options"), N_("Back - Identity"), RECEIVE_DETAIL, "10.receive", NULL, NULL, NULL, NULL },
+	{ MAV_RECV_OPT_PAGE, N_("Receiving options"),  NULL, NULL, N_("Next - Sending mail"), N_("Back - Receiving mail"), RECEIVE_OPT_DETAIL, "10.receive", NULL, NULL, NULL, NULL },
+
+	{ MAV_SEND_PAGE, N_("Sending mail"), N_("Next - Review account"), N_("Back - Receiving mail"), N_("Next - Review account"), N_("Back - Receiving options"), SEND_DETAIL, "30.send", NULL, NULL, NULL, NULL},
+	{ MAV_REVIEW_PAGE, N_("Review account"), N_("Finish"), N_("Back - Sending"), N_("Finish"), N_("Back - Sending"), REVIEW_DETAIL, NULL, create_review, NULL, NULL},
 };
 
 static void
@@ -441,6 +447,9 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 
 	gtk_widget_hide (mav->pages[mav->current_page]->box);
 	mav->current_page++;
+	if (mav->current_page == MAV_RECV_OPT_PAGE && mav->original == NULL)
+		mav->current_page++; /* Skip recv options in new account creation. */
+
 	gtk_widget_show (mav->pages[mav->current_page]->box);
 	if (!mav->pages[mav->current_page]->done) {
 		mav->pages[mav->current_page]->done = TRUE;
@@ -460,6 +469,9 @@ mav_prev_pressed (GtkButton *button, MailAccountView *mav)
 
 	gtk_widget_hide (mav->pages[mav->current_page]->box);
 	mav->current_page--;
+	if (mav->current_page == MAV_RECV_OPT_PAGE && mav->original == NULL)
+		mav->current_page--; /* Skip recv options in new account creation. */
+
 	gtk_widget_show (mav->pages[mav->current_page]->box);
 
 }
@@ -519,13 +531,13 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
 		(*mail_account_pages[type].fill_page) (view);
 	}
 
-	if (mail_account_pages[type].prev) {
+	if ((view->original && mail_account_pages[type].prev_edit) || mail_account_pages[type].prev) {
 		box = gtk_hbox_new(FALSE, 0);
 		if (anjal_icon_decoration) {
 			tmp = gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON);
 			gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0);
 		}
-		tmp = gtk_label_new (_(mail_account_pages[type].prev));
+		tmp = gtk_label_new (_(view->original ? mail_account_pages[type].prev_edit : mail_account_pages[type].prev));
 		gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
 		page->prev = gtk_button_new ();
 		gtk_container_add ((GtkContainer *)page->prev, box);
@@ -533,9 +545,9 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
 		g_signal_connect(page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view);
 	}
 
-	if (mail_account_pages[type].next) {
+	if ((view->original && mail_account_pages[type].next_edit) || mail_account_pages[type].next) {
 		box = gtk_hbox_new(FALSE, 0);
-		tmp = gtk_label_new (_(mail_account_pages[type].next));
+		tmp = gtk_label_new (_(view->original ? mail_account_pages[type].next_edit : mail_account_pages[type].next));
 		gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
 		if (anjal_icon_decoration) {
 			tmp = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON);		
diff --git a/src/mail-account-view.h b/src/mail-account-view.h
index 4942641..a36fc53 100644
--- a/src/mail-account-view.h
+++ b/src/mail-account-view.h
@@ -43,6 +43,7 @@ typedef struct _MailAccountService MailAccountService;
 typedef enum {
 	MAV_IDENTITY_PAGE=0,
 	MAV_RECV_PAGE,
+	MAV_RECV_OPT_PAGE,
 	MAV_SEND_PAGE,
 	MAV_REVIEW_PAGE,
 	MAV_LAST,
@@ -71,9 +72,9 @@ typedef struct _MailAccountView {
 	GtkWidget *scroll;
 	GtkWidget *page_widget;
 
-	MAVPage *pages[4];
+	MAVPage *pages[5];
 	struct _EAccount *original;
-	GtkWidget *wpages[4];
+	GtkWidget *wpages[5];
 	int current_page;
 	struct _EMAccountEditor *edit;