Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 20948:128aca651b9a
merge of '4ac79800f2efc2dbe9a348189a545b149d6dfb44'
and '92060374e73337f24fcb27c372b2c970120b1252'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 15 Oct 2007 04:42:44 +0000 |
| parents | 3c4d37b98c31 87742ec493b1 |
| children | a9f1e320d94d |
comparison
equal
deleted
inserted
replaced
| 20947:3c4d37b98c31 | 20948:128aca651b9a |
|---|---|
| 2851 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); | 2851 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); |
| 2852 | 2852 |
| 2853 if (gtkconv != NULL && gtkconv->active_conv != conv) | 2853 if (gtkconv != NULL && gtkconv->active_conv != conv) |
| 2854 continue; | 2854 continue; |
| 2855 if (gtkconv == NULL) { | 2855 if (gtkconv == NULL) { |
| 2856 if (!hidden_only || | |
| 2857 !purple_conversation_get_data(conv, "unseen-count")) | |
| 2858 continue; | |
| 2856 r = g_list_prepend(r, conv); | 2859 r = g_list_prepend(r, conv); |
| 2857 c++; | 2860 c++; |
| 2858 } else { | 2861 } else { |
| 2859 if (gtkconv->unseen_state >= min_state && !hidden_only) { | 2862 if (gtkconv->unseen_state >= min_state && !hidden_only) { |
| 2860 r = g_list_prepend(r, conv); | 2863 r = g_list_prepend(r, conv); |