check that we have rst plugin before supposing we can do jingle. Fixes #6910
This commit is contained in:
parent
16edbd8363
commit
53a452fc1c
3 changed files with 73 additions and 63 deletions
|
@ -166,8 +166,17 @@ HAVE_LATEX = False
|
||||||
|
|
||||||
HAVE_FARSIGHT = True
|
HAVE_FARSIGHT = True
|
||||||
try:
|
try:
|
||||||
__import__('farsight')
|
import farsight
|
||||||
__import__('gst')
|
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:
|
except ImportError:
|
||||||
HAVE_FARSIGHT = False
|
HAVE_FARSIGHT = False
|
||||||
gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
|
gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
|
||||||
|
|
|
@ -105,7 +105,7 @@ class FeaturesWindow:
|
||||||
_('Requires python-docutils.')),
|
_('Requires python-docutils.')),
|
||||||
_('Audio / Video'): (self.farsight_available,
|
_('Audio / Video'): (self.farsight_available,
|
||||||
_('Ability to start audio and video chat.'),
|
_('Ability to start audio and video chat.'),
|
||||||
_('Requires python-farsight.'),
|
_('Requires python-farsight and gstreamer-plugins-bad.'),
|
||||||
_('Feature not available under Windows.')),
|
_('Feature not available under Windows.')),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,8 @@ demandimport.enable()
|
||||||
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
|
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
|
||||||
'logging.NullHandler', 'dbus.glib', 'dbus.service',
|
'logging.NullHandler', 'dbus.glib', 'dbus.service',
|
||||||
'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto',
|
'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 os
|
||||||
import sys
|
import sys
|
||||||
|
|
Loading…
Add table
Reference in a new issue