Mercurial > pidgin.yaz
changeset 10111:8490f2e292a6
[gaim-migrate @ 11144]
cleaning out the 64-bit stuff from my tree...piece by piece
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Mon, 18 Oct 2004 05:22:21 +0000 |
| parents | 4b276d2e5589 |
| children | 1a91e814e9d8 |
| files | src/protocols/oscar/oscar.c src/protocols/yahoo/yahoo_filexfer.c src/protocols/yahoo/yahoo_picture.c src/protocols/zephyr/zephyr.c |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Mon Oct 18 01:03:51 2004 +0000 +++ b/src/protocols/oscar/oscar.c Mon Oct 18 05:22:21 2004 +0000 @@ -6482,7 +6482,7 @@ char *buf, *buf2; fu16_t charset, charsubset; char *charsetstr = NULL; - gsize len; + int len; if (!(conv = gaim_find_chat(gc, id))) return -EINVAL;
--- a/src/protocols/yahoo/yahoo_filexfer.c Mon Oct 18 01:03:51 2004 +0000 +++ b/src/protocols/yahoo/yahoo_filexfer.c Mon Oct 18 05:22:21 2004 +0000 @@ -117,7 +117,7 @@ pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER, YAHOO_STATUS_AVAILABLE, yd->session_id); - size = g_strdup_printf("%d", gaim_xfer_get_size(xfer)); + size = g_strdup_printf("%" G_GSIZE_FORMAT, gaim_xfer_get_size(xfer)); yahoo_packet_hash(pkt, 0, gaim_connection_get_display_name(gc)); yahoo_packet_hash(pkt, 5, xfer->who); @@ -131,7 +131,7 @@ buf = g_strdup_printf("Y=%s; T=%s", yd->cookie_y, yd->cookie_t); post = g_strdup_printf("POST /notifyft HTTP/1.0\r\n" - "Content-length: %d\r\n" + "Content-length: %" G_GSIZE_FORMAT "\r\n" "Host: %s:%d\r\n" "Cookie: %s\r\n" "\r\n",
--- a/src/protocols/yahoo/yahoo_picture.c Mon Oct 18 01:03:51 2004 +0000 +++ b/src/protocols/yahoo/yahoo_picture.c Mon Oct 18 05:22:21 2004 +0000 @@ -407,7 +407,7 @@ pkt = yahoo_packet_new(0xc2, YAHOO_STATUS_AVAILABLE, yd->session_id); - size = g_strdup_printf("%d", d->str->len); + size = g_strdup_printf("%" G_GSIZE_FORMAT, d->str->len); /* 1 = me, 38 = expire time(?), 0 = me, 28 = size, 27 = filename, 14 = NULL, 29 = data */ yahoo_packet_hash(pkt, 1, gaim_connection_get_display_name(gc)); yahoo_packet_hash(pkt, 38, "604800"); /* time til expire */ @@ -422,7 +422,7 @@ buf = g_strdup_printf("Y=%s; T=%s", yd->cookie_y, yd->cookie_t); post = g_strdup_printf("POST /notifyft HTTP/1.0\r\n" - "Content-length: %d\r\n" + "Content-length: %" G_GSIZE_FORMAT "\r\n" "Host: %s:%d\r\n" "Cookie: %s\r\n" "\r\n",
--- a/src/protocols/zephyr/zephyr.c Mon Oct 18 01:03:51 2004 +0000 +++ b/src/protocols/zephyr/zephyr.c Mon Oct 18 05:22:21 2004 +0000 @@ -2403,12 +2403,13 @@ gaim_debug_info("zephyr", "who is null\n"); recipient = local_zephyr_normalize(zephyr,""); } else { + char *comma = strrchr(who, ','); /* Don't ping broadcast (chat) recipients */ /* The strrchr case finds a realm-stripped broadcast subscription e.g. comma is the last character in the string */ - if ((strrchr(who, ',') && ((strrchr(who, ',') == (who+strlen(who)-1)) || ((char *)(strrchr(who, ',')[1] == '@'))))) + if (comma && ( (*(comma+1) == '\0') || (*(comma+1) == '@'))) return 0; - + recipient = local_zephyr_normalize(zephyr,who); }