Mercurial > pidgin.yaz
diff src/protocols/msn/notification.c @ 10519:bec9130b24d2
[gaim-migrate @ 11833]
Leak fixes, round #2. And some minor MSN tweaks suggested by Felipe.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 17 Jan 2005 00:33:30 +0000 |
| parents | 8f1316d77315 |
| children | fed2a7c2471d |
line wrap: on
line diff
--- a/src/protocols/msn/notification.c Sat Jan 15 16:53:55 2005 +0000 +++ b/src/protocols/msn/notification.c Mon Jan 17 00:33:30 2005 +0000 @@ -111,13 +111,10 @@ vers = g_strjoinv(" ", a); - if (!session->logged_in) - { - 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); - } + 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); @@ -206,8 +203,7 @@ cmdproc = session->notification->cmdproc; - if (!session->logged_in) - msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END); + msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END); msn_cmdproc_send(cmdproc, "USR", "TWN S %s", login_params); } @@ -241,8 +237,7 @@ gaim_connection_set_display_name(gc, friendly); - if (!session->logged_in) - msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); + msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); msn_cmdproc_send(cmdproc, "SYN", "%s", "0"); } @@ -267,8 +262,7 @@ g_strfreev(elems); - if (!session->logged_in) - msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START); + msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START); msn_nexus_connect(session->nexus); } @@ -299,7 +293,7 @@ if (!protocol_supported) { - msn_session_set_error(session, MSN_ERROR_UNSUPORTED_PROTOCOL, + msn_session_set_error(session, MSN_ERROR_UNSUPPORTED_PROTOCOL, NULL); return; } @@ -1012,8 +1006,7 @@ session = cmdproc->session; - if (!session->logged_in) - msn_session_set_login_step(session, MSN_LOGIN_STEP_TRANSFER); + msn_session_set_login_step(session, MSN_LOGIN_STEP_TRANSFER); msn_notification_connect(session->notification, host, port); }