# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1231941586 0
# Node ID 23bb3a96d8ea82052888f2ded8b8b7cbb3555f17
# Parent  df25f88ff22a64ed4030b751adb87d14da03b494# Parent  cb1a897ae34c9c24fbcc8471a0c52845edaf210e
merge of '07f8d9c59020c1f69cc21b71f8252f13efd6a6e0'
     and '331937f46235852e1813a1492eb351071127e02c'

diff -r df25f88ff22a -r 23bb3a96d8ea libpurple/protocols/oscar/odc.c
--- 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;
diff -r df25f88ff22a -r 23bb3a96d8ea libpurple/protocols/oscar/oscar.c
--- 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);
 }