From 50465c626575692e7551afd0a15f02825f35869b Mon Sep 17 00:00:00 2001 From: Travis Shirk Date: Fri, 27 Jan 2006 03:43:00 +0000 Subject: [PATCH] Fix for #1420 --- src/chat_control.py | 6 ++++-- src/message_control.py | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index e22162afb..0e81f15f9 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -498,7 +498,7 @@ class ChatControlBase(MessageControl): if self.conv_textview.at_the_end(): #we are at the end if self.nb_unread > 0: - self.nb_unread = 0 + self.get_specific_unread() + self.nb_unread = self.get_specific_unread() self.parent_win.redraw_tab(self) self.parent_win.show_title() if gajim.interface.systray_enabled: @@ -580,7 +580,9 @@ class ChatControlBase(MessageControl): if not self.nb_unread: return jid = self.contact.jid - if self.conv_textview.at_the_end() and self.parent_win.window.is_active(): + if self.conv_textview.at_the_end() and \ + self.parent_win.get_active_control() == self and \ + self.parent_win.window.is_active(): #we are at the end self.nb_unread = self.get_specific_unread() self.parent_win.redraw_tab(self) diff --git a/src/message_control.py b/src/message_control.py index 14707341c..dc0820e5e 100644 --- a/src/message_control.py +++ b/src/message_control.py @@ -109,7 +109,10 @@ class MessageControl: self.compact_view_current = state def get_specific_unread(self): - return 0 + n = 0 + if gajim.awaiting_events[self.account].has_key(self.contact.jid): + n = len(gajim.awaiting_events[self.account][self.contact.jid]) + return n def send_message(self, message, keyID = '', type = 'chat', chatstate = None): '''Send the given message to the active tab'''