im.pidgin.pidgin: 6cc61e144190cb90c18c63d45b7d7abd95a67008

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 6cc61e144190cb90c18c63d45b7d7abd95a67008
Ancestor: e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e
Author: sadrul at pidgin.im
Date: 2007-12-04T09:30:25
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Fix a bug when changing 'close new ims' to always, then to never.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	55bed5830a8ddf70cf39ad7964fb8f3ec4e5bcb5
+++ pidgin/gtkconv.c	3c316bbda5d6f223046a7eaa913e1b3363d93737
@@ -7193,15 +7193,18 @@ hide_new_pref_cb(const char *name, Purpl
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0)
 		when_away = TRUE;
 
-	while ((l = hidden_convwin->gtkconvs) != NULL)
+	for (l = hidden_convwin->gtkconvs; l; )
 	{
 		gtkconv = l->data;
+		l = l->next;
 
 		conv = gtkconv->active_conv;
 
-		if(when_away && !purple_status_is_available(
+		if (conv->type == PURPLE_CONV_TYPE_CHAT ||
+				gtkconv->unseen_count == 0 ||
+				(when_away && !purple_status_is_available(
 							purple_account_get_active_status(
-							purple_conversation_get_account(conv))))
+							purple_conversation_get_account(conv)))))
 			continue;
 
 		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);