Mercurial > pidgin.yaz

comparison libpurple/protocols/oscar/oscar.c @ 23961:32bab3989963

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some debugging to avoid potential NULL string printf.
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 31 Aug 2008 16:52:51 +0000
parents 9b2c273d764d
children 16734635febf 9396a2124893 5c76f76ee9db
comparison
equal deleted inserted replaced
23960:84deb53a0a06 23961:32bab3989963
1537 default: 1537 default:
1538 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Authentication failed")); 1538 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Authentication failed"));
1539 break; 1539 break;
1540 } 1540 }
1541 purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode); 1541 purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
1542 purple_debug_info("oscar", "Error URL: %s\n", info->errorurl); 1542 purple_debug_info("oscar", "Error URL: %s\n", info->errorurl ? info->errorurl : "");
1543 return 1; 1543 return 1;
1544 } 1544 }
1545 1545
1546 purple_debug_misc("oscar", "Reg status: %hu\n", info->regstatus); 1546 purple_debug_misc("oscar", "Reg status: %hu\n"
1547 purple_debug_misc("oscar", "Email: %s\n", 1547 "Email: %s\n"
1548 (info->email != NULL) ? info->email : "null"); 1548 "BOSIP: %s\n",
1549 purple_debug_misc("oscar", "BOSIP: %s\n", info->bosip); 1549 info->regstatus,
1550 info->email ? info->email : "null",
1551 info->bosip ? info->bosip : "null");
1550 purple_debug_info("oscar", "Closing auth connection...\n"); 1552 purple_debug_info("oscar", "Closing auth connection...\n");
1551 flap_connection_schedule_destroy(conn, OSCAR_DISCONNECT_DONE, NULL); 1553 flap_connection_schedule_destroy(conn, OSCAR_DISCONNECT_DONE, NULL);
1552 1554
1553 for (i = 0; i < strlen(info->bosip); i++) { 1555 for (i = 0; i < strlen(info->bosip); i++) {
1554 if (info->bosip[i] == ':') { 1556 if (info->bosip[i] == ':') {
1831 va_end(ap); 1833 va_end(ap);
1832 1834
1833 aim_send_login(od, conn, purple_account_get_username(account), 1835 aim_send_login(od, conn, purple_account_get_username(account),
1834 purple_connection_get_password(gc), truncate_pass, 1836 purple_connection_get_password(gc), truncate_pass,
1835 od->icq ? &icqinfo : &aiminfo, key, 1837 od->icq ? &icqinfo : &aiminfo, key,
1836 /* allow multple logins? */ purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS)); 1838 purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS));
1837 1839
1838 purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); 1840 purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
1839 ck[2] = 0x6c; 1841 ck[2] = 0x6c;
1840 1842
1841 return 1; 1843 return 1;