comparison src/protocols/msn/notification.c @ 10504:1a97d5e88d12

[gaim-migrate @ 11796] Lots of things here: - Several memory leak fixes - A few invalid memory access fixes - Fix a yahoo crash going idle when away - Fix Add user in chats to actually fill in the screenname - Add gaim_account_{get,set}_enabled to perl - Fix command priorities (fixes /me in IRC) - Fix MSN notification server transfer to be quiet about it - Fix MSN blist sync if user has insane friendly name - Make the docklet less crash-happy if it fails to embed in 3 seconds - Only probe for native plugins with the correct file extension - 1 typo fix :) ... and quite possibly something else I forgot. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 11 Jan 2005 17:25:06 +0000
parents bcfea6c3d5c9
children 8f1316d77315
comparison
equal deleted inserted replaced
10503:776586d647e3 10504:1a97d5e88d12
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 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE); 114 if (!session->logged_in)
115 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE);
115 msn_cmdproc_send(cmdproc, "VER", "%s", vers); 116 msn_cmdproc_send(cmdproc, "VER", "%s", vers);
116 117
117 g_strfreev(a); 118 g_strfreev(a);
118 g_free(vers); 119 g_free(vers);
119 } 120 }
197 { 198 {
198 MsnCmdProc *cmdproc; 199 MsnCmdProc *cmdproc;
199 200
200 cmdproc = session->notification->cmdproc; 201 cmdproc = session->notification->cmdproc;
201 202
202 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END); 203 if (!session->logged_in)
204 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END);
203 205
204 msn_cmdproc_send(cmdproc, "USR", "TWN S %s", login_params); 206 msn_cmdproc_send(cmdproc, "USR", "TWN S %s", login_params);
205 } 207 }
206 208
207 static void 209 static void
231 /* OK */ 233 /* OK */
232 const char *friendly = gaim_url_decode(cmd->params[3]); 234 const char *friendly = gaim_url_decode(cmd->params[3]);
233 235
234 gaim_connection_set_display_name(gc, friendly); 236 gaim_connection_set_display_name(gc, friendly);
235 237
236 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); 238 if (!session->logged_in)
239 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN);
237 240
238 msn_cmdproc_send(cmdproc, "SYN", "%s", "0"); 241 msn_cmdproc_send(cmdproc, "SYN", "%s", "0");
239 } 242 }
240 else if (!g_ascii_strcasecmp(cmd->params[1], "TWN")) 243 else if (!g_ascii_strcasecmp(cmd->params[1], "TWN"))
241 { 244 {
256 g_free(tokens); 259 g_free(tokens);
257 } 260 }
258 261
259 g_strfreev(elems); 262 g_strfreev(elems);
260 263
261 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START); 264 if (!session->logged_in)
265 msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START);
262 266
263 msn_nexus_connect(session->nexus); 267 msn_nexus_connect(session->nexus);
264 } 268 }
265 } 269 }
266 270