changeset f7c3262c9535 in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f7c3262c9535 description: fix importing gst. Fixes #8306
diffstat:
src/common/gajim.py | 2 ++ src/common/jingle_rtp.py | 2 ++ src/common/multimedia_helpers.py | 4 ++++ src/config.py | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-)
diffs (54 lines):
diff -r 32a3f3c1ddbe -r f7c3262c9535 src/common/gajim.py --- a/src/common/gajim.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/common/gajim.py Tue Mar 29 22:54:40 2016 +0200 @@ -201,7 +201,9 @@ from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst + gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 + gi.require_version('GstVideo', '1.0') from gi.repository import GstVideo from gi.repository import GLib try: diff -r 32a3f3c1ddbe -r f7c3262c9535 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/common/jingle_rtp.py Tue Mar 29 22:54:40 2016 +0200 @@ -27,7 +27,9 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst +gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 +gi.require_version('GstVideo', '1.0') from gi.repository import GstVideo from gi.repository import GLib
diff -r 32a3f3c1ddbe -r f7c3262c9535 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/common/multimedia_helpers.py Tue Mar 29 22:54:40 2016 +0200 @@ -13,8 +13,12 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see http://www.gnu.org/licenses/.
+import gi +gi.require_version('Gst', '1.0') from gi.repository import Gst +gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 +gi.require_version('GstVideo', '1.0') from gi.repository import GstVideo
diff -r 32a3f3c1ddbe -r f7c3262c9535 src/config.py --- a/src/config.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/config.py Tue Mar 29 22:54:40 2016 +0200 @@ -68,7 +68,7 @@ from common.multimedia_helpers import AudioInputManager, AudioOutputManager from common.multimedia_helpers import VideoInputManager, VideoOutputManager HAS_GST = True -except ImportError: +except (ImportError, ValueError): HAS_GST = False
from common.exceptions import GajimGeneralException