Commits

commits@gajim.org

17632 discussions

gajim: when we come ack from invisible, restore the block list i...
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 71194a2f217f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71194a2f217f description: when we come ack from invisible, restore the block list if we block some contacts. Fixes #7215 diffstat: src/common/connection.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (19 lines): diff -r cf7c4fbed6bf -r 71194a2f217f src/common/connection.py --- a/src/common/connection.py Mon Aug 27 22:07:29 2012 +0200 +++ b/src/common/connection.py Tue Aug 28 10:39:08 2012 +0200 @@ -1792,9 +1792,12 @@ def _change_from_invisible(self): if self.privacy_rules_supported: - iq = self.build_privacy_rule('visible', 'allow') - self.connection.send(iq) - self.activate_privacy_rule('visible') + if self.blocked_list: + self.activate_privacy_rule('block') + else: + iq = self.build_privacy_rule('visible', 'allow') + self.connection.send(iq) + self.activate_privacy_rule('visible') def _update_status(self, show, msg): xmpp_show = helpers.get_xmpp_show(show)

1 0

gajim: show only rooms where user can be invited to in invite to...
by Yann Leboulanger 27 Aug '12

27 Aug '12

changeset cf7c4fbed6bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cf7c4fbed6bf description: show only rooms where user can be invited to in invite to submenu. Fixes #7212 diffstat: src/gui_menu_builder.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r f1e83cb3e0b9 -r cf7c4fbed6bf src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Aug 27 13:28:47 2012 +0200 +++ b/src/gui_menu_builder.py Mon Aug 27 22:07:29 2012 +0200 @@ -125,6 +125,8 @@ for gc_control in gajim.interface.msg_win_mgr.get_controls( message_control.TYPE_GC) + minimized_controls: acct = gc_control.account + if acct not in connected_accounts: + continue room_jid = gc_control.room_jid if room_jid in ignore_rooms: continue

1 0

gajim: fix displaying pubsub nodes
by Yann Leboulanger 27 Aug '12

27 Aug '12

changeset f1e83cb3e0b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1e83cb3e0b9 description: fix displaying pubsub nodes diffstat: src/disco.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (17 lines): diff -r ae4abdb4a507 -r f1e83cb3e0b9 src/disco.py --- a/src/disco.py Sun Aug 26 22:34:29 2012 +0200 +++ b/src/disco.py Mon Aug 27 13:28:47 2012 +0200 @@ -2098,8 +2098,11 @@ name = gobject.markup_escape_text(name) name = '<b>%s</b>' % name - parent_iter = self._get_iter(parent_node) - if not self._in_list(node): + if parent_node: + parent_iter = self._get_iter(parent_node) + else: + parent_iter = None + if not node or not self._in_list(node): self.model.append(parent_iter, (jid, node, name, dunno, subscribed)) self.cache.get_items(jid, node, self._add_items, force = force, args = (force,))

1 0

gajim: don't close send single message if there was an error sen...
by Yann Leboulanger 26 Aug '12

26 Aug '12

changeset ae4abdb4a507 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ae4abdb4a507 description: don't close send single message if there was an error sending the message. Fixes #7187 diffstat: src/dialogs.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 627cbbe46bd0 -r ae4abdb4a507 src/dialogs.py --- a/src/dialogs.py Sat Aug 25 23:54:39 2012 -0400 +++ b/src/dialogs.py Sun Aug 26 22:34:29 2012 +0200 @@ -3112,7 +3112,7 @@ # if offline or connecting ErrorDialog(_('Connection not available'), _('Please make sure you are connected with "%s".') % self.account) - return + return True if isinstance(self.to, list): sender_list = [] for i in self.to: @@ -3132,7 +3132,7 @@ ErrorDialog(_('Invalid Jabber ID'), _('It is not possible to send a message to %s, this JID is not ' 'valid.') % to_whom_jid) - return + return True subject = self.subject_entry.get_text().decode('utf-8') begin, end = self.message_tv_buffer.get_bounds() @@ -3176,7 +3176,8 @@ session=self.session) def on_send_and_close_button_clicked(self, widget): - self.send_single_message() + if self.send_single_message(): + return self.save_pos() self.window.destroy()

1 0

gajim: only send hash if contact supports it
by Jefry Lagrange 26 Aug '12

26 Aug '12

changeset 627cbbe46bd0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=627cbbe46bd0 description: only send hash if contact supports it diffstat: src/common/jingle.py | 5 ----- src/common/jingle_ft.py | 2 +- 2 files changed, 1 insertions(+), 6 deletions(-) diffs (51 lines): diff -r b0c4c51e1870 -r 627cbbe46bd0 src/common/jingle.py --- a/src/common/jingle.py Sat Aug 25 12:09:50 2012 -0400 +++ b/src/common/jingle.py Sat Aug 25 23:54:39 2012 -0400 @@ -80,12 +80,10 @@ # get data jid = helpers.get_full_jid_from_iq(stanza) id_ = stanza.getID() - if (jid, id_) in self.__iq_responses.keys(): self.__iq_responses[(jid, id_)].on_stanza(stanza) del self.__iq_responses[(jid, id_)] raise xmpp.NodeProcessed - jingle = stanza.getTag('jingle') # a jingle element is not necessary in iq-result stanza # don't check for that @@ -97,14 +95,12 @@ if id_ in sesn.iq_ids: sesn.on_stanza(stanza) return - # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... newjingle = JingleSession(con=self, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle - # we already have such session in dispatcher... self._sessions[sid].collect_iq_id(id_) self._sessions[sid].on_stanza(stanza) @@ -112,7 +108,6 @@ if sid in self._sessions and \ self._sessions[sid].state == JingleStates.ended: self.delete_jingle_session(sid) - raise xmpp.NodeProcessed def start_audio(self, jid): diff -r b0c4c51e1870 -r 627cbbe46bd0 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Aug 25 12:09:50 2012 -0400 +++ b/src/common/jingle_ft.py Sat Aug 25 23:54:39 2012 -0400 @@ -166,7 +166,7 @@ self.file_props.streamhosts = self.transport.remote_candidates # Calculate file hash in a new thread # if we haven't sent the hash already. - if self.file_props.hash_ is None: + if self.file_props.hash_ is None and self.file_props.algo: self.hashThread = threading.Thread(target=self.__send_hash) self.hashThread.start() for host in self.file_props.streamhosts:

1 0

gajim: make file_props use session sid as the default sid
by Jefry Lagrange 25 Aug '12

25 Aug '12

changeset b0c4c51e1870 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b0c4c51e1870 description: make file_props use session sid as the default sid diffstat: src/common/connection_handlers_events.py | 6 ++---- src/common/file_props.py | 2 +- src/common/jingle_ft.py | 3 ++- src/common/jingle_transport.py | 4 ++-- src/common/protocol/bytestream.py | 8 ++++---- src/filetransfers_window.py | 5 +++-- src/gui_interface.py | 5 ++--- 7 files changed, 16 insertions(+), 17 deletions(-) diffs (152 lines): diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/connection_handlers_events.py Sat Aug 25 12:09:50 2012 -0400 @@ -1981,11 +1981,9 @@ self.FT_content.session.ourjid) self.FT_content.transport.set_connection( self.FT_content.session.connection) - sid = self.FT_content.transport.sid + sid = unicode(self.stanza.getTag('jingle').getAttr('sid')) self.file_props = FilesProp.getNewFileProp(self.conn.name, sid) - self.file_props.session_sid = unicode( - self.stanza.getTag('jingle').getAttr('sid') - ) + self.file_props.transport_sid = self.FT_content.transport.sid self.FT_content.file_props = self.file_props self.FT_content.transport.set_file_props(self.file_props) if self.file_props.streamhosts: diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/file_props.py --- a/src/common/file_props.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/file_props.py Sat Aug 25 12:09:50 2012 -0400 @@ -123,6 +123,7 @@ self.tt_account = None self.size = None self._sid = sid + self.transport_sid = None self.account = account self.mime_type = None self.algo = None @@ -130,7 +131,6 @@ self.syn_id = None self.seq = None self.hash_ = None - self.session_sid = None self.fd = None self.startexmpp = None self.session_type = None diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/jingle_ft.py Sat Aug 25 12:09:50 2012 -0400 @@ -76,8 +76,9 @@ self.file_props.sender = session.ourjid self.file_props.receiver = session.peerjid self.file_props.session_type = 'jingle' - self.file_props.session_sid = session.sid + self.file_props.sid = session.sid self.file_props.transfered_size = [] + self.file_props.transport_sid = self.transport.sid log.info("FT request: %s" % file_props) if transport is None: self.transport = JingleTransportSocks5() diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/jingle_transport.py Sat Aug 25 12:09:50 2012 -0400 @@ -250,7 +250,7 @@ def get_content(self): sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.session_sid) + self.file_props.sid) for content in sesn.contents.values(): if content.transport == self: return content @@ -261,7 +261,7 @@ if not self.connection: return sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.session_sid) + self.file_props.sid) if sesn is None: return diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/protocol/bytestream.py Sat Aug 25 12:09:50 2012 -0400 @@ -143,12 +143,12 @@ log.info("send_file_approval: jingle session accept") if file_props.session_type == 'jingle': session = self.get_jingle_session(file_props.sender, - file_props.session_sid) + file_props.sid) if not session: return content = None for c in session.contents.values(): - if c.transport.sid == file_props.sid: + if c.transport.sid == file_props.transport_sid: content = c break if not content: @@ -193,7 +193,7 @@ if not self.connection or self.connected < 2: return if file_props.session_type == 'jingle': - jingle = self._sessions[file_props.session_sid] + jingle = self._sessions[file_props.sid] jingle.cancel_session() return iq = xmpp.Iq(to=unicode(file_props.sender), typ='error') @@ -562,7 +562,7 @@ else: to = file_props.sender iq = xmpp.Iq(to=to, typ='error') - iq.setAttr('id', file_props.session_sid) + iq.setAttr('id', file_props.sid) err = iq.setTag('error') err.setAttr('code', unicode(code)) err.setData(msg) diff -r 2bf24a2cc140 -r b0c4c51e1870 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/filetransfers_window.py Sat Aug 25 12:09:50 2012 -0400 @@ -257,7 +257,7 @@ sid = gajim.connections[account].start_file_transfer(fjid, file_props, True) - file_props.sid = sid + file_props.transport_sid = sid if file_props.type_ == 'r': file_name = os.path.basename(file_props.file_name) @@ -643,7 +643,8 @@ self.model.set(iter_, 0, self.get_icon(status)) if transfered_size == full_size: # If we are receiver and this is a jingle session - if file_props.type_ == 'r' and file_props.session_sid: + if file_props.type_ == 'r' and \ + file_props.session_type == 'jingle': # Show that we are computing the hash self.set_status(file_props, 'computing') else: diff -r 2bf24a2cc140 -r b0c4c51e1870 src/gui_interface.py --- a/src/gui_interface.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/gui_interface.py Sat Aug 25 12:09:50 2012 -0400 @@ -941,7 +941,7 @@ def __compare_hashes(self, account, file_props): session = gajim.connections[account].get_jingle_session(jid=None, - sid=file_props.session_sid) + sid=file_props.sid) ft_win = self.instances['file_transfers'] if not file_props.hash_: # We disn't get the hash, sender probably don't support that @@ -981,9 +981,8 @@ return if file_props.type_ == 'r': # we receive a file - # If we have a jingle session id, it is a jingle transfer # we compare hashes - if file_props.session_sid: + if file_props.session_type == 'jingle': # Compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, args=(account, file_props))

1 0

gajim: calculate hash after we get session accept
by Jefry Lagrange 25 Aug '12

25 Aug '12

changeset 2bf24a2cc140 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2bf24a2cc140 description: calculate hash after we get session accept diffstat: src/common/jingle_ft.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (28 lines): diff -r 631684dec21b -r 2bf24a2cc140 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Aug 25 12:25:30 2012 +0200 +++ b/src/common/jingle_ft.py Sat Aug 25 11:14:38 2012 -0400 @@ -119,11 +119,7 @@ self._listen_host() def __on_session_initiate_sent(self, stanza, content, error, action): - # Calculate file hash in a new thread - # if we haven't sent the hash already. - if self.file_props.hash_ is None: - self.hashThread = threading.Thread(target=self.__send_hash) - self.hashThread.start() + pass def __send_hash(self): # Send hash in a session info @@ -167,6 +163,11 @@ self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed self.file_props.streamhosts = self.transport.remote_candidates + # Calculate file hash in a new thread + # if we haven't sent the hash already. + if self.file_props.hash_ is None: + self.hashThread = threading.Thread(target=self.__send_hash) + self.hashThread.start() for host in self.file_props.streamhosts: host['initiator'] = self.session.initiator host['target'] = self.session.responder

1 0

gajim: better text
by Yann Leboulanger 25 Aug '12

25 Aug '12

changeset 631684dec21b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=631684dec21b description: better text diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6dc9de7777ad -r 631684dec21b src/dialogs.py --- a/src/dialogs.py Sat Aug 25 11:32:14 2012 +0200 +++ b/src/dialogs.py Sat Aug 25 12:25:30 2012 +0200 @@ -4505,7 +4505,7 @@ gajim.connections[account].decline_invitation(self.room_jid, self.contact_fjid, text) - YesNoDialog(pritext, sectext, text_label=_('Reason:'), + YesNoDialog(pritext, sectext, text_label=_('Reason (if you decline):'), on_response_yes=on_yes, on_response_no=on_no) class ProgressDialog:

1 0

gajim: don't print reason where there is none
by Yann Leboulanger 25 Aug '12

25 Aug '12

changeset 6dc9de7777ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6dc9de7777ad description: don't print reason where there is none diffstat: src/gui_interface.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (21 lines): diff -r ea8a9217a662 -r 6dc9de7777ad src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 20:13:25 2012 -0400 +++ b/src/gui_interface.py Sat Aug 25 11:32:14 2012 +0200 @@ -619,9 +619,14 @@ account = obj.conn.name gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, account) if gc_control: - gc_control.print_conversation( - _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': obj.jid_from, 'reason': obj.reason}, graphics=False) + if obj.reason: + gc_control.print_conversation( + _('%(jid)s declined the invitation: %(reason)s') % { + 'jid': obj.jid_from, 'reason': obj.reason}, graphics=False) + else: + gc_control.print_conversation( + _('%(jid)s declined the invitation') % { + 'jid': obj.jid_from}, graphics=False) def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))

1 0

gajim: refactoring
by Jefry Lagrange 25 Aug '12

25 Aug '12

changeset ea8a9217a662 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ea8a9217a662 description: refactoring diffstat: src/common/jingle.py | 2 +- src/common/jingle_ft.py | 11 +++------ src/common/jingle_session.py | 49 +++++++++++++++++++++++-------------------- src/gui_interface.py | 6 ++-- 4 files changed, 34 insertions(+), 34 deletions(-) diffs (182 lines): diff -r df0845a7b449 -r ea8a9217a662 src/common/jingle.py --- a/src/common/jingle.py Fri Aug 24 18:21:38 2012 +0400 +++ b/src/common/jingle.py Fri Aug 24 20:13:25 2012 -0400 @@ -163,7 +163,7 @@ transport = JingleTransportIBB() c = JingleFileTransfer(jingle, transport=transport, file_props=file_props, use_security=use_security) - jingle.hash_algo = self.__hash_support(contact) + file_props.algo = self.__hash_support(contact) jingle.add_content('file' + helpers.get_random_string_16(), c) jingle.start_session() return c.transport.sid diff -r df0845a7b449 -r ea8a9217a662 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Aug 24 18:21:38 2012 +0400 +++ b/src/common/jingle_ft.py Fri Aug 24 20:13:25 2012 -0400 @@ -117,12 +117,9 @@ conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) self._listen_host() - # Delete this after file_props refactoring this shouldn't be necesary - self.session.file_hash = self.file_props.hash_ - self.session.hash_algo = self.file_props.algo def __on_session_initiate_sent(self, stanza, content, error, action): - # Calculate file_hash in a new thread + # Calculate file hash in a new thread # if we haven't sent the hash already. if self.file_props.hash_ is None: self.hashThread = threading.Thread(target=self.__send_hash) @@ -137,7 +134,7 @@ def _calcHash(self): # Caculates the hash and returns a xep-300 hash stanza - if self.session.hash_algo == None: + if self.file_props.algo == None: return try: file_ = open(self.file_props.file_name, 'r') @@ -145,14 +142,14 @@ # can't open file return h = xmpp.Hashes() - hash_ = h.calculateHash(self.session.hash_algo, file_) + hash_ = h.calculateHash(self.file_props.algo, file_) # DEBUG #hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return self.file_props.hash_ = hash_ - h.addHash(hash_, self.session.hash_algo) + h.addHash(hash_, self.file_props.algo) return h def __on_session_accept(self, stanza, content, error, action): diff -r df0845a7b449 -r ea8a9217a662 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Aug 24 18:21:38 2012 +0400 +++ b/src/common/jingle_session.py Fri Aug 24 20:13:25 2012 -0400 @@ -98,34 +98,33 @@ else: self.iq_ids = [] self.accepted = True # is this session accepted by user - # Hash algorithm that we are using to calculate the integrity of the - # file. Could be 'md5', 'sha-1', etc... - self.hash_algo = None - self.file_hash = None # Tells whether this session is a file transfer or not self.session_type_FT = False # callbacks to call on proper contents # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack self.callbacks = { - 'content-accept': [self.__on_content_accept, self.__broadcast, - self.__ack], + 'content-accept': [self.__on_content_accept, + self.__broadcast, self.__ack], 'content-add': [self.__on_content_add, self.__broadcast, - self.__ack], #TODO + self.__ack], #TODO 'content-modify': [self.__ack], #TODO - 'content-reject': [self.__ack, self.__on_content_remove], #TODO + 'content-reject': [self.__ack, self.__on_content_remove], 'content-remove': [self.__ack, self.__on_content_remove], 'description-info': [self.__broadcast, self.__ack], #TODO 'security-info': [self.__ack], #TODO - 'session-accept': [self.__on_session_accept, self.__on_content_accept, - self.__broadcast], - 'session-info': [self.__broadcast, self.__on_session_info, self.__ack], - 'session-initiate': [self.__on_session_initiate, self.__broadcast, - self.__ack], - 'session-terminate': [self.__on_session_terminate, self.__broadcast_all, - self.__ack], + 'session-accept': [self.__on_session_accept, + self.__on_content_accept, + self.__broadcast], + 'session-info': [self.__broadcast, + self.__on_session_info, self.__ack], + 'session-initiate': [self.__on_session_initiate, + self.__broadcast, self.__ack], + 'session-terminate': [self.__on_session_terminate, + self.__broadcast_all, self.__ack], 'transport-info': [self.__broadcast, self.__ack], - 'transport-replace': [self.__broadcast, self.__on_transport_replace], #TODO + 'transport-replace': [self.__broadcast, + self.__on_transport_replace], #TODO 'transport-accept': [self.__ack], #TODO 'transport-reject': [self.__ack], #TODO 'iq-result': [self.__broadcast], @@ -327,7 +326,8 @@ self.__send_error(stanza, 'bad-request') return # FIXME: If we aren't initiated and it's not a session-initiate... - if action not in ['session-initiate','session-terminate'] and self.state == JingleStates.ended: + if action not in ['session-initiate','session-terminate'] \ + and self.state == JingleStates.ended: self.__send_error(stanza, 'item-not-found', 'unknown-session') return else: @@ -364,6 +364,7 @@ elif child.getNamespace() == xmpp.NS_STANZAS: error_name = child.getName() self.__dispatch_error(error_name, text, error.getAttr('type')) + # FIXME: Not sure when we would want to do that... def transport_replace(self): transport = JingleTransportIBB() @@ -416,6 +417,8 @@ def __on_session_info(self, stanza, jingle, error, action): # TODO: ringing, active, (un)hold, (un)mute + if self.state != JingleStates.active: + raise OutOfOrder payload = jingle.getPayload() for p in payload: if p.getName() == 'checksum': @@ -423,13 +426,13 @@ namespace=xmpp.NS_HASHES) algo = hash_.getAttr('algo') if algo in xmpp.Hashes.supported: - self.hash_algo = algo - data = hash_.getData() - # This only works because there is only one session - # per file in jingleFT - self.file_hash = data + file_props = FilesProp.getFileProp(self.connection.name, + self.sid) + file_props.algo = algo + file_props.hash_ = hash_.getData() raise xmpp.NodeProcessed - self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify') + self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', + type_='modify') raise xmpp.NodeProcessed def __on_content_remove(self, stanza, jingle, error, action): diff -r df0845a7b449 -r ea8a9217a662 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 18:21:38 2012 +0400 +++ b/src/gui_interface.py Fri Aug 24 20:13:25 2012 -0400 @@ -938,7 +938,7 @@ session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props.session_sid) ft_win = self.instances['file_transfers'] - if not session.file_hash: + if not file_props.hash_: # We disn't get the hash, sender probably don't support that jid = unicode(file_props.sender) self.popup_ft_result(account, jid, file_props) @@ -948,12 +948,12 @@ file_ = open(file_props.file_name, 'r') except: return - hash_ = h.calculateHash(session.hash_algo, file_) + hash_ = h.calculateHash(file_props.algo, file_) file_.close() # If the hash we received and the hash of the file are the same, # then the file is not corrupt jid = unicode(file_props.sender) - if session.file_hash == hash_: + if file_props.hash_ == hash_: gobject.idle_add(self.popup_ft_result, account, jid, file_props) gobject.idle_add(ft_win.set_status, file_props, 'ok') else:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits