Commits September 2012

commits@gajim.org

3 participants
33 discussions

gajim: roster accel group func returns true
by Yann Leboulanger 30 Sep '12

30 Sep '12

changeset f37abcc64bfb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f37abcc64bfb description: roster accel group func returns true diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fdd7c9b81c1b -r f37abcc64bfb src/roster_window.py --- a/src/roster_window.py Sun Sep 30 21:31:45 2012 +0200 +++ b/src/roster_window.py Sun Sep 30 21:54:08 2012 +0200 @@ -3566,7 +3566,7 @@ self.send_status(account, current_show, message) self.send_pep(account, pep_dict) dialogs.ChangeStatusMessageDialog(on_response, status) - return + return True def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed

1 0

gajim: return True in accel_group callback. Fixes #5371, #6903
by Yann Leboulanger 30 Sep '12

30 Sep '12

changeset fdd7c9b81c1b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fdd7c9b81c1b description: return True in accel_group callback. Fixes #5371, #6903 diffstat: src/message_window.py | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diffs (121 lines): diff -r 93cdb995e13c -r fdd7c9b81c1b src/message_window.py --- a/src/message_window.py Wed Sep 26 20:46:09 2012 -0400 +++ b/src/message_window.py Sun Sep 30 21:31:45 2012 +0200 @@ -110,7 +110,7 @@ for key in keys: keyval, mod = gtk.accelerator_parse(key) accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, - self.accel_group_func) + self.accel_group_func) self.window.add_accel_group(accel_group) # gtk+ doesn't make use of the motion notify on gtkwindow by default @@ -118,10 +118,10 @@ self.window.add_events(gtk.gdk.POINTER_MOTION_MASK) id_ = self.notebook.connect('switch-page', - self._on_notebook_switch_page) + self._on_notebook_switch_page) self.handlers[id_] = self.notebook id_ = self.notebook.connect('key-press-event', - self._on_notebook_key_press) + self._on_notebook_key_press) self.handlers[id_] = self.notebook # Tab customizations @@ -351,6 +351,7 @@ if modifier & gtk.gdk.CONTROL_MASK: if keyval == gtk.keysyms.h: # CTRL + h control._on_history_menuitem_activate() + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.f: # CTRL + f # CTRL + f moves cursor one char forward when user uses Emacs @@ -358,28 +359,36 @@ if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': control._on_send_file_menuitem_activate(None) + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.g: # CTRL + g control._on_convert_to_gc_menuitem_activate(None) + return True elif control.type_id in (message_control.TYPE_CHAT, message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i control._on_contact_information_menuitem_activate(None) + return True elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L control.conv_textview.clear() + return True elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line control.clear(control.msg_textview) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.b: # CTRL + b control._on_bookmark_room_menuitem_activate(None) + return True # Tab switch bindings elif keyval == gtk.keysyms.F4: # CTRL + F4 self.remove_tab(control, self.CLOSE_CTRL_KEY) + return True elif keyval == gtk.keysyms.w: # CTRL + w # CTRL + w removes latest word before sursor when User uses emacs # theme if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': self.remove_tab(control, self.CLOSE_CTRL_KEY) + return True elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down): # CTRL + PageUp | PageDown # Create event and send it to notebook @@ -389,12 +398,14 @@ event.state = gtk.gdk.CONTROL_MASK event.keyval = int(keyval) self.notebook.emit('key_press_event', event) + return True if modifier & gtk.gdk.SHIFT_MASK: # CTRL + SHIFT if control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.n: # CTRL + SHIFT + n control._on_change_nick_menuitem_activate(None) + return True # MOD1 (ALT) mask elif modifier & gtk.gdk.MOD1_MASK: # Tab switch bindings @@ -403,26 +414,34 @@ if new >= self.notebook.get_n_pages(): new = 0 self.notebook.set_current_page(new) + return True elif keyval == gtk.keysyms.Left: # ALT + LEFT new = self.notebook.get_current_page() - 1 if new < 0: new = self.notebook.get_n_pages() - 1 self.notebook.set_current_page(new) + return True elif chr(keyval) in st: # ALT + 1,2,3.. self.notebook.set_current_page(st.index(chr(keyval))) + return True elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons control.chat_buttons_set_visible(not control.hide_chat_buttons) + return True elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu control.show_emoticons_menu() + return True elif keyval == gtk.keysyms.d: # ALT + D show actions menu control.on_actions_button_clicked(control.actions_button) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.t: # ALT + t control._on_change_subject_menuitem_activate(None) + return True # Close tab bindings elif keyval == gtk.keysyms.Escape and \ - gajim.config.get('escape_key_closes'): # Escape + gajim.config.get('escape_key_closes'): # Escape self.remove_tab(control, self.CLOSE_ESC) + return True def _on_close_button_clicked(self, button, control): """

1 0

gajim: refactoring
by Jefry Lagrange 27 Sep '12

27 Sep '12

changeset 93cdb995e13c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93cdb995e13c description: refactoring diffstat: src/common/connection_handlers_events.py | 6 ++---- src/common/jingle.py | 6 +++--- src/common/jingle_session.py | 9 +++------ 3 files changed, 8 insertions(+), 13 deletions(-) diffs (60 lines): diff -r 100fa0b983fc -r 93cdb995e13c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/common/connection_handlers_events.py Wed Sep 26 20:46:09 2012 -0400 @@ -2002,10 +2002,8 @@ file_tag = desc.getTag('request').getTag('file') h = file_tag.getTag('hash') n = file_tag.getTag('name') - if h: - file_info = self.conn.get_file_info(hash_=h) - elif n: - file_info = self.conn.get_file_info(name=n) + pjid = gajim.get_jid_without_resource(self.fjid) + file_info = self.conn.get_file_info(pjid, hash_=h, name=n) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid diff -r 100fa0b983fc -r 93cdb995e13c src/common/jingle.py --- a/src/common/jingle.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/common/jingle.py Wed Sep 26 20:46:09 2012 -0400 @@ -194,15 +194,15 @@ # to be requested again. self.files.append(file_) - def get_file_info(self, hash_=None, name=None): + def get_file_info(self, peerjid, hash_=None, name=None): if hash_: for f in self.files: # DEBUG #if f['hash'] == '1294809248109223': - if f['hash'] == hash_: + if f['hash'] == hash_ and f['peerjid'] == peerjid: return f elif name: for f in self.files: - if f['name'] == name: + if f['name'] == name and f['peerjid'] == peerjid: return f def get_jingle_session(self, jid, sid=None, media=None): diff -r 100fa0b983fc -r 93cdb995e13c src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/common/jingle_session.py Wed Sep 26 20:46:09 2012 -0400 @@ -521,15 +521,12 @@ self.request = True h = request.getTag('file').getTag('hash') n = request.getTag('file').getTag('name') - if h: - file_info = self.connection.get_file_info(hash_=h) - elif n: - file_info = self.connection.get_file_info(name=n) pjid = gajim.get_jid_without_resource(self.peerjid) - if not file_info or file_info['peerjid'] != pjid: + file_info = self.connection.get_file_info(pjid, h, n) + if not file_info: log.warning('The peer ' + pjid + \ ' is requesting a ' + \ - 'file that we dont have or' + \ + 'file that we dont have or ' + \ 'it is not allowed to request') self.decline_session() raise xmpp.NodeProcessed

1 0

gajim: ignore presences when nothing changed (status, status mes...
by Yann Leboulanger 26 Sep '12

26 Sep '12

changeset 100fa0b983fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=100fa0b983fc description: ignore presences when nothing changed (status, status message, prio). Fixes #7210 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7160cf6d17c8 -r 100fa0b983fc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Sep 24 12:24:10 2012 +0200 +++ b/src/common/connection_handlers.py Wed Sep 26 16:03:18 2012 +0200 @@ -851,7 +851,7 @@ if obj.old_show == obj.new_show and obj.contact.status == \ obj.status and obj.contact.priority == obj.prio: # no change - return + return True else: obj.contact = gajim.contacts.get_first_contact_from_jid(account, jid)

1 0

gajim: decrease call to get_contact(s) function to improve speed...
by Yann Leboulanger 24 Sep '12

24 Sep '12

changeset 7160cf6d17c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7160cf6d17c8 description: decrease call to get_contact(s) function to improve speed. see #7125 diffstat: src/common/contacts.py | 2 +- src/roster_window.py | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diffs (79 lines): diff -r ec3c3635aecf -r 7160cf6d17c8 src/common/contacts.py --- a/src/common/contacts.py Sun Sep 23 23:59:26 2012 +0400 +++ b/src/common/contacts.py Mon Sep 24 12:24:10 2012 +0200 @@ -365,7 +365,7 @@ self.is_big_brother(account, jid, accounts): # count metacontacts only once continue - contact = self.get_contact_with_highest_priority(account, jid) + contact = self._accounts[account].contacts._contacts[jid][0] if _('Not in roster') in contact.groups: continue in_groups = False diff -r ec3c3635aecf -r 7160cf6d17c8 src/roster_window.py --- a/src/roster_window.py Sun Sep 23 23:59:26 2012 +0400 +++ b/src/roster_window.py Mon Sep 24 12:24:10 2012 +0200 @@ -1136,16 +1136,18 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected=False, focus=False): + def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None): """ Draw the correct state image, name BUT not avatar """ # focus is about if the roster window has toplevel-focus or not # FIXME: We really need a custom cell_renderer - contact_instances = gajim.contacts.get_contacts(account, jid) - contact = gajim.contacts.get_highest_prio_contact_from_contacts( - contact_instances) + if not contact_instances: + contact_instances = gajim.contacts.get_contacts(account, jid) + if not contact: + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) if not contact: return False @@ -1308,11 +1310,11 @@ else: return False - def draw_all_pep_types(self, jid, account): + def draw_all_pep_types(self, jid, account, contact=None): for pep_type in self._pep_type_to_model_column: - self.draw_pep(jid, account, pep_type) - - def draw_pep(self, jid, account, pep_type): + self.draw_pep(jid, account, pep_type, contact=contact) + + def draw_pep(self, jid, account, pep_type, contact=None): if pep_type not in self._pep_type_to_model_column: return if not self._is_pep_shown_in_roster(pep_type): @@ -1322,7 +1324,8 @@ iters = self._get_contact_iter(jid, account, model=self.model) if not iters: return - contact = gajim.contacts.get_contact(account, jid) + if not contact: + contact = gajim.contacts.get_contact(account, jid) if pep_type in contact.pep: pixbuf = contact.pep[pep_type].asPixbufIcon() else: @@ -1345,8 +1348,12 @@ return False def draw_completely(self, jid, account): - self.draw_contact(jid, account) - self.draw_all_pep_types(jid, account) + contact_instances = gajim.contacts.get_contacts(account, jid) + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) + self.draw_contact(jid, account, contact_instances=contact_instances, + contact=contact) + self.draw_all_pep_types(jid, account, contact=contact) self.draw_avatar(jid, account) def adjust_and_draw_contact_context(self, jid, account):

1 0

gajim: output style.
by Fomin Denis 23 Sep '12

23 Sep '12

changeset ec3c3635aecf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec3c3635aecf description: output style. diffstat: src/command_system/implementation/standard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 850eb549ea8f -r ec3c3635aecf src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sun Sep 23 13:34:21 2012 +0200 +++ b/src/command_system/implementation/standard.py Sun Sep 23 23:59:26 2012 +0400 @@ -129,8 +129,8 @@ @doc(_(""" Set the current status - Status can be given as one of the following values: online, away, - chat, xa, dnd. + Status can be given as one of the following values: + online, away, chat, xa, dnd. """)) def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'):

1 0

gajim: fix var name. Fixes #7229
by Yann Leboulanger 23 Sep '12

23 Sep '12

changeset 850eb549ea8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=850eb549ea8f description: fix var name. Fixes #7229 diffstat: src/common/connection_handlers.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 3c26e0149541 -r 850eb549ea8f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Sep 22 22:16:03 2012 -0400 +++ b/src/common/connection_handlers.py Sun Sep 23 13:34:21 2012 +0200 @@ -1002,9 +1002,9 @@ def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt): - encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] - gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], + self._on_message_decrypted, [obj2]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

1 0

gajim: coding standards
by Jefry Lagrange 23 Sep '12

23 Sep '12

changeset 3c26e0149541 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3c26e0149541 description: coding standards diffstat: src/common/connection_handlers_events.py | 4 ++-- src/common/jingle.py | 6 +++--- src/common/jingle_content.py | 2 +- src/common/jingle_ft.py | 2 +- src/common/jingle_session.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diffs (79 lines): diff -r 6f9b8f28ac92 -r 3c26e0149541 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Sep 22 13:25:55 2012 -0400 +++ b/src/common/connection_handlers_events.py Sat Sep 22 22:16:03 2012 -0400 @@ -2003,9 +2003,9 @@ h = file_tag.getTag('hash') n = file_tag.getTag('name') if h: - file_info = self.conn.get_files_info(hash_=h) + file_info = self.conn.get_file_info(hash_=h) elif n: - file_info = self.conn.get_files_info(name=n) + file_info = self.conn.get_file_info(name=n) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid diff -r 6f9b8f28ac92 -r 3c26e0149541 src/common/jingle.py --- a/src/common/jingle.py Sat Sep 22 13:25:55 2012 -0400 +++ b/src/common/jingle.py Sat Sep 22 22:16:03 2012 -0400 @@ -189,12 +189,12 @@ else: return sessions - def set_files_info(self, file_): + def set_file_info(self, file_): # Saves information about the files we have transfered in case they need # to be requested again. self.files.append(file_) - def get_files_info(self, hash_=None, name=None): + def get_file_info(self, hash_=None, name=None): if hash_: for f in self.files: # DEBUG #if f['hash'] == '1294809248109223': @@ -217,5 +217,5 @@ for session in self._sessions.values(): if session.peerjid == jid and session.get_content(media): return session + return None - return None diff -r 6f9b8f28ac92 -r 3c26e0149541 src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Sep 22 13:25:55 2012 -0400 +++ b/src/common/jingle_content.py Sat Sep 22 22:16:03 2012 -0400 @@ -203,7 +203,7 @@ 'date' : self.file_props.date, 'peerjid' : pjid } - self.session.connection.set_files_info(file_info) + self.session.connection.set_file_info(file_info) desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) diff -r 6f9b8f28ac92 -r 3c26e0149541 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Sep 22 13:25:55 2012 -0400 +++ b/src/common/jingle_ft.py Sat Sep 22 22:16:03 2012 -0400 @@ -142,7 +142,7 @@ 'date' : self.file_props.date, 'peerjid' : pjid } - self.session.connection.set_files_info(file_info) + self.session.connection.set_file_info(file_info) def _calcHash(self): # Caculates the hash and returns a xep-300 hash stanza diff -r 6f9b8f28ac92 -r 3c26e0149541 src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Sep 22 13:25:55 2012 -0400 +++ b/src/common/jingle_session.py Sat Sep 22 22:16:03 2012 -0400 @@ -522,9 +522,9 @@ h = request.getTag('file').getTag('hash') n = request.getTag('file').getTag('name') if h: - file_info = self.connection.get_files_info(hash_=h) + file_info = self.connection.get_file_info(hash_=h) elif n: - file_info = self.connection.get_files_info(name=n) + file_info = self.connection.get_file_info(name=n) pjid = gajim.get_jid_without_resource(self.peerjid) if not file_info or file_info['peerjid'] != pjid: log.warning('The peer ' + pjid + \

1 0

gajim: only accept file request from peers that we already sent ...
by Jefry Lagrange 22 Sep '12

22 Sep '12

changeset 6f9b8f28ac92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f9b8f28ac92 description: only accept file request from peers that we already sent the file to diffstat: src/common/jingle_content.py | 5 ++++- src/common/jingle_ft.py | 4 +++- src/common/jingle_session.py | 11 +++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diffs (73 lines): diff -r afc943c0a96e -r 6f9b8f28ac92 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Sep 21 17:42:16 2012 -0400 +++ b/src/common/jingle_content.py Sat Sep 22 13:25:55 2012 -0400 @@ -15,6 +15,7 @@ Handles Jingle contents (XEP 0166) """ +import gajim import xmpp from jingle_transport import JingleTransportIBB @@ -194,11 +195,13 @@ self.file_props.hash_: h = self._calcHash() file_tag.addChild(node=h) + pjid = gajim.get_jid_without_resource(self.session.peerjid) file_info = {'name' : self.file_props.name, 'file-name' : self.file_props.file_name, 'hash' : self.file_props.hash_, 'size' : self.file_props.size, - 'date' : self.file_props.date + 'date' : self.file_props.date, + 'peerjid' : pjid } self.session.connection.set_files_info(file_info) desc = file_tag.setTag('desc') diff -r afc943c0a96e -r 6f9b8f28ac92 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Sep 21 17:42:16 2012 -0400 +++ b/src/common/jingle_ft.py Sat Sep 22 13:25:55 2012 -0400 @@ -134,11 +134,13 @@ payload=[self._calcHash()])]) checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) self.session.__session_info(checksum ) + pjid = gajim.get_jid_without_resource(self.session.peerjid) file_info = {'name' : self.file_props.name, 'file-name' : self.file_props.file_name, 'hash' : self.file_props.hash_, 'size' : self.file_props.size, - 'date' : self.file_props.date + 'date' : self.file_props.date, + 'peerjid' : pjid } self.session.connection.set_files_info(file_info) diff -r afc943c0a96e -r 6f9b8f28ac92 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Sep 21 17:42:16 2012 -0400 +++ b/src/common/jingle_session.py Sat Sep 22 13:25:55 2012 -0400 @@ -513,7 +513,8 @@ self._session_terminate(reason) raise xmpp.NodeProcessed else: - # Stop if we don't have the requested file + # Stop if we don't have the requested file or the peer is not + # allowed to request the file request = \ jingle.getTag('content').getTag('description').getTag('request') if request: @@ -524,10 +525,12 @@ file_info = self.connection.get_files_info(hash_=h) elif n: file_info = self.connection.get_files_info(name=n) - if not file_info: - log.warning('The peer ' + self.peerjid + \ + pjid = gajim.get_jid_without_resource(self.peerjid) + if not file_info or file_info['peerjid'] != pjid: + log.warning('The peer ' + pjid + \ ' is requesting a ' + \ - 'file that we dont have') + 'file that we dont have or' + \ + 'it is not allowed to request') self.decline_session() raise xmpp.NodeProcessed # If there's no content we understand...

1 0

gajim: socks5 proxy supports file request. Raise OutOfOrder exce...
by Jefry Lagrange 21 Sep '12

21 Sep '12

changeset afc943c0a96e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=afc943c0a96e description: socks5 proxy supports file request. Raise OutOfOrder exception when we get a candidate and we are not expecting it diffstat: src/common/jingle_ft.py | 15 ++++++++------- src/common/socks5.py | 6 ------ 2 files changed, 8 insertions(+), 13 deletions(-) diffs (62 lines): diff -r 9c8c9cdad426 -r afc943c0a96e src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Sep 20 21:50:05 2012 +0400 +++ b/src/common/jingle_ft.py Fri Sep 21 17:42:16 2012 -0400 @@ -142,7 +142,6 @@ } self.session.connection.set_files_info(file_info) - def _calcHash(self): # Caculates the hash and returns a xep-300 hash stanza if self.file_props.algo == None: @@ -222,7 +221,12 @@ def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") - if content.getTag('transport').getTag('candidate-error'): + candError = content.getTag('transport').getTag('candidate-error') + candUsed = content.getTag('transport').getTag('candidate-used') + if (candError or candUsed) and \ + self.state >= STATE_CAND_SENT_AND_RECEIVED: + raise xmpp.OutOfOrder + if candError: if not gajim.socks5queue.listener.connections: gajim.socks5queue.listener.disconnect() self.nominated_cand['peer-cand'] = False @@ -242,9 +246,8 @@ args = {'candError' : True} self.__state_changed(STATE_CAND_RECEIVED, args) return - if content.getTag('transport').getTag('candidate-used'): - streamhost_cid = content.getTag('transport').getTag( - 'candidate-used').getAttr('cid') + if candUsed: + streamhost_cid = candUsed.getAttr('cid') streamhost_used = None for cand in self.transport.candidates: if cand['candidate_id'] == streamhost_cid: @@ -253,8 +256,6 @@ if streamhost_used == None or streamhost_used['type'] == 'proxy': if not gajim.socks5queue.listener.connections: gajim.socks5queue.listener.disconnect() - pass - if content.getTag('transport').getTag('activated'): self.state = STATE_TRANSFERING jid = gajim.get_jid_without_resource(self.session.ourjid) diff -r 9c8c9cdad426 -r afc943c0a96e src/common/socks5.py --- a/src/common/socks5.py Thu Sep 20 21:50:05 2012 +0400 +++ b/src/common/socks5.py Fri Sep 21 17:42:16 2012 -0400 @@ -864,12 +864,6 @@ """ Get sha of sid + Initiator jid + Target jid """ - - if self.file_props.is_a_proxy: - self.file_props.is_a_proxy = None # Is this necesary? - return hashlib.sha1('%s%s%s' % (self.sid, - self.file_props.proxy_sender, - self.file_props.proxy_receiver)).hexdigest() return hashlib.sha1('%s%s%s' % (self.sid, self.initiator, self.target)).hexdigest()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2012