pidgin/gtkconv.c

branch
release-2.3.1
changeset 21722
8b275923f914
parent 21721
721e4b54de86
child 21723
337cd29fb4b0
equal deleted inserted replaced
21721:721e4b54de86 21722:8b275923f914
2858 PurpleConversation *conv = (PurpleConversation*)l->data; 2858 PurpleConversation *conv = (PurpleConversation*)l->data;
2859 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); 2859 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
2860 2860
2861 if(gtkconv == NULL || gtkconv->active_conv != conv) 2861 if(gtkconv == NULL || gtkconv->active_conv != conv)
2862 continue; 2862 continue;
2863 if (gtkconv == NULL) { 2863
2864 if (!purple_conversation_get_data(conv, "unseen-count") || 2864 if (gtkconv->unseen_state >= min_state
2865 !purple_conversation_get_data(conv, "unseen-state") || 2865 && (!hidden_only ||
2866 GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-state"))<min_state) 2866 (hidden_only && gtkconv->win == hidden_convwin))) {
2867 continue; 2867
2868 r = g_list_prepend(r, conv); 2868 r = g_list_prepend(r, conv);
2869 c++; 2869 c++;
2870 } 2870 }
2871 } 2871 }
2872 2872

mercurial