Mercurial > pidgin

diff libpurple/protocols/oscar/family_icbm.c @ 22352:03b2b21b4c42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Don't flag outgoing oscar messages as "offline deliverable" if the message is an auto-reply. Fixes #4941. * Don't flag outgoing oscar messages as "offline deliverable" if the destination user is a cell phone or if we know that the destination user is currently online
author Mark Doliner <mark@kingant.net>
date Thu, 28 Feb 2008 08:15:27 +0000
parents a8c025929245
children 75d53b0fae6c
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_icbm.c	Thu Feb 28 01:42:51 2008 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Thu Feb 28 08:15:27 2008 +0000
@@ -372,15 +372,18 @@
 	if (args->flags & AIM_IMFLAGS_AWAY) {
 		byte_stream_put16(&data, 0x0004);
 		byte_stream_put16(&data, 0x0000);
-	} else if (args->flags & AIM_IMFLAGS_ACK) {
-		/* Set the Request Acknowledge flag */
-		byte_stream_put16(&data, 0x0003);
-		byte_stream_put16(&data, 0x0000);
-	}
-
-	if (args->flags & AIM_IMFLAGS_OFFLINE) {
-		byte_stream_put16(&data, 0x0006);
-		byte_stream_put16(&data, 0x0000);
+	} else {
+		if (args->flags & AIM_IMFLAGS_ACK) {
+			/* Set the Request Acknowledge flag */
+			byte_stream_put16(&data, 0x0003);
+			byte_stream_put16(&data, 0x0000);
+		}
+
+		if (args->flags & AIM_IMFLAGS_OFFLINE) {
+			/* Allow this message to be queued as an offline message */
+			byte_stream_put16(&data, 0x0006);
+			byte_stream_put16(&data, 0x0000);
+		}
 	}
 
 	/*