Mercurial > pidgin
comparison src/protocols/yahoo/yahoo.c @ 9280:2104c1039626
[gaim-migrate @ 10083]
set the gc->wants_to_die flag on any auth error. I could have sworn we
were doing this already.
Also improves one of the error strings slightly.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Mon, 14 Jun 2004 06:09:26 +0000 |
parents | 1eaa4d8dcf26 |
children | adde46ad65e9 |
comparison
equal
deleted
inserted
replaced
9279:1eaa4d8dcf26 | 9280:2104c1039626 |
---|---|
1720 break; | 1720 break; |
1721 case 13: | 1721 case 13: |
1722 msg = g_strdup(_("Incorrect password.")); | 1722 msg = g_strdup(_("Incorrect password.")); |
1723 break; | 1723 break; |
1724 case 14: | 1724 case 14: |
1725 msg = g_strdup(_("Your account is locked, please log in to the yahoo website.")); | 1725 msg = g_strdup(_("Your account is locked, please log in to the Yahoo! website.")); |
1726 break; | 1726 break; |
1727 default: | 1727 default: |
1728 msg = g_strdup_printf(_("Unknown error number %d."), err); | 1728 msg = g_strdup_printf(_("Unknown error number %d. Logging into the Yahoo! website may fix this."), err); |
1729 } | 1729 } |
1730 | 1730 |
1731 if (url) | 1731 if (url) |
1732 fullmsg = g_strdup_printf("%s\n%s", msg, url); | 1732 fullmsg = g_strdup_printf("%s\n%s", msg, url); |
1733 else | 1733 else |
1734 fullmsg = g_strdup(msg); | 1734 fullmsg = g_strdup(msg); |
1735 | 1735 |
1736 gc->wants_to_die = TRUE; | |
1736 gaim_connection_error(gc, fullmsg); | 1737 gaim_connection_error(gc, fullmsg); |
1737 g_free(msg); | 1738 g_free(msg); |
1738 g_free(fullmsg); | 1739 g_free(fullmsg); |
1739 } | 1740 } |
1740 | 1741 |
2663 yahoo_packet_hash(pkt, 5, who); | 2664 yahoo_packet_hash(pkt, 5, who); |
2664 if (utf8) | 2665 if (utf8) |
2665 yahoo_packet_hash(pkt, 97, "1"); | 2666 yahoo_packet_hash(pkt, 97, "1"); |
2666 yahoo_packet_hash(pkt, 14, msg2); | 2667 yahoo_packet_hash(pkt, 14, msg2); |
2667 | 2668 |
2668 yahoo_packet_hash(pkt, 63, ";0"); /* IMvironment */ | 2669 yahoo_packet_hash(pkt, 63, ";0"); /* IMvironment */ |
2669 yahoo_packet_hash(pkt, 64, "0"); /* no idea */ | 2670 yahoo_packet_hash(pkt, 64, "0"); /* no idea */ |
2670 yahoo_packet_hash(pkt, 1002, "1"); /* no idea, Yahoo 6 or later only it seems */ | 2671 yahoo_packet_hash(pkt, 1002, "1"); /* no idea, Yahoo 6 or later only it seems */ |
2671 yahoo_packet_hash(pkt, 206, "0"); /* 0 = no picture, 2 = picture, maybe 1 = avatar? */ | 2672 yahoo_packet_hash(pkt, 206, "0"); /* 0 = no picture, 2 = picture, maybe 1 = avatar? */ |
2672 | 2673 |
2673 yahoo_send_packet(yd, pkt); | 2674 yahoo_send_packet(yd, pkt); |
2674 | 2675 |
2675 yahoo_packet_free(pkt); | 2676 yahoo_packet_free(pkt); |
2676 | 2677 |