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

Remove redundant method

Browse source
This commit is contained in:
Philipp Hörist 2017-01-28 18:44:26 +01:00
parent 9f5c13b5bb
commit 2c23b36ac3
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/connection.py
View file

@ -1733,16 +1733,6 @@ class Connection(CommonConnection, ConnectionHandlers):
iq = self.build_invisible_rule() iq = self.build_invisible_rule()
self.connection.send(iq) self.connection.send(iq)
def activate_privacy_rule(self, name):
"""
Activate a privacy rule
"""
if not gajim.account_is_connected(self.name):
return
iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='')
iq.setQuery().setTag('active', {'name': name})
self.connection.send(iq)
def get_max_blocked_list_order(self): def get_max_blocked_list_order(self):
max_order = 0 max_order = 0
for rule in self.blocked_list: for rule in self.blocked_list:
@ -1887,7 +1877,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if iq_obj.getType() == 'error': # server doesn't support privacy lists if iq_obj.getType() == 'error': # server doesn't support privacy lists
return return
# active the privacy rule # active the privacy rule
self.activate_privacy_rule('invisible') self.set_active_list('invisible')
self.connected = gajim.SHOW_LIST.index('invisible') self.connected = gajim.SHOW_LIST.index('invisible')
self.status = msg self.status = msg
priority = gajim.get_priority(self.name, 'invisible') priority = gajim.get_priority(self.name, 'invisible')
@ -2123,11 +2113,11 @@ class Connection(CommonConnection, ConnectionHandlers):
def _change_from_invisible(self): def _change_from_invisible(self):
if self.privacy_rules_supported: if self.privacy_rules_supported:
if self.blocked_list: if self.blocked_list:
self.activate_privacy_rule(self.privacy_default_list) self.set_active_list(self.privacy_default_list)
else: else:
iq = self.build_privacy_rule('visible', 'allow') iq = self.build_privacy_rule('visible', 'allow')
self.connection.send(iq) self.connection.send(iq)
self.activate_privacy_rule('visible') self.set_active_list('visible')
def _update_status(self, show, msg): def _update_status(self, show, msg):
xmpp_show = helpers.get_xmpp_show(show) xmpp_show = helpers.get_xmpp_show(show)