Author: asterix Date: 2006-05-03 15:22:05 +0200 (Wed, 03 May 2006) New Revision: 6271

Modified: trunk/src/chat_control.py trunk/src/common/config.py trunk/src/conversation_textview.py trunk/src/groupchat_control.py Log: new ACE option: print_status_in_muc. Fixes #1502

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-05-02 19:25:44 UTC (rev 6270) +++ trunk/src/chat_control.py 2006-05-03 13:22:05 UTC (rev 6271) @@ -1067,6 +1067,8 @@ jid = contact.jid

if frm == 'status': + if not gajim.config.get('print_status_in_chats'): + return kind = 'status' name = '' elif frm == 'info':

Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-05-02 19:25:44 UTC (rev 6270) +++ trunk/src/common/config.py 2006-05-03 13:22:05 UTC (rev 6271) @@ -180,8 +180,8 @@ 'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window'), True], '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'], 'hide_avatar_of_transport': [opt_bool, False],

Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2006-05-02 19:25:44 UTC (rev 6270) +++ trunk/src/conversation_textview.py 2006-05-03 13:22:05 UTC (rev 6271) @@ -569,8 +569,6 @@ other_tags_for_name = [], other_tags_for_time = [], 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': kind = 'status'

Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-02 19:25:44 UTC (rev 6270) +++ trunk/src/groupchat_control.py 2006-05-03 13:22:05 UTC (rev 6271) @@ -505,6 +505,8 @@ # muc-specific chatstate self.parent_win.redraw_tab(self, 'newmsg') else: + if not gajim.config.get('print_status_in_muc'): + return kind = 'status'

if kind == 'incoming': # it's a message NOT from us