# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1202789010 0
# Node ID f1fa491504eb0e8e1a0f18a54b0aa0b3d68108d1
# Parent  36036b9489fe5afcfecee96e2cd48818db687507# Parent  d680613669cc451c7f82795963dcd8065e9d2f59
merge of '902c6324faa755dfbceafd40ebf88ef850d06c9b'
     and 'a0772f771a053d37ada885e7b6826abb1091ed55'

diff -r 36036b9489fe -r f1fa491504eb finch/gntconv.c
--- a/finch/gntconv.c	Tue Feb 12 03:16:21 2008 +0000
+++ b/finch/gntconv.c	Tue Feb 12 04:03:30 2008 +0000
@@ -805,6 +805,10 @@
 
 	g_return_if_fail(ggconv != NULL);
 
+	if (flags & PURPLE_MESSAGE_SYSTEM) {
+		flags &= ~(PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV);
+	}
+
 	if (ggconv->active_conv != conv) {
 		if (flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV))
 			finch_conversation_set_active(conv);
@@ -837,7 +841,11 @@
 
 		if (purple_message_meify((char*)message, -1)) {
 			name = g_strdup_printf("*** %s", who);
-			msgflags = gnt_color_pair(color_message_action);
+			if (!(flags & PURPLE_MESSAGE_SEND) &&
+					(flags & PURPLE_MESSAGE_NICK))
+				msgflags = gnt_color_pair(color_message_highlight);
+			else
+				msgflags = gnt_color_pair(color_message_action);
 			me = TRUE;
 		} else {
 			name =  g_strdup_printf("%s", who);