remove an unusefull option

This commit is contained in:
Yann Leboulanger 2005-09-07 15:57:01 +00:00
parent 3676f7f80b
commit ee64aa72ee
2 changed files with 4 additions and 7 deletions

View File

@ -37,8 +37,7 @@ class Config:
__options = {
# name: [ type, value ]
'verbose': [ opt_bool, False ],
'delauth': [ opt_bool, True ],
'delroster': [ opt_bool, True ],
'contact_mutual_removal': [ opt_bool, True, _("When we remove a contact, remove both his and our subscription, so we don't receive his presence anymore and he neither")],
'alwaysauth': [ opt_bool, False ],
'autopopup': [ opt_bool, False ],
'notify_on_signin': [ opt_bool, True ],

View File

@ -1607,12 +1607,10 @@ class Connection:
def unsubscribe(self, jid):
if not self.connection:
return
delauth = gajim.config.get('delauth')
delroster = gajim.config.get('delroster')
if delauth:
self.connection.getRoster().Unsubscribe(jid)
if delroster:
if gajim.config.get('contact_mutual_removal'):
self.connection.getRoster().delItem(jid)
else:
self.connection.getRoster().Unsubscribe(jid)
def _continue_unsubscribe(self, con, iq_obj, agent):
self.connection.getRoster().delItem(agent)