gaim/gaim

Parents 911fc232e6dd
Children 355a8b480923
Prevent the login progress going backwards if MSN decides to throw an extra
step into the login process. And a spelling fix.
--- a/src/protocols/msn/notification.c Wed Jan 12 17:47:16 2005 -0500
+++ b/src/protocols/msn/notification.c Thu Jan 13 14:37:15 2005 -0500
@@ -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);
--- a/src/protocols/msn/session.c Wed Jan 12 17:47:16 2005 -0500
+++ b/src/protocols/msn/session.c Thu Jan 13 14:37:15 2005 -0500
@@ -333,7 +333,8 @@
const char *steps_text[] = {
_("Connecting"),
_("Handshaking"),
- _("Transfering"),
+ _("Transferring"),
+ _("Handshaking"),
_("Starting authentication"),
_("Getting cookie"),
_("Authenticating"),
--- a/src/protocols/msn/session.h Wed Jan 12 17:47:16 2005 -0500
+++ b/src/protocols/msn/session.h Thu Jan 13 14:37:15 2005 -0500
@@ -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,
--- a/src/protocols/msn/switchboard.c Wed Jan 12 17:47:16 2005 -0500
+++ b/src/protocols/msn/switchboard.c Thu Jan 13 14:37:15 2005 -0500
@@ -350,9 +350,8 @@
if (msg->type == MSN_MSG_TEXT)
{
- const char *format;
+ const char *format, *str_reason;
char *body_str, *body_enc, *pre, *post;
- const char *str_reason;
#if 0
if (swboard->conv == NULL)