From e2929d12bf76486d07861d4c1946cf2cb33cd27d Mon Sep 17 00:00:00 2001 From: Jean-Marie Traissard Date: Fri, 3 Nov 2006 21:27:56 +0000 Subject: [PATCH] Fix notify_on_all_muc_messages I just broke, remove useless and unclear function --- src/chat_control.py | 3 ++- src/groupchat_control.py | 3 --- src/message_control.py | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 7bc85cb20..6093fa896 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -561,7 +561,8 @@ class ChatControlBase(MessageControl): if self.type_id == message_control.TYPE_GC: gc_message = True if not gc_message or \ - (gc_message and other_tags_for_text == ['marked']): + (gc_message and (other_tags_for_text == ['marked'] or \ + gajim.config.get('notify_on_all_muc_messages'))): # we want to have save this message in events list # other_tags_for_text == ['marked'] --> highlighted gc message type_ = 'printed_' + self.type_id diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 275a410ab..3192f0e2a 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -326,9 +326,6 @@ class GroupchatControl(ChatControlBase): menu.show_all() - def notify_on_new_messages(self): - return gajim.config.get('notify_on_all_muc_messages') - def on_treeview_size_allocate(self, widget, allocation): '''The MUC treeview has resized. Move the hpaned in all tabs to match''' self.hpaned_position = self.hpaned.get_position() diff --git a/src/message_control.py b/src/message_control.py index 75cc011ec..8c9c0612c 100644 --- a/src/message_control.py +++ b/src/message_control.py @@ -68,10 +68,6 @@ class MessageControl: # NOTE: Derived classes MUST implement this pass - def notify_on_new_messages(self): - # NOTE: Derived classes MUST implement this - return False - def repaint_themed_widgets(self, theme): pass # NOTE: Derived classes SHOULD implement this