im.pidgin.pidgin: c27700a33779f1f8f380b0ed0a62756be4b6f17c

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: c27700a33779f1f8f380b0ed0a62756be4b6f17c
Ancestor: bd625d93706896fbd570aee9b3d53ceb38241a12
Author: sadrul at pidgin.im
Date: 2007-12-01T05:46:49
Branch: im.pidgin.pidgin

Modified files:
        finch/libgnt/gnttextview.c

ChangeLog: 

Do not reset the color if there's something already specified. This should
make it possible to have multicolored text in the conversation log. I am
really bad with colors. So I'll leave it to someone else, if any, to decide
the colors for different types of messages.

-------------- next part --------------
============================================================
--- finch/libgnt/gnttextview.c	976aef5d7d298ff8fb4508867852dc98886af78d
+++ finch/libgnt/gnttextview.c	63c019020980bc6b92dca143639425e022ce602f
@@ -650,8 +650,10 @@ chtype gnt_text_format_flag_to_chtype(Gn
 		fl |= (A_DIM | gnt_color_pair(GNT_COLOR_DISABLED));
 	else if (flags & GNT_TEXT_FLAG_HIGHLIGHT)
 		fl |= (A_DIM | gnt_color_pair(GNT_COLOR_HIGHLIGHT));
+	else if ((flags & A_COLOR) == 0)
+		fl |= gnt_color_pair(GNT_COLOR_NORMAL);
 	else
-		fl |= gnt_color_pair(GNT_COLOR_NORMAL);
+		fl |= (flags & A_COLOR);
 
 	return fl;
 }