copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new ACE option: print_status_in_muc. Fixes #1502

This commit is contained in:
Yann Leboulanger 2006-05-03 13:22:05 +00:00
parent 0e3c8cede9
commit 2e06ec6d7e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_control.py
View File

@ -1067,6 +1067,8 @@ class ChatControl(ChatControlBase):
jid = contact.jid jid = contact.jid
if frm == 'status': if frm == 'status':
if not gajim.config.get('print_status_in_chats'):
return
kind = 'status' kind = 'status'
name = '' name = ''
elif frm == 'info': elif frm == 'info':

4
src/common/config.py
View File

@ -180,8 +180,8 @@ class Config:
'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_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], '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.')], '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, 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_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_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], 'log_contact_status_changes': [opt_bool, False],
'restored_messages_color': [opt_str, 'grey'], 'restored_messages_color': [opt_str, 'grey'],
'hide_avatar_of_transport': [opt_bool, False], 'hide_avatar_of_transport': [opt_bool, False],

2
src/conversation_textview.py
View File

@ -569,8 +569,6 @@ class ConversationTextview:
other_tags_for_name = [], other_tags_for_time = [], other_tags_for_name = [], other_tags_for_time = [],
other_tags_for_text = [], subject = None): other_tags_for_text = [], subject = None):
'''prints 'chat' type messages''' '''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, ... # kind = info, we print things as if it was a status: same color, ...
if kind == 'info': if kind == 'info':
kind = 'status' kind = 'status'

2
src/groupchat_control.py
View File

@ -505,6 +505,8 @@ class GroupchatControl(ChatControlBase):
# muc-specific chatstate # muc-specific chatstate
self.parent_win.redraw_tab(self, 'newmsg') self.parent_win.redraw_tab(self, 'newmsg')
else: else:
if not gajim.config.get('print_status_in_muc'):
return
kind = 'status' kind = 'status'
if kind == 'incoming': # it's a message NOT from us if kind == 'incoming': # it's a message NOT from us