# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1228519727 0
# Node ID a05e9cf91efbccb2afdf3d2d0f5c0e540eb87df9
# Parent  c457c635eb8fce84d09ed2b37e36f56e812fc753
Do not mistakenly use the preference to hide new IMs for persistent
chats. Fixes #5312.

diff -r c457c635eb8f -r a05e9cf91efb pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Dec 04 04:15:28 2008 +0000
+++ b/pidgin/gtkconv.c	Fri Dec 05 23:28:47 2008 +0000
@@ -7282,18 +7282,14 @@
 	if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus))
 		return;
 
-	while ((l = hidden_convwin->gtkconvs) != NULL)
-	{
+	for (l = hidden_convwin->gtkconvs; l; ) {
 		gtkconv = l->data;
+		l = l->next;
 
 		conv = gtkconv->active_conv;
-
-		while(l && !purple_status_is_available(
-					purple_account_get_active_status(
-					purple_conversation_get_account(conv))))
-			l = l->next;
-		if (!l)
-			break;
+		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT ||
+				account != purple_conversation_get_account(conv))
+			continue;
 
 		pidgin_conv_attach_to_conversation(conv);