Mercurial > pidgin
changeset 25327:23bb3a96d8ea
merge of '07f8d9c59020c1f69cc21b71f8252f13efd6a6e0'
and '331937f46235852e1813a1492eb351071127e02c'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 14 Jan 2009 13:59:46 +0000 |
| parents | df25f88ff22a (current diff) cb1a897ae34c (diff) |
| children | ed3409c4ccd6 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/odc.c Wed Jan 14 02:50:54 2009 +0000 +++ b/libpurple/protocols/oscar/odc.c Wed Jan 14 13:59:46 2009 +0000 @@ -394,7 +394,7 @@ } } - /* Send the message */ + /* Display the message we received */ imflags = 0; if (images != NULL) imflags |= PURPLE_MESSAGE_IMAGES;
--- a/libpurple/protocols/oscar/oscar.c Wed Jan 14 02:50:54 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Jan 14 13:59:46 2009 +0000 @@ -4337,8 +4337,7 @@ } g_string_free(data, TRUE); - peer_odc_send_im(conn, msg->str, msg->len, charset, - imflags & PURPLE_MESSAGE_AUTO_RESP); + peer_odc_send_im(conn, msg->str, msg->len, charset, imflags); g_string_free(msg, TRUE); }