From 2eb0aa42a1cb2d3589071a9a6372f519275c9a68 Mon Sep 17 00:00:00 2001 From: Max Resch Date: Sat, 6 Jul 2019 19:49:24 +0200 Subject: [PATCH] [appindicator] use gir package name "AppIndicator3" Allow to additionally import "AppIndicator3" to "AyatanaAppIndicator3" --- appindicator_integration/plugin.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/appindicator_integration/plugin.py b/appindicator_integration/plugin.py index 93fba67..3224680 100644 --- a/appindicator_integration/plugin.py +++ b/appindicator_integration/plugin.py @@ -14,11 +14,16 @@ import gi from gi.repository import Gtk, GLib, Gdk try: - gi.require_version('AyatanaAppIndicator3', '0.1') - from gi.repository import AyatanaAppIndicator3 as appindicator + gi.require_version('AppIndicator3', '0.1') + from gi.repository import AppIndicator3 as appindicator ERRORMSG = None except (ValueError, ImportError): - ERRORMSG = 'Please install libappindicator3' + try: + gi.require_version('AyatanaAppIndicator3', '0.1') + from gi.repository import AyatanaAppIndicator3 as appindicator + ERRORMSG = None + except (ValueError, ImportError): + ERRORMSG = 'Please install libappindicator3' from gajim.common import app, ged from gajim.common import configpaths