im.pidgin.pidgin.2.3.1: 7127613288949841d5157be8e2b8a3553d53a8fc

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 7127613288949841d5157be8e2b8a3553d53a8fc
Ancestor: 465d88060d28e7c3c1115aefac954b4f8c9da88a
Author: nosnilmot at pidgin.im
Date: 2007-12-06T01:16:25
Branch: im.pidgin.pidgin.2.3.1

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

applied changes from e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e
             through 6cc61e144190cb90c18c63d45b7d7abd95a67008
Fix a bug when changing 'close new ims' to always, then to never.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	67c25a6fb985618001e1a5a1326098070af2739d
+++ pidgin/gtkconv.c	9f5a3b0c9f530710613825a5d2364bcca0732b59
@@ -7273,15 +7273,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);