# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1194221528 0
# Node ID 846e6800d956f087d54539a41a2e53287079d434
# Parent  0df8263c21b8e460af5b0bccb8d6de25fb30f471# Parent  be54a784b80df7aa6aeb3a9c92a55a29e7b7e9d6
merge of '1add15394515c75824600c86f6df714bc7017374'
     and '574b8609b14d3927cc786ae89c00705ede971d37'

diff -r be54a784b80d -r 846e6800d956 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Sun Nov 04 23:41:33 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Nov 05 00:12:08 2007 +0000
@@ -580,14 +580,20 @@
 		psm = purple_status_get_attr_string(status, "message");
 		currentmedia = purple_status_get_attr_string(status, PURPLE_TUNE_FULL);
 
-		if (!purple_presence_is_available(presence)) {
+		if (!purple_status_is_available(status)) {
 			name = purple_status_get_name(status);
 		} else {
 			name = NULL;
 		}
 
 		if (name != NULL && *name) {
-			char *tmp2 = g_markup_escape_text(name, -1);
+			char *tmp2;
+
+			if (purple_presence_is_idle(presence)) {
+				tmp2 = g_markup_printf_escaped("%s/%s", name, _("Idle"));
+			} else {
+				tmp2 = g_markup_escape_text(name, -1);
+			}
 
 			if (psm != NULL && *psm) {
 				tmp = g_markup_escape_text(psm, -1);
@@ -601,8 +607,20 @@
 		} else {
 			if (psm != NULL && *psm) {
 				tmp = g_markup_escape_text(psm, -1);
-				purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
+				if (purple_presence_is_idle(presence)) {
+					purple_notify_user_info_add_pair(user_info, _("Idle"), tmp);
+				} else {
+					purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
+				}
 				g_free(tmp);
+			} else {
+				if (purple_presence_is_idle(presence)) {
+					purple_notify_user_info_add_pair(user_info, _("Status"),
+						_("Idle"));
+				} else {
+					purple_notify_user_info_add_pair(user_info, _("Status"),
+						purple_status_get_name(status));
+				}
 			}
 		}