im.pidgin.pidgin.2.3.1: 9f41d42014773f6e91ad1d1c96020f56f3d6f551

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 9f41d42014773f6e91ad1d1c96020f56f3d6f551
Ancestor: 3dfb75aef38ee89eee43c2a66014c1fed0a5f89f
Author: nosnilmot at pidgin.im
Date: 2007-12-01T15:24:36
Branch: im.pidgin.pidgin.2.3.1

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Fix getting unseen conversation list, I think I merged it wrong during my
pluckfest.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	b9e55a23f3329a6d48d09af2eaeb579a510c48b0
+++ pidgin/gtkconv.c	d4d86d8874a699f63fe69d2eb72e2cb614dabb1e
@@ -2860,11 +2860,11 @@ pidgin_conversations_find_unseen_list(Pu
 
 		if(gtkconv == NULL || gtkconv->active_conv != conv)
 			continue;
-		if (gtkconv == NULL) {
-			if (!purple_conversation_get_data(conv, "unseen-count") ||
-				!purple_conversation_get_data(conv, "unseen-state") ||
-				GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-state"))<min_state)
-				continue;
+
+		if (gtkconv->unseen_state >= min_state
+				&& (!hidden_only ||
+					(hidden_only && gtkconv->win == hidden_convwin))) {
+
 			r = g_list_prepend(r, conv);
 			c++;
 		}