From c4953b1e115192c8053a75d348315586bdc1394d Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Thu, 14 Jun 2012 18:43:47 +0200
Subject: [PATCH] some typo + disable Jingle FT for the moment
---
src/common/protocol/bytestream.py | 2 +-
src/filetransfers_window.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
index 0dd437d331..1c7c32c8c1 100644
--- a/src/common/protocol/bytestream.py
+++ b/src/common/protocol/bytestream.py
@@ -216,7 +216,7 @@ class ConnectionBytestream:
self.connection.send(iq)
def _siResultCB(self, con, iq_obj):
- file_props = FilesProp.getFileProp(con.name, iq_obj.getAttr('id'))
+ file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id'))
if not file_props:
return
if file_props.request_id:
diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index 9b1bf01195..89d407291b 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -250,11 +250,11 @@ class FileTransfersWindow:
def show_hash_error(self, jid, file_props, account):
def on_yes(dummy):
# Request the file to the sender
- sid = gajim.connections[account].start_file_transfer(jid,
- file_props,
+ sid = gajim.connections[account].start_file_transfer(jid,
+ file_props,
True)
file_props.sid = sid
-
+
if file_props.type_ == 'r':
file_name = os.path.basename(file_props.file_name)
@@ -336,7 +336,7 @@ class FileTransfersWindow:
file_path, file_name, file_desc)
if file_props is None:
return False
- if contact.supports(NS_JINGLE_FILE_TRANSFER):
+ if contact.supports(NS_JINGLE_FILE_TRANSFER) and False:
log.info("contact %s supports jingle file transfer"%(contact.get_full_jid()))
gajim.connections[account].start_file_transfer(contact.get_full_jid(),
file_props)
@@ -574,7 +574,7 @@ class FileTransfersWindow:
gajim.events.remove_events(account, jid, event)
gajim.interface.roster.draw_contact(jid, account)
gajim.interface.roster.show_title()
- FilesProp.deleteFileProp(files_props)
+ FilesProp.deleteFileProp(file_props)
del(file_props)
def set_progress(self, typ, sid, transfered_size, iter_=None):
--
GitLab