From 20f294d840c09163c32573d015ac06f66045d65e Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 25 Mar 2025 07:27:23 -0400 Subject: [PATCH] More updates for imports in plugin_system_manager. --- src/cthulhu/plugin_system_manager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cthulhu/plugin_system_manager.py b/src/cthulhu/plugin_system_manager.py index a5555d1..a33c54b 100644 --- a/src/cthulhu/plugin_system_manager.py +++ b/src/cthulhu/plugin_system_manager.py @@ -33,16 +33,19 @@ else: # Python 3.5+, no support for python < 3.3. import importlib.util import gi -# First try the newer version, then fall back to older version if needed +# First handle GIRepository version try: gi.require_version('GIRepository', '3.0') except ValueError: gi.require_version('GIRepository', '2.0') +# IMPORTANT: No gi.repository imports should happen before GIRepository version is set gi.require_version('Peas', '1.0') +gi.require_version('Atspi', '2.0') + +# Now it's safe to import from gi.repository from gi.repository import GObject from gi.repository import Peas -gi.require_version('Atspi', '2.0') from gi.repository import Atspi from cthulhu import resource_manager