Mercurial > pidgin
changeset 21766:8c1bcaaaac34
merge of '6cc61e144190cb90c18c63d45b7d7abd95a67008'
and '7adb724fcfb08212b94d02541fea98c6b1a20658'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 04 Dec 2007 09:32:22 +0000 |
| parents | 8922d61c738a (diff) c7e81e9cc476 (current diff) |
| children | 7ac87187bbec 6b42bed44324 e9f94dd202c8 |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);