From c784000e694f9fa508a2535f5d23d04456b4ff86 Mon Sep 17 00:00:00 2001 From: mullerdavid Date: Tue, 21 Sep 2021 14:20:23 +0200 Subject: [PATCH] Fix broken tray icon on Debian 11 (#461) * Tryicon plugin Ayatana library fallback * Updating debian dependencies * Updated readme, adding Ayataha Appindicator --- README.md | 2 +- debian/control | 2 +- safeeyes/plugins/trayicon/plugin.py | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f4a5f7e..f1d7083 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ sudo zypper install safeeyes Ensure to meet the following dependencies: -- gir1.2-appindicator3-0.1 +- gir1.2-appindicator3-0.1 or gir1.2-ayatanaappindicator3-0.1 - gir1.2-notify-0.7 - libappindicator-gtk3 - python3-psutil diff --git a/debian/control b/debian/control index e5508bb..40c9e94 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: https://github.com/slgobinath/SafeEyes/ Package: safeeyes Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-appindicator3-0.1, python3 (>= 3.5.0), python3-xlib, python3-dbus, gir1.2-notify-0.7, python3-babel, x11-utils, xprintidle, alsa-utils, python3-psutil, python3-croniter +Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-ayatanaappindicator3-0.1, python3 (>= 3.5.0), python3-xlib, python3-dbus, gir1.2-notify-0.7, python3-babel, x11-utils, xprintidle, alsa-utils, python3-psutil, python3-croniter Description: Safe Eyes Safe Eyes is a simple tool to remind you to take periodic breaks for your eyes. This is essential for anyone spending more time on the computer to avoid eye strain and other physical problems. . diff --git a/safeeyes/plugins/trayicon/plugin.py b/safeeyes/plugins/trayicon/plugin.py index 1461133..9fb3b48 100644 --- a/safeeyes/plugins/trayicon/plugin.py +++ b/safeeyes/plugins/trayicon/plugin.py @@ -19,8 +19,13 @@ import datetime import gi gi.require_version('Gtk', '3.0') -gi.require_version('AppIndicator3', '0.1') -from gi.repository import AppIndicator3 as appindicator +try: + gi.require_version('AppIndicator3', '0.1') + from gi.repository import AppIndicator3 as appindicator +except: + #fall back to Ayatana + gi.require_version('AyatanaAppIndicator3', '0.1') + from gi.repository import AyatanaAppIndicator3 as appindicator from gi.repository import Gtk import logging from safeeyes import utility