comparison: src/protocols/msn/notification.c
src/protocols/msn/notification.c
- changeset 10519
- 80801a34a246
- parent 10514
- 3d6cb5d53e97
- child 10568
- 15f02c0e7fc1
equal
deleted
inserted
replaced
| 10518:e6d0a4ad57df | 10519:80801a34a246 |
|---|---|
| 109 | 109 |
| 110 *c++ = g_strdup("CVR0"); | 110 *c++ = g_strdup("CVR0"); |
| 111 | 111 |
| 112 vers = g_strjoinv(" ", a); | 112 vers = g_strjoinv(" ", a); |
| 113 | 113 |
| 114 if (!session->logged_in) | 114 if (session->login_step == MSN_LOGIN_STEP_START) |
| 115 { | 115 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE); |
| 116 if (session->login_step == MSN_LOGIN_STEP_START) | 116 else |
| 117 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE); | 117 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2); |
| 118 else | |
| 119 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2); | |
| 120 } | |
| 121 | 118 |
| 122 msn_cmdproc_send(cmdproc, "VER", "%s", vers); | 119 msn_cmdproc_send(cmdproc, "VER", "%s", vers); |
| 123 | 120 |
| 124 g_strfreev(a); | 121 g_strfreev(a); |
| 125 g_free(vers); | 122 g_free(vers); |
| 204 { | 201 { |
| 205 MsnCmdProc *cmdproc; | 202 MsnCmdProc *cmdproc; |
| 206 | 203 |
| 207 cmdproc = session->notification->cmdproc; | 204 cmdproc = session->notification->cmdproc; |
| 208 | 205 |
| 209 if (!session->logged_in) | 206 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END); |
| 210 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END); | |
| 211 | 207 |
| 212 msn_cmdproc_send(cmdproc, "USR", "TWN S %s", login_params); | 208 msn_cmdproc_send(cmdproc, "USR", "TWN S %s", login_params); |
| 213 } | 209 } |
| 214 | 210 |
| 215 static void | 211 static void |
| 239 /* OK */ | 235 /* OK */ |
| 240 const char *friendly = gaim_url_decode(cmd->params[3]); | 236 const char *friendly = gaim_url_decode(cmd->params[3]); |
| 241 | 237 |
| 242 gaim_connection_set_display_name(gc, friendly); | 238 gaim_connection_set_display_name(gc, friendly); |
| 243 | 239 |
| 244 if (!session->logged_in) | 240 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); |
| 245 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); | |
| 246 | 241 |
| 247 msn_cmdproc_send(cmdproc, "SYN", "%s", "0"); | 242 msn_cmdproc_send(cmdproc, "SYN", "%s", "0"); |
| 248 } | 243 } |
| 249 else if (!g_ascii_strcasecmp(cmd->params[1], "TWN")) | 244 else if (!g_ascii_strcasecmp(cmd->params[1], "TWN")) |
| 250 { | 245 { |
| 265 g_free(tokens); | 260 g_free(tokens); |
| 266 } | 261 } |
| 267 | 262 |
| 268 g_strfreev(elems); | 263 g_strfreev(elems); |
| 269 | 264 |
| 270 if (!session->logged_in) | 265 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START); |
| 271 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START); | |
| 272 | 266 |
| 273 msn_nexus_connect(session->nexus); | 267 msn_nexus_connect(session->nexus); |
| 274 } | 268 } |
| 275 } | 269 } |
| 276 | 270 |
| 297 } | 291 } |
| 298 } | 292 } |
| 299 | 293 |
| 300 if (!protocol_supported) | 294 if (!protocol_supported) |
| 301 { | 295 { |
| 302 msn_session_set_error(session, MSN_ERROR_UNSUPORTED_PROTOCOL, | 296 msn_session_set_error(session, MSN_ERROR_UNSUPPORTED_PROTOCOL, |
| 303 NULL); | 297 NULL); |
| 304 return; | 298 return; |
| 305 } | 299 } |
| 306 | 300 |
| 307 msn_cmdproc_send(cmdproc, "CVR", | 301 msn_cmdproc_send(cmdproc, "CVR", |
| 1010 { | 1004 { |
| 1011 MsnSession *session; | 1005 MsnSession *session; |
| 1012 | 1006 |
| 1013 session = cmdproc->session; | 1007 session = cmdproc->session; |
| 1014 | 1008 |
| 1015 if (!session->logged_in) | 1009 msn_session_set_login_step(session, MSN_LOGIN_STEP_TRANSFER); |
| 1016 msn_session_set_login_step(session, MSN_LOGIN_STEP_TRANSFER); | |
| 1017 | 1010 |
| 1018 msn_notification_connect(session->notification, host, port); | 1011 msn_notification_connect(session->notification, host, port); |
| 1019 } | 1012 } |
| 1020 | 1013 |
| 1021 g_free(host); | 1014 g_free(host); |
