From 9194092d7bf42ca8960fe73ac2ab3fed3b0823bd Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 23 Nov 2021 23:07:29 -0500 Subject: [GTKUI] Support using the Ayatana fork of indicators. As this fork is maintained in Debian, and as of Impish/21.10 is the supported variant in Ubuntu as well. Closes: deluge-torrent/deluge#317 --- deluge/ui/gtk3/systemtray.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'deluge/ui') diff --git a/deluge/ui/gtk3/systemtray.py b/deluge/ui/gtk3/systemtray.py index f851f3275..a2435223b 100644 --- a/deluge/ui/gtk3/systemtray.py +++ b/deluge/ui/gtk3/systemtray.py @@ -30,8 +30,12 @@ from .common import build_menu_radio_list, get_logo from .dialogs import OtherDialog try: - require_version('AppIndicator3', '0.1') - from gi.repository import AppIndicator3 + try: + require_version('AyatanaAppIndicator3', '0.1') + from gi.repository import AyatanaAppIndicator3 as AppIndicator3 + except (ValueError, ImportError): + require_version('AppIndicator3', '0.1') + from gi.repository import AppIndicator3 except (ValueError, ImportError): AppIndicator3 = None -- cgit