changeset
merge of '240e6aaff0029a401046c62a147c87ca05499110'
Tue, 04 Dec 2007 09:32:22 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Tue, 04 Dec 2007 09:32:22 +0000
- changeset 21883
- 229102b0bda8
- parent 21869
- 240e6aaff002 (diff)
- parent 21882
- f8fb7939e11b (current diff)
- child 21884
- 2cf0d6216082
- child 21885
- ceba9336b752
- child 21886
- be9880b42bd2
merge of '240e6aaff0029a401046c62a147c87ca05499110'
and 'f8fb7939e11b6bbd885c989e535a07214528eb9d'
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkconv.c Tue Dec 04 09:32:18 2007 +0000 +++ b/pidgin/gtkconv.c Tue Dec 04 09:32:22 2007 +0000 @@ -7193,15 +7193,18 @@ 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);
