# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1237961264 0
# Node ID fb937c4c2a508bb941fddb37bac0fac51827614d
# Parent  4f6228f1446157f5beb44e6a04582ff601eb34f7
Fix displaying of status messages in the conversation infopane.

Rekkanoryo thinks this is okay (and it doesn't seem to have broken anything
else that I've noticed).

Fixes #8670.

diff -r 4f6228f14461 -r fb937c4c2a50 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Mar 24 00:39:16 2009 +0000
+++ b/pidgin/gtkblist.c	Wed Mar 25 06:07:44 2009 +0000
@@ -3898,7 +3898,7 @@
 	presence = purple_buddy_get_presence(b);
 
 	/* Name is all that is needed */
-	if (aliased && biglist) {
+	if (!aliased || biglist) {
 
 		/* Status Info */
 		prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
@@ -4038,7 +4038,7 @@
 	}
 
 	/* Put it all together */
-	if (aliased && biglist && (statustext || idletime)) {
+	if ((!aliased || biglist) && (statustext || idletime)) {
 		/* using <span size='smaller'> breaks the status, so it must be seperated into <small><span>*/
 		if (name_color) {
 			text = g_strdup_printf("<span font_desc='%s' foreground='%s'>%s</span>\n"