Mercurial > pidgin
changeset 22288:f1fa491504eb
merge of '902c6324faa755dfbceafd40ebf88ef850d06c9b'
and 'a0772f771a053d37ada885e7b6826abb1091ed55'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 12 Feb 2008 04:03:30 +0000 |
| parents | 36036b9489fe (current diff) d680613669cc (diff) |
| children | 0ba0f2804299 b6fac84a0974 |
| files | |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);