Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
-
1692f3ed
by Daniel Brötzmann at 2021-02-09T17:28:00+01:00
-
76501abf
by Daniel Brötzmann at 2021-02-09T18:04:57+01:00
3 changed files:
Changes:
| ... | ... | @@ -664,7 +664,7 @@ |
| 664 | 664 |
<property name="visible">True</property>
|
| 665 | 665 |
<property name="can_focus">True</property>
|
| 666 | 666 |
<property name="receives_default">True</property>
|
| 667 |
- <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property>
|
|
| 667 |
+ <property name="tooltip_text" translatable="yes">Show a list of emojis</property>
|
|
| 668 | 668 |
<property name="relief">none</property>
|
| 669 | 669 |
<child>
|
| 670 | 670 |
<object class="GtkImage">
|
| ... | ... | @@ -426,7 +426,7 @@ |
| 426 | 426 |
<property name="visible">True</property>
|
| 427 | 427 |
<property name="can_focus">True</property>
|
| 428 | 428 |
<property name="receives_default">True</property>
|
| 429 |
- <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property>
|
|
| 429 |
+ <property name="tooltip_text" translatable="yes">Show a list of emojis</property>
|
|
| 430 | 430 |
<property name="relief">none</property>
|
| 431 | 431 |
<child>
|
| 432 | 432 |
<object class="GtkImage">
|
| ... | ... | @@ -98,12 +98,14 @@ def _enable_preview(self): |
| 98 | 98 |
def _disable_preview(self):
|
| 99 | 99 |
if self._av_pipeline is not None:
|
| 100 | 100 |
self._av_pipeline.set_state(Gst.State.NULL)
|
| 101 |
- if self._av_src is not None:
|
|
| 102 |
- self._av_pipeline.remove(self._av_src)
|
|
| 103 |
- self._av_src = None
|
|
| 104 |
- if self._av_sink is not None:
|
|
| 105 |
- self._av_pipeline.remove(self._av_sink)
|
|
| 106 |
- self._av_sink = None
|
|
| 101 |
+ if self._av_src is not None:
|
|
| 102 |
+ self._av_pipeline.remove(self._av_src)
|
|
| 103 |
+ if self._av_sink is not None:
|
|
| 104 |
+ self._av_pipeline.remove(self._av_sink)
|
|
| 105 |
+ |
|
| 106 |
+ self._av_src = None
|
|
| 107 |
+ self._av_sink = None
|
|
| 108 |
+ |
|
| 107 | 109 |
if self._av_widget is not None:
|
| 108 | 110 |
self._ui.video_preview_box.remove(self._av_widget)
|
| 109 | 111 |
self._ui.video_preview_placeholder.set_visible(True)
|