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

add advanced option to disable showing affiliation in muc. Fixes #5534

This commit is contained in:
Yann Leboulanger 2010-01-07 20:52:16 +01:00
parent eb74b2e592
commit 4a8e30800f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/config.py
View File

@ -279,6 +279,7 @@ class Config:
'video_output_device': [opt_str, 'autovideosink'], 'video_output_device': [opt_str, 'autovideosink'],
'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')],
'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')],
'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')],
} }
__options_per_key = { __options_per_key = {

3
src/groupchat_control.py
View File

@ -1136,7 +1136,8 @@ class GroupchatControl(ChatControlBase):
'%s</span>') % (colorstring, gobject.markup_escape_text(status)) '%s</span>') % (colorstring, gobject.markup_escape_text(status))
if image.get_storage_type() == gtk.IMAGE_PIXBUF and \ if image.get_storage_type() == gtk.IMAGE_PIXBUF and \
gc_contact.affiliation != 'none': gc_contact.affiliation != 'none' and gajim.config.get(
'show_affiliation_in_groupchat'):
pixbuf1 = image.get_pixbuf().copy() pixbuf1 = image.get_pixbuf().copy()
pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 4, 4) pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 4, 4)
if gc_contact.affiliation == 'owner': if gc_contact.affiliation == 'owner':