Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
a91f5f2c
by Sebastiaan Lokhorst at 2019-01-05T17:37:09Z
2 changed files:
Changes:
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 |
|
| 18 | 18 |
- python3-pil (pillow) for support of webp avatars
|
| 19 | 19 |
- python3-gnupg to enable GPG encryption
|
| 20 |
-- For zeroconf (bonjour) you need python3-dbus
|
|
| 20 |
+- For zeroconf you need python3-dbus on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS
|
|
| 21 | 21 |
- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc
|
| 22 | 22 |
- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage
|
| 23 | 23 |
- D-Bus running to have gajim-remote working
|
| ... | ... | @@ -220,12 +220,14 @@ def detect_dependencies(): |
| 220 | 220 |
|
| 221 | 221 |
# ZEROCONF
|
| 222 | 222 |
try:
|
| 223 |
- if os.name == 'nt':
|
|
| 224 |
- import pybonjour # pylint: disable=unused-variable
|
|
| 225 |
- _dependencies['PYBONJOUR'] = True
|
|
| 226 |
- else:
|
|
| 227 |
- import dbus # pylint: disable=unused-variable
|
|
| 228 |
- _dependencies['PYTHON-DBUS'] = True
|
|
| 223 |
+ import pybonjour # pylint: disable=unused-variable
|
|
| 224 |
+ _dependencies['PYBONJOUR'] = True
|
|
| 225 |
+ except Exception:
|
|
| 226 |
+ pass
|
|
| 227 |
+ |
|
| 228 |
+ try:
|
|
| 229 |
+ import dbus # pylint: disable=unused-variable
|
|
| 230 |
+ _dependencies['PYTHON-DBUS'] = True
|
|
| 229 | 231 |
except Exception:
|
| 230 | 232 |
pass
|
| 231 | 233 |
|