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

remove unnecessary branch

This commit is contained in:
Zhenchao Li 2010-07-24 10:12:54 +08:00
parent 84debaabca
commit 797b3fe6a9
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/jingle.py
View File

@ -145,10 +145,7 @@ class ConnectionJingle(object):
gajim.get_jid_without_resource(jid)) gajim.get_jid_without_resource(jid))
if contact is None: if contact is None:
return return
if contact.supports(xmpp.NS_JINGLE_XTLS): use_security = contact.supports(xmpp.NS_JINGLE_XTLS)
use_security = True
else:
use_security = False
if jingle: if jingle:
file_props['sid'] = jingle.sid file_props['sid'] = jingle.sid
jingle.add_content('file', jingle.add_content('file',

8
src/common/jingle_ft.py
View File

@ -92,11 +92,7 @@ class JingleFileTransfer(JingleContent):
file_props['session-type'] = 'jingle' file_props['session-type'] = 'jingle'
security = content.getTag('security') self.use_security = bool(content.getTag('security'))
if not security:
self.use_security = False
else:
self.use_security = True
file_tag = content.getTag('description').getTag('offer').getTag('file') file_tag = content.getTag('description').getTag('offer').getTag('file')
for attribute in file_tag.getAttrs(): for attribute in file_tag.getAttrs():
@ -132,8 +128,6 @@ class JingleFileTransfer(JingleContent):
self.session.connection.dispatch('FILE_REQUEST', (jid, file_props)) self.session.connection.dispatch('FILE_REQUEST', (jid, file_props))
def __on_session_accept(self, stanza, content, error, action): def __on_session_accept(self, stanza, content, error, action):
log.info("__on_session_accept") log.info("__on_session_accept")