RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: rearrange code in tray.py

This commit is contained in:
Peter F. Patel-Schneider 2023-04-03 10:23:21 -04:00
parent dd7ec7e0bc
commit 4a9b46679c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/solaar/ui/tray.py
View File

@ -150,20 +150,17 @@ try:
import gi import gi
try: try:
gi.require_version('AyatanaAppIndicator3', '0.1') gi.require_version('AyatanaAppIndicator3', '0.1')
from gi.repository import AyatanaAppIndicator3 as AppIndicator3
ayatana_appindicator_found = True ayatana_appindicator_found = True
except ValueError: except ValueError:
try: try:
gi.require_version('AppIndicator3', '0.1') gi.require_version('AppIndicator3', '0.1')
from gi.repository import AppIndicator3
ayatana_appindicator_found = False ayatana_appindicator_found = False
except ValueError: except ValueError:
# treat unavailable versions the same as unavailable packages # treat unavailable versions the same as unavailable packages
raise ImportError raise ImportError
if ayatana_appindicator_found:
from gi.repository import AyatanaAppIndicator3 as AppIndicator3
else:
from gi.repository import AppIndicator3
if _log.isEnabledFor(_DEBUG): if _log.isEnabledFor(_DEBUG):
_log.debug('using %sAppIndicator3' % ('Ayatana ' if ayatana_appindicator_found else '')) _log.debug('using %sAppIndicator3' % ('Ayatana ' if ayatana_appindicator_found else ''))