diff options
| author | Ankit Vani <a@nevitus.org> | 2014-05-20 10:36:58 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2014-05-20 10:36:58 +0530 |
| commit | f2a0c1c4bff77f5ef1fd2a9c0c8d287f19b78c6b (patch) | |
| tree | 84188e69c677093254e4f45c3550ce6bb08c70a7 /libpurple/protocols/sametime/sametime.c | |
| parent | a86f54176f3e3c8affac0f6265c3caf8a1bd4153 (diff) | |
| parent | 7ac6d2be2a78f658560651f8c0035d0a80905313 (diff) | |
| download | pidgin-f2a0c1c4bff77f5ef1fd2a9c0c8d287f19b78c6b.tar.gz | |
Merged default branch
Diffstat (limited to 'libpurple/protocols/sametime/sametime.c')
| -rw-r--r-- | libpurple/protocols/sametime/sametime.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c index 45633b969e..d894058a9a 100644 --- a/libpurple/protocols/sametime/sametime.c +++ b/libpurple/protocols/sametime/sametime.c @@ -2223,7 +2223,7 @@ static void ft_send(struct mwFileTransfer *ft) { rem = mwFileTransfer_getRemaining(ft); if(rem < MW_FT_LEN) o.len = rem; - if(purple_xfer_read_file(xfer, buf, (size_t) o.len) > 0) { + if(purple_xfer_read_file(xfer, buf, (size_t) o.len) == (gssize)o.len) { /* calculate progress and display it */ purple_xfer_set_bytes_sent(xfer, purple_xfer_get_bytes_sent(xfer) + o.len); @@ -5589,7 +5589,6 @@ mw_protocol_init(PurpleProtocol *protocol) protocol->id = PROTOCOL_ID; protocol->name = PROTOCOL_NAME; - protocol->options = OPT_PROTO_IM_IMAGE; /* set up the preferences */ purple_prefs_add_none(MW_PROTOCOL_OPT_BASE); |