Revision 6c800bac6a7067cf6c677f23a631e715fa49db1c

[nosnilmot at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: 6c800bac6a7067cf6c677f23a631e715fa49db1c
|   Ancestor: 00add5e6d0267cc67f635404de46e4d91356e5cd
|   Author: nosnilmot
|   Date: 2005-01-13T19:37:15
|   Branch: im.pidgin.gaim.oldstatus
|   
|   Modified files:
|           src/protocols/msn/notification.c src/protocols/msn/session.c
|           src/protocols/msn/session.h src/protocols/msn/switchboard.c
|   
|   ChangeLog: 
|   
|   [gaim-migrate @ 11813]
|   Prevent the login progress going backwards if MSN decides to throw an extra
|   step into the login process. And a spelling fix.
|   ============================================================
|   --- src/protocols/msn/notification.c	cc75925d6b657418a64ba7b18ff842f935680d96
|   +++ src/protocols/msn/notification.c	8c3c064ed9620a5ce9c8ae7418b27e5c4c12e67b
|   @@ -112,7 +112,13 @@ connect_cb(MsnServConn *servconn)
|    	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);
|   ============================================================
|   --- src/protocols/msn/session.c	41570c2732f7d6cc486ac35029a4584bbdda7fea
|   +++ src/protocols/msn/session.c	958772cdc6fc5e4324d6d158ef49fb4c98e83fb8
|   @@ -333,7 +333,8 @@ get_login_step_text(MsnSession *session)
|    	const char *steps_text[] = {
|    		_("Connecting"),
|    		_("Handshaking"),
|   -		_("Transfering"),
|   +		_("Transferring"),
|   +		_("Handshaking"),
|    		_("Starting authentication"),
|    		_("Getting cookie"),
|    		_("Authenticating"),
|   ============================================================
|   --- src/protocols/msn/session.h	0c3930d575a930a9936f9b10d44878e13171e374
|   +++ src/protocols/msn/session.h	e37509f33c1441d07c04b3ea21b04054c304d29e
|   @@ -63,6 +63,7 @@ typedef enum
|    	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,
|   ============================================================
|   --- src/protocols/msn/switchboard.c	78226719dc398f9fc82ec0278301b71eff91c9ac
|   +++ src/protocols/msn/switchboard.c	1f46d2afbd8ba07f14377559aece0eb7555f2411
|   @@ -350,9 +350,8 @@ msg_error_helper(MsnCmdProc *cmdproc, Ms
|    
|    	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)

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 6c800bac6a7067cf6c677f23a631e715fa49db1c