Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: 1692f3ed by Daniel Brötzmann at 2021-02-09T17:28:00+01:00 ChatControl: Remove shortcut from tooltip
- - - - - 76501abf by Daniel Brötzmann at 2021-02-09T18:04:57+01:00 Preferences: Check for pipeline before removing elements
Fixes #10430
- - - - -
3 changed files:
- gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/video_preview.py
Changes:
===================================== gajim/data/gui/chat_control.ui ===================================== @@ -664,7 +664,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis</property> <property name="relief">none</property> <child> <object class="GtkImage">
===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -426,7 +426,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis</property> <property name="relief">none</property> <child> <object class="GtkImage">
===================================== gajim/gtk/video_preview.py ===================================== @@ -98,12 +98,14 @@ def _enable_preview(self): def _disable_preview(self): if self._av_pipeline is not None: self._av_pipeline.set_state(Gst.State.NULL) - if self._av_src is not None: - self._av_pipeline.remove(self._av_src) - self._av_src = None - if self._av_sink is not None: - self._av_pipeline.remove(self._av_sink) - self._av_sink = None + if self._av_src is not None: + self._av_pipeline.remove(self._av_src) + if self._av_sink is not None: + self._av_pipeline.remove(self._av_sink) + + self._av_src = None + self._av_sink = None + if self._av_widget is not None: self._ui.video_preview_box.remove(self._av_widget) self._ui.video_preview_placeholder.set_visible(True)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c93d1170232fd53909408b973e9fbf62...