im.pidgin.pidgin: 3a57ab8f995fc58a55ea1b51bbf10c04ff71fe70

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3a57ab8f995fc58a55ea1b51bbf10c04ff71fe70
Ancestor: 4f48bb94d8ded9647ff5ac298194fc3c29f7c317
Author: sadrul at pidgin.im
Date: 2008-01-05T02:16:30
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Show the emblem in conversation infopane correctly for chats.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	9955929b8fe29f34aa9ab1cb107f8324f0becd55
+++ pidgin/gtkconv.c	2b7f819eece36caa2929d2ac881bd2da269a61a3
@@ -2420,7 +2420,6 @@ update_tab_icon(PurpleConversation *conv
 {
 	PidginConversation *gtkconv;
 	PidginWindow *win;
-	PurpleBuddy *b;
 	GList *l;
 	GdkPixbuf *status = NULL;
 	GdkPixbuf *infopane_status = NULL;
@@ -2433,13 +2432,18 @@ update_tab_icon(PurpleConversation *conv
 	if (conv != gtkconv->active_conv)
 		return;
 
-
 	status = pidgin_conv_get_tab_icon(conv, TRUE);
 	infopane_status = pidgin_conv_get_tab_icon(conv, FALSE);
 
-	b = purple_find_buddy(conv->account, conv->name);
-	if (b)
-		emblem = pidgin_blist_get_emblem((PurpleBlistNode*)b);
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		PurpleBuddy *b = purple_find_buddy(conv->account, conv->name);
+		if (b)
+			emblem = pidgin_blist_get_emblem((PurpleBlistNode*)b);
+	} else {
+		PurpleChat *c = purple_blist_find_chat(conv->account, conv->name);
+		if (c)
+			emblem = pidgin_blist_get_emblem((PurpleBlistNode*)c);
+	}
 
 	g_return_if_fail(status != NULL);