# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1212961490 0
# Node ID 30deb89c5a76f810010f1289ab0e4a9e2c12e429
# Parent  5b8239453a1eca11052ec6965e3d87e8bff5e62b# Parent  c200661b5c5ca701a85a187f8edae426f117a698
merge of '457a5c2c9d9b1b235deae2d65b24cc542c12d6e4'
     and '9ec416e2eb1f0572caf75fe80faa283d3b57deac'

diff -r 5b8239453a1e -r 30deb89c5a76 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sun Jun 08 19:15:26 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Jun 08 21:44:50 2008 +0000
@@ -871,8 +871,8 @@
 
 	if (b) {
 		if (purple_presence_is_online(presence)) {
-			if (aim_snvalid_icq(b->name) || !message || !(*message)) {
-				/* Append the status name for online ICQ statuses and for all buddies with no message.
+			if (aim_snvalid_icq(b->name) || is_away || !message || !(*message)) {
+				/* Append the status name for online ICQ statuses, away AIM statuses, and for all buddies with no message.
 				 * If the status name and the message are the same, only show one. */
 				const char *status_name = purple_status_get_name(status);
 				if (status_name && message && !strcmp(status_name, message))