check that we have rst plugin before supposing we can do jingle. Fixes #6910

This commit is contained in:
Yann Leboulanger 2011-06-22 20:29:15 +02:00
parent 16edbd8363
commit 53a452fc1c
3 changed files with 73 additions and 63 deletions

View File

@ -166,8 +166,17 @@ HAVE_LATEX = False
HAVE_FARSIGHT = True
try:
__import__('farsight')
__import__('gst')
import farsight
import gst
import glib
try:
conference = gst.element_factory_make('fsrtpconference')
session = conference.new_session(farsight.MEDIA_TYPE_AUDIO)
del session
del conference
except glib.GError:
HAVE_FARSIGHT = False
except ImportError:
HAVE_FARSIGHT = False
gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}

View File

@ -105,7 +105,7 @@ class FeaturesWindow:
_('Requires python-docutils.')),
_('Audio / Video'): (self.farsight_available,
_('Ability to start audio and video chat.'),
_('Requires python-farsight.'),
_('Requires python-farsight and gstreamer-plugins-bad.'),
_('Feature not available under Windows.')),
}

View File

@ -40,7 +40,8 @@ demandimport.enable()
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
'logging.NullHandler', 'dbus.glib', 'dbus.service',
'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto',
'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic']
'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',
'farsight']
import os
import sys