copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update dependency check for avahi support

This commit is contained in:
André Apitzsch 2019-03-31 19:09:29 +02:00
parent a7bc6dc530
commit 16bbe31df6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gajim/common/app.py
View File

@ -189,7 +189,7 @@ gajim_optional_features = {} # type: Dict[str, List[str]]
caps_hash = {} # type: Dict[str, List[str]] caps_hash = {} # type: Dict[str, List[str]]
_dependencies = { _dependencies = {
'PYTHON-DBUS': False, 'AVAHI': False,
'PYBONJOUR': False, 'PYBONJOUR': False,
'PYGPG': False, 'PYGPG': False,
'GPG_BINARY': False, 'GPG_BINARY': False,
@ -208,7 +208,7 @@ def is_installed(dependency):
return _dependencies['PYGPG'] and _dependencies['GPG_BINARY'] return _dependencies['PYGPG'] and _dependencies['GPG_BINARY']
if dependency == 'ZEROCONF': if dependency == 'ZEROCONF':
# Alias for checking zeroconf libs # Alias for checking zeroconf libs
return _dependencies['PYTHON-DBUS'] or _dependencies['PYBONJOUR'] return _dependencies['AVAHI'] or _dependencies['PYBONJOUR']
return _dependencies[dependency] return _dependencies[dependency]
def is_flatpak(): def is_flatpak():
@ -240,8 +240,9 @@ def detect_dependencies():
pass pass
try: try:
import dbus # pylint: disable=unused-variable gi.require_version('Avahi', '0.6')
_dependencies['PYTHON-DBUS'] = True from gi.repository import Avahi # pylint: disable=unused-variable
_dependencies['AVAHI'] = True
except Exception: except Exception:
pass pass