From ee64aa72ee8b6deb8ce83606db696a18a0881934 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 7 Sep 2005 15:57:01 +0000 Subject: [PATCH] remove an unusefull option --- src/common/config.py | 3 +-- src/common/connection.py | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index e1765a3f7..db5af9038 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -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 ], diff --git a/src/common/connection.py b/src/common/connection.py index b2330d410..cd4b66831 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -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)