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

better handling of block list. Fixes #6005

This commit is contained in:
Yann Leboulanger 2010-10-31 18:21:33 +01:00
parent 667d2c9f6f
commit c4b005e0ee
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui_interface.py
View File

@ -1396,20 +1396,31 @@ class Interface:
self.instances[account]['privacy_list_%s' % name].\
privacy_list_received(rules)
if name == 'block':
gajim.connections[account].blocked_contacts = []
gajim.connections[account].blocked_groups = []
gajim.connections[account].blocked_list = []
con = gajim.connections[account]
con.blocked_contacts = []
con.blocked_groups = []
con.blocked_list = []
gajim.connections[account].blocked_all = False
for rule in rules:
if not 'type' in rule:
gajim.connections[account].blocked_all = True
elif rule['type'] == 'jid' and rule['action'] == 'deny':
gajim.connections[account].blocked_contacts.append(
rule['value'])
elif rule['type'] == 'group' and rule['action'] == 'deny':
gajim.connections[account].blocked_groups.append(
rule['value'])
gajim.connections[account].blocked_list.append(rule)
if rule['action'] == 'allow':
if not 'type' in rule:
con.blocked_all = False
elif rule['type'] == 'jid' and rule['value'] in \
con.blocked_contacts:
con.blocked_contacts.remove(rule['value'])
elif rule['type'] == 'group' and rule['value'] in \
con.blocked_groups:
con.blocked_groups.remove(rule['value'])
elif rule['action'] == 'deny':
if not 'type' in rule:
con.blocked_all = True
elif rule['type'] == 'jid' and rule['value'] not in \
con.blocked_contacts:
con.blocked_contacts.append(rule['value'])
elif rule['type'] == 'group' and rule['value'] not in \
con.blocked_groups:
con.blocked_groups.append(rule['value'])
con.blocked_list.append(rule)
if 'blocked_contacts' in self.instances[account]:
self.instances[account]['blocked_contacts'].\
privacy_list_received(rules)