Philipp Hörist pushed to branch master at gajim / gajim

Commits:

6 changed files:

Changes:

  • README.md
    ... ... @@ -16,11 +16,6 @@ ### Runtime Requirements
    16 16 
     - GLib (>=2.60.0)
    17 17 
     - gir1.2-gtksource-4
    18 18 
     - gir1.2-soup-2.4
    19 
    -- gir1.2-gstreamer-1.0
    20 
    -- gir1.2-gst-plugins-base-1.0
    21 
    -- gstreamer1.0-plugins-ugly
    22 
    -- gstreamer1.0-libav
    23 
    -- gstreamer1.0-gtk3
    24 19
    25 20 
     ### Optional Runtime Requirements
    26 21
    ... ... @@ -33,7 +28,15 @@ ### Optional Runtime Requirements
    33 28 
     - gir1.2-networkmanager-1.0 for network lose detection
    34 29 
     - gir1.2-geoclue-2.0 for sharing your location
    35 30 
     - gir1.2-gsound-1.0 for sound on Linux
    31 
    +
    32 
    +#### For Video and Audio Calls
    33 
    +
    36 34 
     - gir1.2-farstream-0.2 for video calls
    35 
    +- gir1.2-gstreamer-1.0 for video and audio calls
    36 
    +- gir1.2-gst-plugins-base-1.0 for video and audio calls
    37 
    +- gstreamer1.0-plugins-ugly for video and audio calls
    38 
    +- gstreamer1.0-libav for video and audio calls
    39 
    +- gstreamer1.0-gtk3
    37 40
    38 41 
     ### Compile-time Requirements
    39 42

  • debian/control
    ... ... @@ -40,21 +40,21 @@ Depends:
    40 40 
         python3-css-parser,
    41 41 
         gir1.2-gtk-3.0 (>= 3.22.27~),
    42 42 
         gir1.2-gtksource-4,
    43 
    -    gir1.2-gstreamer-1.0
    44 
    -    gir1.2-gst-plugins-base-1.0
    45 
    -    gstreamer1.0-plugins-ugly
    46 
    -    gstreamer1.0-libav
    47 
    -    gstreamer1.0-gtk3
    48 43 
     Recommends:
    49 44 
         aspell-en | aspell-dictionary,
    50 45 
         ca-certificates,
    51 46 
         dbus,
    52 47 
         fonts-noto-color-emoji,
    53 
    -    gir1.2-farstream-0.2,
    54 48 
         gir1.2-gsound-1.0,
    55 49 
         gir1.2-gspell-1,
    56 50 
         gir1.2-gupnpigd-1.0,
    57 51 
         gir1.2-secret-1,
    52 
    +    gir1.2-farstream-0.2,
    53 
    +    gir1.2-gstreamer-1.0,
    54 
    +    gir1.2-gst-plugins-base-1.0,
    55 
    +    gstreamer1.0-plugins-ugly,
    56 
    +    gstreamer1.0-libav,
    57 
    +    gstreamer1.0-gtk3,
    58 58 
         notification-daemon,
    59 59 
         pulseaudio-utils | alsa-utils | sox | oss4-base,
    60 60 
         python3-dbus (>=0.81),

  • gajim/common/application.py
    ... ... @@ -35,10 +35,8 @@
    35 35 
     from gajim.common.events import AccountDisonnected
    36 36 
     from gajim.common.events import AllowGajimUpdateCheck
    37 37 
     from gajim.common.events import GajimUpdateAvailable
    38 
    -from gajim.common.call_manager import CallManager
    39 38 
     from gajim.common.client import Client
    40 39 
     from gajim.common.helpers import make_http_request
    41 
    -from gajim.common.preview import PreviewManager
    42 40 
     from gajim.common.task_manager import TaskManager
    43 41 
     from gajim.common.settings import Settings
    44 42 
     from gajim.common.settings import LegacyConfig
    ... ... @@ -69,8 +67,10 @@ def _init_core(self) -> None:
    69 67 
             app.cert_store = CertificateStore()
    70 68 
             app.task_manager = TaskManager()
    71 69
    70 
    +        from gajim.common.call_manager import CallManager
    72 71 
             app.call_manager = CallManager()
    73 72
    73 
    +        from gajim.common.preview import PreviewManager
    74 74 
             app.preview_manager = PreviewManager()
    75 75
    76 76 
             self._network_monitor = Gio.NetworkMonitor.get_default()

  • gajim/common/preview_helpers.py
    ... ... @@ -31,7 +31,11 @@
    31 31 
     from gi.repository import GdkPixbuf
    32 32 
     from gi.repository import GLib
    33 33 
     from gi.repository import Gio
    34 
    -from gi.repository import GstPbutils
    34 
    +
    35 
    +try:
    36 
    +    from gi.repository import GstPbutils
    37 
    +except Exception:
    38 
    +    pass
    35 39
    36 40 
     from PIL import Image
    37 41 
     from PIL import ImageFile

  • gajim/gtk/gstreamer.py
    ... ... @@ -12,6 +12,8 @@
    12 12 
     # You should have received a copy of the GNU General Public License
    13 13 
     # along with Gajim. If not, see <http://www.gnu.org/licenses/>.
    14 14
    15 
    +from __future__ import annotations
    16 
    +
    15 17 
     from typing import Optional
    16 18 
     from typing import Tuple
    17 19

  • gajim/gtk/preview_audio.py
    ... ... @@ -12,6 +12,8 @@
    12 12 
     # You should have received a copy of the GNU General Public License
    13 13 
     # along with Gajim. If not, see <http://www.gnu.org/licenses/>.
    14 14
    15 
    +from __future__ import annotations
    16 
    +
    15 17 
     from typing import Optional
    16 18
    17 19 
     import logging
    ... ... @@ -19,7 +21,10 @@
    19 21
    20 22 
     from gi.repository import GLib
    21 23 
     from gi.repository import Gtk
    22 
    -from gi.repository import Gst
    24 
    +try:
    25 
    +    from gi.repository import Gst
    26 
    +except Exception:
    27 
    +    pass
    23 28
    24 29 
     from gajim.common.i18n import _
    25 30

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.