[Git][gajim/gajim][master] Fix Bonjour (pybonjour) on macOS

Philipp Hörist gitlab at dev.gajim.org
Sat Jan 5 18:53:45 CET 2019


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


Commits:
a91f5f2c by Sebastiaan Lokhorst at 2019-01-05T17:37:09Z
Fix Bonjour (pybonjour) on macOS

- - - - -


2 changed files:

- README.md
- gajim/common/app.py


Changes:

=====================================
README.md
=====================================
@@ -17,7 +17,7 @@
 
 - python3-pil (pillow) for support of webp avatars
 - python3-gnupg to enable GPG encryption
-- For zeroconf (bonjour) you need python3-dbus
+- For zeroconf you need python3-dbus on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS
 - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc
 - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage
 - D-Bus running to have gajim-remote working


=====================================
gajim/common/app.py
=====================================
@@ -220,12 +220,14 @@ def detect_dependencies():
 
     # ZEROCONF
     try:
-        if os.name == 'nt':
-            import pybonjour  # pylint: disable=unused-variable
-            _dependencies['PYBONJOUR'] = True
-        else:
-            import dbus  # pylint: disable=unused-variable
-            _dependencies['PYTHON-DBUS'] = True
+        import pybonjour  # pylint: disable=unused-variable
+        _dependencies['PYBONJOUR'] = True
+    except Exception:
+        pass
+
+    try:
+        import dbus  # pylint: disable=unused-variable
+        _dependencies['PYTHON-DBUS'] = True
     except Exception:
         pass
 



View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a91f5f2c4914b597c9833894c8a31c6ba054ed39

-- 
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a91f5f2c4914b597c9833894c8a31c6ba054ed39
You're receiving this email because of your account on dev.gajim.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gajim.org/pipermail/commits/attachments/20190105/ce3b6a7a/attachment-0001.html>


More information about the Commits mailing list