Changeset 6271

Timestamp:

05/03/06 15:22:05 (3 years ago)

Author:

asterix

Message:

new ACE option: print_status_in_muc. Fixes #1502

Location:

trunk/src

Files:

• chat_control.py (modified) (1 diff)
• common/config.py (modified) (1 diff)
• conversation_textview.py (modified) (1 diff)
• groupchat_control.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -1068 +1068 @@
 
                 if frm == 'status':
+                        if not gajim.config.get('print_status_in_chats'):
+                                return
                         kind = 'status'
                         name = ''

trunk/src/common/config.py

@@ -181 +181 @@
                 'show_avatars_in_roster': [opt_bool, True, '', True],
                 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')],
-                #FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-                'print_status_in_chats': [opt_bool, True, _('If False, you will no longer see status line in chats when a contact changes his or her status and/or his status message.')],
+                'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')],
+                'print_status_in_muc': [opt_bool, True, _('If False, Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message.')],
                 'log_contact_status_changes': [opt_bool, False],
                 'restored_messages_color': [opt_str, 'grey'],

trunk/src/conversation_textview.py

@@ -570 +570 @@
                         other_tags_for_text = [], subject = None):
                 '''prints 'chat' type messages'''
-                if kind == 'status' and not gajim.config.get('print_status_in_chats'):
-                                return
                 # kind = info, we print things as if it was a status: same color, ...
                 if kind == 'info':

trunk/src/groupchat_control.py

@@ -506 +506 @@
                                 self.parent_win.redraw_tab(self, 'newmsg')
                 else:
+                        if not gajim.config.get('print_status_in_muc'):
+                                return
                         kind = 'status'