changeset 23322:30deb89c5a76

merge of '457a5c2c9d9b1b235deae2d65b24cc542c12d6e4' and '9ec416e2eb1f0572caf75fe80faa283d3b57deac'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 08 Jun 2008 21:44:50 +0000
parents 5b8239453a1e (current diff) c200661b5c5c (diff)
children a61bb76597fc
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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))