Mercurial > pidgin3 / file diff

--- a/pidgin/gtkblist.c	Thu Jun 12 22:21:37 2014 +0530
+++ b/pidgin/gtkblist.c	Sun Jun 15 03:46:35 2014 +0530
@@ -4807,15 +4807,21 @@
 }
 
 static void
-written_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message,
-		PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node)
+written_msg_update_ui_cb(PurpleConversation *conv, PurpleMessage *msg, PurpleBlistNode *node)
 {
 	PidginBlistNode *ui = purple_blist_node_get_ui_data(node);
-	if (ui->conv.conv != conv || !pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv)) ||
-			!(flag & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)))
+
+	if (ui->conv.conv != conv)
+		return;
+
+	if (!pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv)))
 		return;
+
+	if (!(purple_message_get_flags(msg) & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)))
+		return;
+
 	ui->conv.flags |= PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE;
-	if (PURPLE_IS_CHAT_CONVERSATION(conv) && (flag & PURPLE_MESSAGE_NICK))
+	if (PURPLE_IS_CHAT_CONVERSATION(conv) && (purple_message_get_flags(msg) & PURPLE_MESSAGE_NICK))
 		ui->conv.flags |= PIDGIN_BLIST_CHAT_HAS_PENDING_MESSAGE_WITH_NICK;
 
 	ui->conv.last_message = time(NULL);    /* XXX: for lack of better data */