projects / packages / blueman.git / blame
| Commit | Line | Data |
|---|---|---|
| 3264904f JP |
1 | diff --color -ur blueman-2.2.3.orig/blueman/main/indicators/AppIndicator.py blueman-2.2.3/blueman/main/indicators/AppIndicator.py |
| 2 | --- blueman-2.2.3.orig/blueman/main/indicators/AppIndicator.py 2021-10-27 23:53:20.000000000 +0200 | |
| 3 | +++ blueman-2.2.3/blueman/main/indicators/AppIndicator.py 2021-11-24 17:27:22.156528203 +0100 | |
| 4 | @@ -2,8 +2,12 @@ | |
| 5 | ||
| 6 | import gi | |
| 7 | ||
| 8 | -gi.require_version('AppIndicator3', '0.1') | |
| 9 | -from gi.repository import AppIndicator3 | |
| 10 | +try: | |
| 11 | + gi.require_version('AyatanaAppIndicator3', '0.1') | |
| 12 | + from gi.repository import AyatanaAppIndicator3 as AppIndicator3 | |
| 13 | +except ValueError: | |
| 14 | + gi.require_version('AppIndicator3', '0.1') | |
| 15 | + from gi.repository import AppIndicator3 | |
| 16 | from blueman.main.indicators.GtkStatusIcon import build_menu | |
| 17 | ||
| 18 | if TYPE_CHECKING: | |
| 19 | diff --color -ur blueman-2.2.3.orig/blueman/plugins/applet/AppIndicator.py blueman-2.2.3/blueman/plugins/applet/AppIndicator.py | |
| 20 | --- blueman-2.2.3.orig/blueman/plugins/applet/AppIndicator.py 2021-10-27 23:53:20.000000000 +0200 | |
| 21 | +++ blueman-2.2.3/blueman/plugins/applet/AppIndicator.py 2021-11-24 17:26:51.113366220 +0100 | |
| 22 | @@ -8,9 +8,12 @@ | |
| 23 | from blueman.plugins.applet.StatusIcon import StatusIconImplementationProvider | |
| 24 | ||
| 25 | try: | |
| 26 | - require_version('AppIndicator3', '0.1') | |
| 27 | + require_version('AyatanaAppIndicator3', '0.1') | |
| 28 | except ValueError: | |
| 29 | - raise ImportError("AppIndicator3 not found") | |
| 30 | + try: | |
| 31 | + require_version('AppIndicator3', '0.1') | |
| 32 | + except ValueError: | |
| 33 | + raise ImportError("AppIndicator3 not found") | |
| 34 | ||
| 35 | ||
| 36 | class AppIndicator(AppletPlugin, StatusIconImplementationProvider): |