Mercurial > pidgin.yaz
changeset 10514:8f1316d77315
[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>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 13 Jan 2005 19:37:34 +0000 |
| parents | ab7dd4d50936 |
| children | ef9b6ef0c858 |
| files | src/protocols/msn/notification.c src/protocols/msn/session.c src/protocols/msn/session.h |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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"),
--- 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,