From 29cef733f21d2ffc24a5611239451e16cb9b4929 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 7 Sep 2006 14:35:23 +0000 Subject: [PATCH] don't count pm messages in roster window, but in groupchat window. Fixes #2401 --- src/chat_control.py | 2 -- src/groupchat_control.py | 8 ++++++++ src/roster_window.py | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 3223eff77..f41dbd266 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -85,8 +85,6 @@ class ChatControlBase(MessageControl): if self.resource: jid += '/' + self.resource type_ = self.type_id - if type_ == message_control.TYPE_GC: - type_ = 'gc_msg' return len(gajim.events.get_events(self.account, jid, ['printed_' + type_, type_])) diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 7de1bc020..054327806 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -555,6 +555,14 @@ class GroupchatControl(ChatControlBase): ChatControlBase.print_conversation_line(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text) + def get_nb_unread(self): + nb = len(gajim.events.get_events(self.account, self.room_jid, + ['printed_gc_msg'])) + for nick in gajim.contacts.get_nick_list(self.account, self.room_jid): + nb += len(gajim.events.get_events(self.account, self.room_jid + '/' + \ + nick, ['pm'])) + return nb + def highlighting_for_message(self, text, tim): '''Returns a 2-Tuple. The first says whether or not to highlight the text, the second, what sound to play.''' diff --git a/src/roster_window.py b/src/roster_window.py index 9810129c9..29e5f4353 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3563,7 +3563,10 @@ _('If "%s" accepts this request you will know his or her status.') % jid) change_title_allowed = gajim.config.get('change_roster_title') if change_title_allowed: start = '' - nb_unread = gajim.events.get_nb_events() + nb_unread = gajim.events.get_nb_events(['chat', 'normal', + 'file-request', 'file-error', 'file-completed', + 'file-request-error', 'file-send-error', 'file-stopped', 'gc_msg', + 'printed_chat', 'printed_gc_msg']) if nb_unread > 1: start = '[' + str(nb_unread) + '] ' elif nb_unread == 1: