From 4a9b46679c116e7a79a3c4743c328c2381d9a51a Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Mon, 3 Apr 2023 10:23:21 -0400 Subject: [PATCH] ui: rearrange code in tray.py --- lib/solaar/ui/tray.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py index e3226486..0e43baf8 100644 --- a/lib/solaar/ui/tray.py +++ b/lib/solaar/ui/tray.py @@ -150,20 +150,17 @@ try: import gi try: gi.require_version('AyatanaAppIndicator3', '0.1') + from gi.repository import AyatanaAppIndicator3 as AppIndicator3 ayatana_appindicator_found = True except ValueError: try: gi.require_version('AppIndicator3', '0.1') + from gi.repository import AppIndicator3 ayatana_appindicator_found = False except ValueError: # treat unavailable versions the same as unavailable packages raise ImportError - if ayatana_appindicator_found: - from gi.repository import AyatanaAppIndicator3 as AppIndicator3 - else: - from gi.repository import AppIndicator3 - if _log.isEnabledFor(_DEBUG): _log.debug('using %sAppIndicator3' % ('Ayatana ' if ayatana_appindicator_found else ''))