comparison libpurple/protocols/msn/notification.c @ 20425:5048651671e1

Revert a bunch of whitespace changes so reviewing a diff against im.pidgin.pidgin doesn't make my eyes bleed quite as much
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 26 May 2007 13:59:07 +0000
parents 48e26f248251
children b679b8f36f79
comparison
equal deleted inserted replaced
20424:b462ef222d28 20425:5048651671e1
119 119
120 *c++ = g_strdup("CVR0"); 120 *c++ = g_strdup("CVR0");
121 121
122 vers = g_strjoinv(" ", a); 122 vers = g_strjoinv(" ", a);
123 123
124 if (session->login_step == MSN_LOGIN_STEP_START){ 124 if (session->login_step == MSN_LOGIN_STEP_START)
125 {
125 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE); 126 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE);
126 }else{ 127 }
128 else
129 {
127 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2); 130 msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2);
128 } 131 }
129 132
130 msn_cmdproc_send(cmdproc, "VER", "%s", vers); 133 msn_cmdproc_send(cmdproc, "VER", "%s", vers);
131 134
172 char *title = NULL; 175 char *title = NULL;
173 176
174 account = session->account; 177 account = session->account;
175 gc = purple_account_get_connection(account); 178 gc = purple_account_get_connection(account);
176 179
177 if (error == 224){ 180 if (error == 224)
178 if (group_id == 0){ 181 {
182 if (group_id == 0)
183 {
179 return; 184 return;
180 }else{ 185 }
186 else
187 {
181 const char *group_name; 188 const char *group_name;
182 group_name = msn_userlist_find_group_name(session->userlist,group_id); 189 group_name = msn_userlist_find_group_name(session->userlist,group_id);
183 reason = g_strdup_printf(_("%s is not a valid group."), 190 reason = g_strdup_printf(_("%s is not a valid group."),
184 group_name); 191 group_name);
185 } 192 }
186 }else{ 193 }
194 else
195 {
187 reason = g_strdup(_("Unknown error.")); 196 reason = g_strdup(_("Unknown error."));
188 } 197 }
189 198
190 title = g_strdup_printf(_("%s on %s (%s)"), msg, 199 title = g_strdup_printf(_("%s on %s (%s)"), msg,
191 purple_account_get_username(account), 200 purple_account_get_username(account),
230 239
231 session = cmdproc->session; 240 session = cmdproc->session;
232 account = session->account; 241 account = session->account;
233 gc = purple_account_get_connection(account); 242 gc = purple_account_get_connection(account);
234 243
235 if (!g_ascii_strcasecmp(cmd->params[1], "OK")){ 244 if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
245 {
236 /* authenticate OK */ 246 /* authenticate OK */
237 /* friendly name part no longer true in msnp11 */ 247 /* friendly name part no longer true in msnp11 */
238 #if 0 248 #if 0
239 const char *friendly = purple_url_decode(cmd->params[3]); 249 const char *friendly = purple_url_decode(cmd->params[3]);
240 250
242 #endif 252 #endif
243 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); 253 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN);
244 254
245 // msn_cmdproc_send(cmdproc, "SYN", "%s", "0"); 255 // msn_cmdproc_send(cmdproc, "SYN", "%s", "0");
246 //TODO we should use SOAP contact to fetch contact list 256 //TODO we should use SOAP contact to fetch contact list
247 } else if (!g_ascii_strcasecmp(cmd->params[1], "TWN")){ 257 }
258 else if (!g_ascii_strcasecmp(cmd->params[1], "TWN"))
259 {
248 /* Passport authentication */ 260 /* Passport authentication */
249 char **elems, **cur, **tokens; 261 char **elems, **cur, **tokens;
250 262
251 session->nexus = msn_nexus_new(session); 263 session->nexus = msn_nexus_new(session);
252 264
253 /* Parse the challenge data. */ 265 /* Parse the challenge data. */
254 session->nexus->challenge_data_str = g_strdup(cmd->params[3]); 266 session->nexus->challenge_data_str = g_strdup(cmd->params[3]);
255 elems = g_strsplit(cmd->params[3], ",", 0); 267 elems = g_strsplit(cmd->params[3], ",", 0);
256 268
257 for (cur = elems; *cur != NULL; cur++){ 269 for (cur = elems; *cur != NULL; cur++)
270 {
258 tokens = g_strsplit(*cur, "=", 2); 271 tokens = g_strsplit(*cur, "=", 2);
259 if(tokens[0]&&tokens[1]){ 272 if(tokens[0]&&tokens[1])
273 {
260 purple_debug_info("MaYuan","challenge %p,key:%s,value:%s\n", 274 purple_debug_info("MaYuan","challenge %p,key:%s,value:%s\n",
261 session->nexus->challenge_data,tokens[0],tokens[1]); 275 session->nexus->challenge_data,tokens[0],tokens[1]);
262 g_hash_table_insert(session->nexus->challenge_data, tokens[0], tokens[1]); 276 g_hash_table_insert(session->nexus->challenge_data, tokens[0], tokens[1]);
263 } 277 }
264 /* Don't free each of the tokens, only the array. */ 278 /* Don't free each of the tokens, only the array. */
319 protocol_supported = TRUE; 333 protocol_supported = TRUE;
320 break; 334 break;
321 } 335 }
322 } 336 }
323 337
324 if (!protocol_supported){ 338 if (!protocol_supported)
339 {
325 msn_session_set_error(session, MSN_ERROR_UNSUPPORTED_PROTOCOL, 340 msn_session_set_error(session, MSN_ERROR_UNSUPPORTED_PROTOCOL,
326 NULL); 341 NULL);
327 return; 342 return;
328 } 343 }
329 344
529 } 544 }
530 } 545 }
531 546
532 /************************************************************************** 547 /**************************************************************************
533 * Challenges 548 * Challenges
534 * we use MD5 to caculate the Chanllenges 549 * we use MD5 to caculate the Challenges
535 **************************************************************************/ 550 **************************************************************************/
536 static void 551 static void
537 chl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 552 chl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
538 { 553 {
539 MsnTransaction *trans; 554 MsnTransaction *trans;
549 purple_cipher_context_append(context, (const guchar *)challenge_resp, 564 purple_cipher_context_append(context, (const guchar *)challenge_resp,
550 strlen(challenge_resp)); 565 strlen(challenge_resp));
551 purple_cipher_context_digest(context, sizeof(digest), digest, NULL); 566 purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
552 purple_cipher_context_destroy(context); 567 purple_cipher_context_destroy(context);
553 568
554 for (i = 0; i < 16; i++){ 569 for (i = 0; i < 16; i++)
570 {
555 g_snprintf(buf + (i*2), 3, "%02x", digest[i]); 571 g_snprintf(buf + (i*2), 3, "%02x", digest[i]);
556 } 572 }
557 #else 573 #else
558 msn_handle_chl(cmd->params[1], buf); 574 msn_handle_chl(cmd->params[1], buf);
559 #endif 575 #endif