Mercurial > pidgin.yaz
changeset 32755:867104ed576a
Update MSN for 64-bit file transfers.
Refs #8477.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 16 Oct 2011 07:01:52 +0000 |
| parents | e164f7815b52 |
| children | 280ef1bd125b |
| files | libpurple/protocols/msn/slp.c libpurple/protocols/msn/slpcall.c libpurple/protocols/msn/slpmsg.c libpurple/protocols/msn/slpmsg.h |
| diffstat | 4 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Sun Oct 16 06:52:12 2011 +0000 +++ b/libpurple/protocols/msn/slp.c Sun Oct 16 07:01:52 2011 +0000 @@ -291,7 +291,7 @@ static gchar * gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path) { - gsize size = 0; + goffset size = 0; MsnFileContext context; gchar *u8 = NULL; gchar *ret;
--- a/libpurple/protocols/msn/slpcall.c Sun Oct 16 06:52:12 2011 +0000 +++ b/libpurple/protocols/msn/slpcall.c Sun Oct 16 07:01:52 2011 +0000 @@ -512,7 +512,6 @@ MsnFileContext *file_context; char *buf; gsize bin_len; - guint32 file_size; char *file_name; account = slpcall->slplink->session->account; @@ -529,8 +528,6 @@ file_context = msn_file_context_from_wire(buf, bin_len); if (file_context != NULL) { - file_size = file_context->file_size; - file_name = g_convert((const gchar *)&file_context->file_name, MAX_FILE_NAME_LEN * 2, "UTF-8", "UTF-16LE", @@ -538,7 +535,7 @@ purple_xfer_set_filename(xfer, file_name ? file_name : ""); g_free(file_name); - purple_xfer_set_size(xfer, file_size); + purple_xfer_set_size(xfer, file_context->file_size); purple_xfer_set_init_fnc(xfer, msn_xfer_init); purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel); purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
--- a/libpurple/protocols/msn/slpmsg.c Sun Oct 16 06:52:12 2011 +0000 +++ b/libpurple/protocols/msn/slpmsg.c Sun Oct 16 07:01:52 2011 +0000 @@ -239,7 +239,7 @@ } -MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size) +MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, goffset size) { MsnSlpMessage *slpmsg;
--- a/libpurple/protocols/msn/slpmsg.h Sun Oct 16 06:52:12 2011 +0000 +++ b/libpurple/protocols/msn/slpmsg.h Sun Oct 16 07:01:52 2011 +0000 @@ -133,7 +133,7 @@ * * @return A new SlpMessage with the file transfer info. */ -MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size); +MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, goffset size); /** * Serialize the MsnSlpMessage in a way it can be used to be transmited