Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
ed63bc3b by wurstsalat at 2025-05-11T12:43:11+02:00
cfix: Check for optional Farstream/Gst dependencies in Jingle modules
- - - - -
3 changed files:
- gajim/common/jingle_rtp.py
- gajim/common/jingle_transport.py
- gajim/main.py
Changes:
=====================================
gajim/common/jingle_rtp.py
=====================================
@@ -20,12 +20,6 @@
from gi.repository import GLib
from nbxmpp.namespaces import Namespace
-try:
- from gi.repository import Farstream
- from gi.repository import Gst
-except Exception:
- pass
-
from gajim.common import app
from gajim.common import configpaths
from gajim.common.i18n import _
@@ -37,6 +31,10 @@
from gajim.common.jingle_transport import JingleTransport
from gajim.common.jingle_transport import JingleTransportICEUDP
+if app.is_installed("AV"):
+ from gi.repository import Farstream
+ from gi.repository import Gst
+
log = logging.getLogger('gajim.c.jingle_rtp')
=====================================
gajim/common/jingle_transport.py
=====================================
@@ -20,11 +20,6 @@
from nbxmpp.namespaces import Namespace
from nbxmpp.util import generate_id
-try:
- from gi.repository import Farstream
-except ImportError:
- pass
-
from gajim.common import app
from gajim.common.client import Client
from gajim.common.file_props import FileProp
@@ -34,6 +29,9 @@
transports: dict[str, Any] = {}
+if app.is_installed("FARSTREAM"):
+ from gi.repository import Farstream
+
def get_jingle_transport(node: nbxmpp.Node):
namespace = node.getNamespace()
=====================================
gajim/main.py
=====================================
@@ -41,7 +41,6 @@ def gi_require_versions() -> None:
gi.require_versions(
{
- "Farstream": "0.2",
"Gdk": "4.0",
"Gio": "2.0",
"GLib": "2.0",
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/ed63bc3b28fe07ac5ee720ed4206bc75ad441a45
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/ed63bc3b28fe07ac5ee720ed4206bc75ad441a45
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
