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

nothing: remove ^M from win

Browse source
This commit is contained in:
Yann Leboulanger 2006-04-19 10:06:59 +00:00
parent 84e7b2926b
commit 9fa62c5529
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/connection_handlers.py
View file

@ -1445,24 +1445,24 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
if ptype == 'subscribe': if ptype == 'subscribe':
gajim.log.debug('subscribe request from %s' % who) gajim.log.debug('subscribe request from %s' % who)
if gajim.config.get('alwaysauth') or who.find("@") <= 0 or \ 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: if self.connection:
p = common.xmpp.Presence(who, 'subscribed') p = common.xmpp.Presence(who, 'subscribed')
p = self.add_sha(p) p = self.add_sha(p)
self.connection.send(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', self.dispatch('NOTIFY', (jid_stripped, 'offline', 'offline',
resource, prio, keyID, timestamp)) resource, prio, keyID, timestamp))
if transport_auto_auth: if transport_auto_auth:
self.automatically_added.append(jid_stripped) self.automatically_added.append(jid_stripped)
self.request_subscription(jid_stripped) self.request_subscription(jid_stripped)
else: else:
if not status: if not status:
status = _('I would like to add you to my roster.') status = _('I would like to add you to my roster.')
self.dispatch('SUBSCRIBE', (who, status)) self.dispatch('SUBSCRIBE', (who, status))
elif ptype == 'subscribed': elif ptype == 'subscribed':
if jid_stripped in self.automatically_added: if jid_stripped in self.automatically_added:
self.automatically_added.remove(jid_stripped) self.automatically_added.remove(jid_stripped)
else: else:
self.dispatch('SUBSCRIBED', (jid_stripped, resource)) self.dispatch('SUBSCRIBED', (jid_stripped, resource))
# BE CAREFUL: no con.updateRosterItem() in a callback # BE CAREFUL: no con.updateRosterItem() in a callback