# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1105645054 0
# Node ID 8f1316d77315abe6b1bfc118f3feff4c1513e028
# Parent  ab7dd4d5093610f71825e0f93788279af0ce476f
[gaim-migrate @ 11814]
Prevent the login progress going backwards if MSN decides to throw an extra
step into the login process. And a spelling fix.

committer: Tailor Script <tailor@pidgin.im>

diff -r ab7dd4d50936 -r 8f1316d77315 src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Thu Jan 13 19:33:10 2005 +0000
+++ b/src/protocols/msn/notification.c	Thu Jan 13 19:37:34 2005 +0000
@@ -112,7 +112,13 @@
 	vers = g_strjoinv(" ", a);
 
 	if (!session->logged_in)
-		msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE);
+	{
+		if (session->login_step == MSN_LOGIN_STEP_START)
+			msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE);
+		else
+			msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2);
+	}
+
 	msn_cmdproc_send(cmdproc, "VER", "%s", vers);
 
 	g_strfreev(a);
diff -r ab7dd4d50936 -r 8f1316d77315 src/protocols/msn/session.c
--- a/src/protocols/msn/session.c	Thu Jan 13 19:33:10 2005 +0000
+++ b/src/protocols/msn/session.c	Thu Jan 13 19:37:34 2005 +0000
@@ -331,7 +331,8 @@
 	const char *steps_text[] = {
 		_("Connecting"),
 		_("Handshaking"),
-		_("Transfering"),
+		_("Transferring"),
+		_("Handshaking"),
 		_("Starting authentication"),
 		_("Getting cookie"),
 		_("Authenticating"),
diff -r ab7dd4d50936 -r 8f1316d77315 src/protocols/msn/session.h
--- a/src/protocols/msn/session.h	Thu Jan 13 19:33:10 2005 +0000
+++ b/src/protocols/msn/session.h	Thu Jan 13 19:37:34 2005 +0000
@@ -63,6 +63,7 @@
 	MSN_LOGIN_STEP_START,
 	MSN_LOGIN_STEP_HANDSHAKE,
 	MSN_LOGIN_STEP_TRANSFER,
+	MSN_LOGIN_STEP_HANDSHAKE2,
 	MSN_LOGIN_STEP_AUTH_START,
 	MSN_LOGIN_STEP_AUTH,
 	MSN_LOGIN_STEP_GET_COOKIE,