From 422482e2f1a1392297b2a5a2a2ad2d583f4910df Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 26 Jan 2021 15:16:39 +0100 Subject: ayatanawebmail/application.py: If no Ayatana Indicator Application is running, still attempt loading the AyatanaAppIndicator GIO module before falling back to the (dead and rotten) AppIndicator GIO module. --- ayatanawebmail/application.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ayatanawebmail/application.py b/ayatanawebmail/application.py index 2e84b04..72e4043 100755 --- a/ayatanawebmail/application.py +++ b/ayatanawebmail/application.py @@ -175,7 +175,7 @@ class MessagingMenu(object): return - if 'ayatana-indicator-application-service' in lstProcesses: + else: try: @@ -187,11 +187,6 @@ class MessagingMenu(object): gi.require_version('AppIndicator3', '0.1') self.oAppIndicator = importlib.import_module('gi.repository.AppIndicator3') - if not self.oAppIndicator: - - gi.require_version('AppIndicator3', '0.1') - self.oAppIndicator = importlib.import_module('gi.repository.AppIndicator3') - self.oIndicator = self.oAppIndicator.Indicator.new(APPNAME, 'indicator-messages', self.oAppIndicator.IndicatorCategory.APPLICATION_STATUS) self.oIndicator.set_attention_icon('indicator-messages-new') self.oIndicator.set_status(self.oAppIndicator.IndicatorStatus.ACTIVE) -- cgit v1.2.3 From 02c5007d30ef1cab7cd1fcf8bc501312a94a57a6 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 26 Jan 2021 22:14:33 +0100 Subject: Drop the bundled Faenza icon fixes #15 --- .../icons/Faenza/apps/scalable/ayatanawebmail.svg | 703 --------------------- debian/postinst | 4 +- 2 files changed, 1 insertion(+), 706 deletions(-) delete mode 100755 data/usr/share/icons/Faenza/apps/scalable/ayatanawebmail.svg diff --git a/data/usr/share/icons/Faenza/apps/scalable/ayatanawebmail.svg b/data/usr/share/icons/Faenza/apps/scalable/ayatanawebmail.svg deleted file mode 100755 index 2a30d92..0000000 --- a/data/usr/share/icons/Faenza/apps/scalable/ayatanawebmail.svg +++ /dev/null @@ -1,703 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/postinst b/debian/postinst index cea66d0..aa69ce5 100755 --- a/debian/postinst +++ b/debian/postinst @@ -8,10 +8,8 @@ case "$1" in cp -n /usr/share/ayatanawebmail/indicator-messages-new.svg /usr/share/icons/hicolor/scalable/status/indicator-messages-new.svg cp -n /usr/share/ayatanawebmail/indicator-messages.svg /usr/share/icons/hicolor/scalable/status/indicator-messages.svg - mkdir -p /usr/share/icons/matefaenza/apps/scalable - ln -sf /usr/share/icons/Faenza/apps/scalable/ayatanawebmail.svg /usr/share/icons/matefaenza/apps/scalable/ayatanawebmail.svg - update-icon-caches /usr/share/icons/hicolor /usr/share/icons/Faenza /usr/share/icons/matefaenza + update-icon-caches /usr/share/icons/hicolor glib-compile-schemas /usr/share/glib-2.0/schemas ;; -- cgit v1.2.3