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

JEP 0070 Last Call updates; transaction IDs are a MUST, so we should display them to the user. 

Closes #1088
This commit is contained in:
Travis Shirk 2005-11-13 01:48:48 +00:00
parent 82b7e98371
commit 96fbd0ae4f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/connection.py
View File

@ -5,6 +5,7 @@
## - Vincent Hanquez <tab@snarc.org> ## - Vincent Hanquez <tab@snarc.org>
## - Nikos Kouremenos <nkour@jabber.org> ## - Nikos Kouremenos <nkour@jabber.org>
## - Dimitur Kirov <dkirov@gmail.com> ## - Dimitur Kirov <dkirov@gmail.com>
## - Travis Shirk <travis@pobox.com>
## ##
## Copyright (C) 2003-2005 Gajim Team ## Copyright (C) 2003-2005 Gajim Team
## ##
@ -1353,9 +1354,10 @@ class Connection:
if opt in ('yes', 'no'): if opt in ('yes', 'no'):
self.build_http_auth_answer(iq_obj, opt) self.build_http_auth_answer(iq_obj, opt)
else: else:
id = iq_obj.getTagAttr('confirm', 'id')
method = iq_obj.getTagAttr('confirm', 'method') method = iq_obj.getTagAttr('confirm', 'method')
url = iq_obj.getTagAttr('confirm', 'url') url = iq_obj.getTagAttr('confirm', 'url')
self.dispatch('HTTP_AUTH', (method, url, iq_obj)); self.dispatch('HTTP_AUTH', (method, url, id, iq_obj));
raise common.xmpp.NodeProcessed raise common.xmpp.NodeProcessed
def _ErrorCB(self, con, iq_obj): def _ErrorCB(self, con, iq_obj):
@ -1837,7 +1839,8 @@ class Connection:
msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc) msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc)
# chatstates - if peer supports jep85, send chatstates # chatstates - if peer supports jep85, send chatstates
# please note that the only valid tag inside a message containing a <body> tag is the active event # please note that the only valid tag inside a message containing a <body>
# tag is the active event
if chatstate is not None: if chatstate is not None:
msg_iq.setTag(chatstate, {}, msg_iq.setTag(chatstate, {},
namespace = 'http://jabber.org/protocol/chatstates') namespace = 'http://jabber.org/protocol/chatstates')

1
src/dialogs.py
View File

@ -439,6 +439,7 @@ class AboutDialog:
'Vincent Hanquez <tab@snarc.org>', 'Vincent Hanquez <tab@snarc.org>',
'Nikos Kouremenos <kourem@gmail.com>', 'Nikos Kouremenos <kourem@gmail.com>',
'Dimitur Kirov <dkirov@gmail.com>', 'Dimitur Kirov <dkirov@gmail.com>',
'Travis Shirk <travis@pobox.com>',
'Gajim patchers' 'Gajim patchers'
] ]

7
src/gajim.py
View File

@ -9,6 +9,7 @@ exec python -OOt "$0" ${1+"$@"}
## - Vincent Hanquez <tab@snarc.org> ## - Vincent Hanquez <tab@snarc.org>
## - Nikos Kouremenos <kourem@gmail.com> ## - Nikos Kouremenos <kourem@gmail.com>
## - Dimitur Kirov <dkirov@gmail.com> ## - Dimitur Kirov <dkirov@gmail.com>
## - Travis Shirk <travis@pobox.com>
## ##
## Copyright (C) 2003-2005 Gajim Team ## Copyright (C) 2003-2005 Gajim Team
## ##
@ -192,9 +193,9 @@ class Interface:
room_jid) room_jid)
def handle_event_http_auth(self, account, data): def handle_event_http_auth(self, account, data):
#('HTTP_AUTH', account, (method, url, iq_obj)) #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
dialog = dialogs.ConfirmationDialog(_('HTTP (%s) Authorization for %s') \ dialog = dialogs.ConfirmationDialog(_('HTTP (%s) Authorization for %s (id: %s)') \
% (data[0], data[1]), _('Do you accept this request?')) % (data[0], data[1], data[2]), _('Do you accept this request?'))
if dialog.get_response() == gtk.RESPONSE_OK: if dialog.get_response() == gtk.RESPONSE_OK:
answer = 'yes' answer = 'yes'
else: else: