From 9fa62c55295638fe7ec3378acecde0b11290817c Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 19 Apr 2006 10:06:59 +0000 Subject: [PATCH] nothing: remove ^M from win --- src/common/connection_handlers.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index a2c99f263..a74f7f3e3 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1445,24 +1445,24 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco) if ptype == 'subscribe': gajim.log.debug('subscribe request from %s' % who) if gajim.config.get('alwaysauth') or who.find("@") <= 0 or \ - jid_stripped in self.jids_for_auto_auth or transport_auto_auth: + jid_stripped in self.jids_for_auto_auth or transport_auto_auth: if self.connection: p = common.xmpp.Presence(who, 'subscribed') p = self.add_sha(p) self.connection.send(p) - if who.find("@") <= 0 or transport_auto_auth: + if who.find("@") <= 0 or transport_auto_auth: self.dispatch('NOTIFY', (jid_stripped, 'offline', 'offline', - resource, prio, keyID, timestamp)) - if transport_auto_auth: - self.automatically_added.append(jid_stripped) + resource, prio, keyID, timestamp)) + if transport_auto_auth: + self.automatically_added.append(jid_stripped) self.request_subscription(jid_stripped) else: if not status: status = _('I would like to add you to my roster.') self.dispatch('SUBSCRIBE', (who, status)) - elif ptype == 'subscribed': - if jid_stripped in self.automatically_added: - self.automatically_added.remove(jid_stripped) + elif ptype == 'subscribed': + if jid_stripped in self.automatically_added: + self.automatically_added.remove(jid_stripped) else: self.dispatch('SUBSCRIBED', (jid_stripped, resource)) # BE CAREFUL: no con.updateRosterItem() in a callback