From 3a012d02a9986e0b9a22ee31786500c04d683851 Mon Sep 17 00:00:00 2001 From: denisiko Date: Sat, 31 Oct 2020 14:06:57 +0100 Subject: [PATCH] libnotifyplugin: Extend check for is_gnome --- Mailnag/plugins/libnotifyplugin.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Mailnag/plugins/libnotifyplugin.py b/Mailnag/plugins/libnotifyplugin.py index efa293f..20ffe27 100644 --- a/Mailnag/plugins/libnotifyplugin.py +++ b/Mailnag/plugins/libnotifyplugin.py @@ -64,8 +64,7 @@ class LibNotifyPlugin(Plugin): # initialize Notification if not self._initialized: Notify.init("Mailnag") - self._is_gnome = 'GDMSESSION' in os.environ and \ - (os.environ['GDMSESSION'] == 'gnome') + self._is_gnome = self._is_gnome_environment(('GDMSESSION', 'XDG_CURRENT_DESKTOP')) self._initialized = True def mails_added_hook(new_mails, all_mails): @@ -376,6 +375,13 @@ class LibNotifyPlugin(Plugin): return new_mails + [m for m in all_mails if m not in new_mails] + def _is_gnome_environment(self, env_vars): + for var in env_vars: + if os.environ.get(var, '').lower().endswith('gnome'): + return True + return False + + def get_default_mail_reader(): mail_reader = None app_info = Gio.AppInfo.get_default_for_type ("x-scheme-handler/mailto", False)