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

fix some typos

This commit is contained in:
Yann Leboulanger 2005-04-26 21:33:01 +00:00
parent 0ca7b52f8d
commit 3cd6922815
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/GnuPG.py
View File

@ -171,6 +171,7 @@ else:
def _stripHeaderFooter(self, data): def _stripHeaderFooter(self, data):
"""Remove header and footer from data""" """Remove header and footer from data"""
if not data: return ''
lines = data.split('\n') lines = data.split('\n')
while lines[0] != '': while lines[0] != '':
lines.remove(lines[0]) lines.remove(lines[0])

10
src/common/connection.py
View File

@ -398,11 +398,11 @@ class Connection:
iq_obj.setTo(f) iq_obj.setTo(f)
iq_obj.setType('result') iq_obj.setType('result')
qp = iq_obj.getTag('query') qp = iq_obj.getTag('query')
qp.insertTag('name').insertData('Gajim') qp.setTagData('name', 'Gajim')
qp.insertTag('version').insertData(gajim.version) qp.setTagData('version', gajim.version)
send_os = gajim.config.get('send_os_info') send_os = gajim.config.get('send_os_info')
if send_os: if send_os:
qp.insertTag('os').insertData(get_os_info()) qp.setTagData('os', get_os_info())
self.connection.send(iq_obj) self.connection.send(iq_obj)
def _VersionResultCB(self, con, iq_obj): def _VersionResultCB(self, con, iq_obj):
@ -612,7 +612,7 @@ class Connection:
p = common.xmpp.Presence(typ = ptype, priority = prio, show =\ p = common.xmpp.Presence(typ = ptype, priority = prio, show =\
status, status=msg) status, status=msg)
if signed: if signed:
presence.setTag(common.xmpp.NS_SIGNED + ' x').insertData(signed) p.setTag(common.xmpp.NS_SIGNED + ' x').setData(signed)
self.connection.send(p) self.connection.send(p)
self.dispatch('STATUS', status) self.dispatch('STATUS', status)
@ -636,7 +636,7 @@ class Connection:
prio = str(gajim.config.get_per('accounts', self.name, 'priority')) prio = str(gajim.config.get_per('accounts', self.name, 'priority'))
p = common.xmpp.Presence(typ = ptype, priority = prio, show = status,\ p = common.xmpp.Presence(typ = ptype, priority = prio, show = status,\
status = msg) status = msg)
if signed: presence.setTag(common.xmpp.NS_SIGNED + ' x').insertData( if signed: presence.setTag(common.xmpp.NS_SIGNED + ' x').setData(
signed) signed)
self.connection.send(p) self.connection.send(p)
self.dispatch('STATUS', status) self.dispatch('STATUS', status)

3
src/common/xmpp/protocol.py
View File

@ -34,6 +34,7 @@ NS_DELAY ='jabber:x:delay'
NS_DIALBACK ='jabber:server:dialback' NS_DIALBACK ='jabber:server:dialback'
NS_DISCO_INFO ='http://jabber.org/protocol/disco#info' NS_DISCO_INFO ='http://jabber.org/protocol/disco#info'
NS_DISCO_ITEMS ='http://jabber.org/protocol/disco#items' NS_DISCO_ITEMS ='http://jabber.org/protocol/disco#items'
NS_ENCRYPTED ='jabber:x:encrypted' # JEP-0027
NS_GROUPCHAT ='gc-1.0' NS_GROUPCHAT ='gc-1.0'
NS_IBB ='http://jabber.org/protocol/ibb' NS_IBB ='http://jabber.org/protocol/ibb'
NS_INVISIBLE ='presence-invisible' # jabberd2 NS_INVISIBLE ='presence-invisible' # jabberd2
@ -54,7 +55,7 @@ NS_SASL ='urn:ietf:params:xml:ns:xmpp-sasl'
NS_SEARCH ='jabber:iq:search' NS_SEARCH ='jabber:iq:search'
NS_SERVER ='jabber:server' NS_SERVER ='jabber:server'
NS_SESSION ='urn:ietf:params:xml:ns:xmpp-session' NS_SESSION ='urn:ietf:params:xml:ns:xmpp-session'
NS_SIGNED = "jabber:x:signed" # JEP-0027 NS_SIGNED ='jabber:x:signed' # JEP-0027
NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas' NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas'
NS_STREAMS ='http://etherx.jabber.org/streams' NS_STREAMS ='http://etherx.jabber.org/streams'
NS_TIME ='jabber:iq:time' NS_TIME ='jabber:iq:time'