Mercurial > pidgin
changeset 27596:4bd3f7d841e3
Clean up a case of unnecessarily duplicated code.
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Fri, 17 Jul 2009 23:45:52 +0000 |
| parents | d53d082f1641 |
| children | fceac27fcad1 |
| files | libpurple/protocols/yahoo/libymsg.c |
| diffstat | 1 files changed, 12 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Fri Jul 17 00:37:59 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Fri Jul 17 23:45:52 2009 +0000 @@ -1623,28 +1623,18 @@ purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status); pkt = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->current_status, yd->session_id); - if(yd->jp) { - yahoo_packet_hash(pkt, "ssssssss", - 1, name, - 0, name, - 277, yd->cookie_y, - 278, yd->cookie_t, - 307, base64_string, - 2, name, - 2, "1", - 135, YAHOOJP_CLIENT_VERSION); - } else { - yahoo_packet_hash(pkt, "sssssssss", - 1, name, - 0, name, - 277, yd->cookie_y, - 278, yd->cookie_t, - 307, base64_string, - 244, YAHOO_CLIENT_VERSION_ID, - 2, name, - 2, "1", - 135, YAHOO_CLIENT_VERSION); - } + + yahoo_packet_hash(pkt, "sssssssss", + 1, name, + 0, name, + 277, yd->cookie_y, + 278, yd->cookie_t, + 307, base64_string, + 244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID, + 2, name, + 2, "1", + 135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION); + if (yd->picture_checksum) yahoo_packet_hash_int(pkt, 192, yd->picture_checksum); yahoo_packet_send_and_free(pkt, yd);