From 197d85e56384731295ca036dd6861f3ff05a6718 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 6 Nov 2011 21:42:04 +0100 Subject: [PATCH] ability to use jingle negociation even if we don't have farsight. Fixes #7044 --- src/common/connection_handlers.py | 9 +-------- src/common/jingle.py | 4 +++- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index b320515e6..f4df5d8d2 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -61,14 +61,7 @@ from common import ged from common import nec from common.nec import NetworkEvent -if gajim.HAVE_FARSIGHT: - from common.jingle import ConnectionJingle -else: - class ConnectionJingle(): - def __init__(self): - pass - def _JingleCB(self, con, stanza): - pass +from common.jingle import ConnectionJingle from common import dbus_support if dbus_support.supported: diff --git a/src/common/jingle.py b/src/common/jingle.py index ae8c6509d..a8620f83c 100644 --- a/src/common/jingle.py +++ b/src/common/jingle.py @@ -32,9 +32,11 @@ Handles the jingle signalling protocol import xmpp import helpers +import gajim from jingle_session import JingleSession, JingleStates -from jingle_rtp import JingleAudio, JingleVideo +if gajim.HAVE_FARSIGHT: + from jingle_rtp import JingleAudio, JingleVideo class ConnectionJingle(object):