From 422482e2f1a1392297b2a5a2a2ad2d583f4910df Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
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(-)

(limited to 'ayatanawebmail')

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