Use glib's native asyncio integration when available

debian/control

@@ -6,7 +6,7 @@ Build-Depends:
  debhelper (>= 9),
  dh-python,
  python3-all,
- python3-gbulb,
+ python3-gi (>= 3.50.0) | python3-gbulb,
  python3-setuptools,
  python3-systemd,
 Standards-Version: 3.9.5

qui/clipboard.py

@@ -45,7 +45,15 @@
 gi.require_version("Gtk", "3.0")  # isort:skip
 from gi.repository import Gtk, Gio, Gdk  # isort:skip
 
-import gbulb
+try:
+    from gi.events import GLibEventLoopPolicy
+
+    asyncio.set_event_loop_policy(GLibEventLoopPolicy())
+except ImportError:
+    import gbulb
+
+    gbulb.install()
+
 import pyinotify
 
 import gettext
@@ -55,8 +63,6 @@
 
 from .utils import run_asyncio_and_show_errors
 
-gbulb.install()
-
 DATA = "/var/run/qubes/qubes-clipboard.bin"
 METADATA = "/var/run/qubes/qubes-clipboard.bin.metadata"
 FROM = "/var/run/qubes/qubes-clipboard.bin.source"

qui/devices/device_widget.py

@@ -44,15 +44,20 @@
 gi.require_version("Gtk", "3.0")  # isort:skip
 from gi.repository import Gtk, Gdk, Gio  # isort:skip
 
+try:
+    from gi.events import GLibEventLoopPolicy
+
+    asyncio.set_event_loop_policy(GLibEventLoopPolicy())
+except ImportError:
+    import gbulb
+
+    gbulb.install()
+
 from qui.devices import backend
 from qui.devices import actionable_widgets
 
 from qubes_config.widgets.gtk_utils import is_theme_light
 
-import gbulb
-
-gbulb.install()
-
 import gettext
 
 t = gettext.translation("desktop-linux-manager", fallback=True)

qui/tools/qubes_device_agent.py

@@ -36,7 +36,14 @@
 # pylint: enable=import-error
 
 # pylint: disable=wrong-import-order
-import gbulb
+try:
+    from gi.events import GLibEventLoopPolicy
+
+    asyncio.set_event_loop_policy(GLibEventLoopPolicy())
+except ImportError:
+    import gbulb
+
+    gbulb.install()
 
 # pylint: enable=wrong-import-position
 
@@ -256,10 +263,10 @@ async def handle_request(self, params, service, source_domain):
 def main():
     args = parser.parse_args()
 
-    gbulb.install()
     agent = DeviceAgent(args.socket_path)
 
-    asyncio.run(agent.run())
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(agent.run())
 
 
 if __name__ == "__main__":

qui/tray/domains.py

@@ -26,9 +26,14 @@
 gi.require_version("Gtk", "3.0")  # isort:skip
 from gi.repository import Gdk, Gio, Gtk, GLib, GdkPixbuf  # isort:skip
 
-import gbulb
+try:
+    from gi.events import GLibEventLoopPolicy
 
-gbulb.install()
+    asyncio.set_event_loop_policy(GLibEventLoopPolicy())
+except ImportError:
+    import gbulb
+
+    gbulb.install()
 
 import gettext
 

qui/tray/updates.py

@@ -23,9 +23,14 @@
 gi.require_version("Gtk", "3.0")  # isort:skip
 from gi.repository import Gtk, Gio  # isort:skip
 
-import gbulb
+try:
+    from gi.events import GLibEventLoopPolicy
 
-gbulb.install()
+    asyncio.set_event_loop_policy(GLibEventLoopPolicy())
+except ImportError:
+    import gbulb
+
+    gbulb.install()
 
 import gettext
 

qui/updater/summary_page.py

@@ -338,7 +338,8 @@ def shutdown_domains(self, to_shutdown):
                 )
                 self.status = RestartStatus.ERROR_TMPL_DOWN
 
-        asyncio.run(wait_for_domain_shutdown(wait_for))
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(wait_for_domain_shutdown(wait_for))
 
         return wait_for
 

rpm_spec/qubes-desktop-linux-manager.spec.in

@@ -48,7 +48,11 @@ BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  gettext
 
 Requires:  python%{python3_pkgversion}-setuptools
+%if 0%{?fedora} < 42
 Requires:  python%{python3_pkgversion}-gbulb
+%else
+Requires:   python%{python3_pkgversion}-gobject >= 3.50.0
+%endif
 Requires:  python%{python3_pkgversion}-inotify
 Requires:  libappindicator-gtk3
 Requires:  python%{python3_pkgversion}-systemd