changeset 7c0c483f8c7d in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=7c0c483f8c7d description: remove unnecessary branch

diffstat:

src/common/jingle.py | 5 +---- src/common/jingle_ft.py | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-)

diffs (40 lines):

diff -r 0236f8351a82 -r 7c0c483f8c7d src/common/jingle.py --- a/src/common/jingle.py Thu Jul 22 16:20:14 2010 +0800 +++ b/src/common/jingle.py Sat Jul 24 10:12:54 2010 +0800 @@ -145,10 +145,7 @@ gajim.get_jid_without_resource(jid)) if contact is None: return - if contact.supports(xmpp.NS_JINGLE_XTLS): - use_security = True - else: - use_security = False + use_security = contact.supports(xmpp.NS_JINGLE_XTLS) if jingle: file_props['sid'] = jingle.sid jingle.add_content('file', diff -r 0236f8351a82 -r 7c0c483f8c7d src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 22 16:20:14 2010 +0800 +++ b/src/common/jingle_ft.py Sat Jul 24 10:12:54 2010 +0800 @@ -92,11 +92,7 @@

file_props['session-type'] = 'jingle'

- security = content.getTag('security') - if not security: - self.use_security = False - else: - self.use_security = True + self.use_security = bool(content.getTag('security'))

file_tag = content.getTag('description').getTag('offer').getTag('file') for attribute in file_tag.getAttrs(): @@ -132,8 +128,6 @@

self.session.connection.dispatch('FILE_REQUEST', (jid, file_props))

- - def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept")