Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: c9590b13 by wurstsalat at 2021-12-07T18:42:02+01:00 Windows build: Add gst-plugins-good and libnice
- - - - - a0fea967 by wurstsalat at 2021-12-07T18:43:07+01:00 ChatControl: Detect AV when updating actions
- - - - -
3 changed files:
- gajim/gtk/call_widget.py - gajim/gtk/controls/chat.py - win/_base.sh
Changes:
===================================== gajim/gtk/call_widget.py ===================================== @@ -73,8 +73,6 @@ def __init__(self, account, contact): self._video_widget_other = None self._video_widget_self = None
- self._detect_av() - self._ui = get_builder('call_widget.ui') self.add(self._ui.av_box) self.connect('destroy', self._on_destroy) @@ -92,9 +90,9 @@ def _on_destroy(self, *args): self._close_jingle_content(jingle_type, shutdown=True) self._jingle.clear()
- def _detect_av(self): + def detect_av(self): if (self._contact.supports(Namespace.JINGLE_ICE_UDP) and - app.is_installed('FARSTREAM') and self._contact.jid.resource): + app.is_installed('FARSTREAM')): self._jingle['audio'].available = self._contact.supports( Namespace.JINGLE_RTP_AUDIO) self._jingle['video'].available = self._contact.supports(
===================================== gajim/gtk/controls/chat.py ===================================== @@ -205,6 +205,7 @@ def update_actions(self) -> None: online and self._client.get_module('Blocking').supported)
# Jingle AV + self._call_widget.detect_av() audio_available = self._call_widget.get_jingle_available('audio') video_available = self._call_widget.get_jingle_available('video') self._get_action('start-call-').set_enabled( @@ -486,7 +487,10 @@ def _nec_ping(self, event): self.add_info_message(event.error)
# Jingle AV calls - def _on_start_call(self) -> None: + def _on_start_call(self, + _action: Gio.SimpleAction, + _param: Optional[GLib.Variant] + ) -> None: self._call_widget.start_call()
def _process_jingle_av_event(self, event):
===================================== win/_base.sh ===================================== @@ -81,9 +81,11 @@ function install_deps { mingw-w64-"${ARCH}"-gtksourceview4 \ mingw-w64-"${ARCH}"-gstreamer \ mingw-w64-"${ARCH}"-gst-plugins-base \ + mingw-w64-"${ARCH}"-gst-plugins-good \ mingw-w64-"${ARCH}"-gst-libav \ mingw-w64-"${ARCH}"-gst-python \ mingw-w64-"${ARCH}"-farstream \ + mingw-w64-"${ARCH}"-libnice \ mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e81ec9bc0639ab83161de3776adefac...