comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 21021
- 76699adfc9d0
- parent 21020
- 6dfd2501690e
- parent 21014
- deec3bfa4380
- child 21023
- 13e6a16f5632
equal
deleted
inserted
replaced
| 21020:6dfd2501690e | 21021:76699adfc9d0 |
|---|---|
| 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); |
