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

some typo + disable Jingle FT for the moment

Browse source
This commit is contained in:
Yann Leboulanger 2012-06-14 18:43:47 +02:00
parent 1fdf6b7e35
commit c4953b1e11
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/protocol/bytestream.py
View file

@ -216,7 +216,7 @@ class ConnectionBytestream:
self.connection.send(iq) self.connection.send(iq)
def _siResultCB(self, con, iq_obj): 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: if not file_props:
return return
if file_props.request_id: if file_props.request_id:

10
src/filetransfers_window.py
View file

@ -250,11 +250,11 @@ class FileTransfersWindow:
def show_hash_error(self, jid, file_props, account): def show_hash_error(self, jid, file_props, account):
def on_yes(dummy): def on_yes(dummy):
# Request the file to the sender # Request the file to the sender
sid = gajim.connections[account].start_file_transfer(jid, sid = gajim.connections[account].start_file_transfer(jid,
file_props, file_props,
True) True)
file_props.sid = sid file_props.sid = sid
if file_props.type_ == 'r': if file_props.type_ == 'r':
file_name = os.path.basename(file_props.file_name) file_name = os.path.basename(file_props.file_name)
@ -336,7 +336,7 @@ class FileTransfersWindow:
file_path, file_name, file_desc) file_path, file_name, file_desc)
if file_props is None: if file_props is None:
return False 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())) log.info("contact %s supports jingle file transfer"%(contact.get_full_jid()))
gajim.connections[account].start_file_transfer(contact.get_full_jid(), gajim.connections[account].start_file_transfer(contact.get_full_jid(),
file_props) file_props)
@ -574,7 +574,7 @@ class FileTransfersWindow:
gajim.events.remove_events(account, jid, event) gajim.events.remove_events(account, jid, event)
gajim.interface.roster.draw_contact(jid, account) gajim.interface.roster.draw_contact(jid, account)
gajim.interface.roster.show_title() gajim.interface.roster.show_title()
FilesProp.deleteFileProp(files_props) FilesProp.deleteFileProp(file_props)
del(file_props) del(file_props)
def set_progress(self, typ, sid, transfered_size, iter_=None): def set_progress(self, typ, sid, transfered_size, iter_=None):