im.pidgin.pidgin: 8ae0d2f36bb2689e7de9fcb3245c1e9484bd3fe6

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 8ae0d2f36bb2689e7de9fcb3245c1e9484bd3fe6
Ancestor: b00455f77016b097783d9c0eaff91d98bbd84480
Author: sadrul at pidgin.im
Date: 2007-12-03T22:56:22
Branch: im.pidgin.pidgin

Modified files:
        finch/gntconv.c

ChangeLog: 

Do not append ':' after expanding a /me.

-------------- next part --------------
============================================================
--- finch/gntconv.c	4f7e532f5f3cede52d639053829583ac357e9148
+++ finch/gntconv.c	4c5413a8df5e003cf7b4a3f70396066e3a4a4ed2
@@ -772,26 +772,25 @@ finch_write_common(PurpleConversation *c
 			!(flags & PURPLE_MESSAGE_NOTIFY))
 	{
 		char * name = NULL;
+		GntTextFormatFlags msgflags = GNT_TEXT_FLAG_NORMAL;
+		gboolean me = FALSE;
 
 		if (purple_message_meify((char*)message, -1)) {
 			name = g_strdup_printf("*** %s", who);
-			gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
-				name, gnt_color_pair(color_message_action));
+			msgflags = gnt_color_pair(color_message_action);
+			me = TRUE;
 		} else {
 			name =  g_strdup_printf("%s", who);
 			if (flags & PURPLE_MESSAGE_SEND)
-				gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
-					name, gnt_color_pair(color_message_send));
+				msgflags = gnt_color_pair(color_message_send);
+			else if (flags & PURPLE_MESSAGE_NICK)
+				msgflags = gnt_color_pair(color_message_highlight);
 			else
-				if (flags & PURPLE_MESSAGE_NICK) {
-					gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
-						name, gnt_color_pair(color_message_highlight));
-				} else {
-					gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
-						name, gnt_color_pair(color_message_receive));
-				}
+				msgflags = gnt_color_pair(color_message_receive);
 		}
-		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), ": ", GNT_TEXT_FLAG_NORMAL);
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
+				name, msgflags);
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), me ? " " : ": ", GNT_TEXT_FLAG_NORMAL);
 		g_free(name);
 	} else
 		fl = GNT_TEXT_FLAG_DIM;