virt-manager/virtman-revert-use-of-AyatanaAppIndicator3.patch

47 lines
1.4 KiB
Diff
Raw Normal View History

While AyatanaAppIndicator3 is available on Tumbleweed,
it is not available on SLE15.
Index: virt-manager-3.3.0/virtManager/systray.py
===================================================================
--- virt-manager-3.3.0.orig/virtManager/systray.py
+++ virt-manager-3.3.0/virtManager/systray.py
@@ -6,7 +6,6 @@
import os
-import gi
from gi.repository import Gio
from gi.repository import Gtk
@@ -17,25 +16,14 @@ from . import vmmenu
from .baseclass import vmmGObject
from .connmanager import vmmConnectionManager
-
-# pylint: disable=ungrouped-imports
-# Prefer AyatantaAppIndicator3 which is the modern maintained
-# appindicator library.
-try: # pragma: no cover
- # pylint: disable=no-name-in-module
- gi.require_version('AyatanaAppIndicator3', '0.1')
- from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+try:
+ # pylint: disable=ungrouped-imports
+ import gi
+ gi.require_version('AppIndicator3', '0.1')
+ from gi.repository import AppIndicator3
except Exception: # pragma: no cover
AppIndicator3 = None
-if not AppIndicator3:
- try: # pragma: no cover
- # pylint: disable=no-name-in-module
- gi.require_version('AppIndicator3', '0.1')
- from gi.repository import AppIndicator3
- except Exception: # pragma: no cover
- AppIndicator3 = None
-
def _toggle_manager(*args, **kwargs):
ignore = args