[rhel7-branch 20/29] Don't call BusyCursor before Gdk is setup (#1078868)
bcl
installerbot-noreply at redhat.com
Tue Jun 2 00:31:21 UTC 2015
From: "Brian C. Lane" <bcl at redhat.com>
The setup method is too early, the Gdk.get_default_root_window call
fails. So Remove the call to busyCursor, but just in case also silently
return if busyCursor or unbusyCursor doesn't get a window.
Resolves: rhbz#1078868
(cherry picked from commit 3cf6d5191aa7ee45bbb4be45a8197512d1580899)
Related: rhbz#1996721
---
pyanaconda/ui/gui/__init__.py | 2 --
pyanaconda/ui/gui/utils.py | 6 ++++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index 979a1cf..9f6fb6d 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -599,8 +599,6 @@ def _is_standalone(self, obj):
return isinstance(obj, StandaloneSpoke)
def setup(self, data):
- busyCursor()
-
self._actions = self.getActionClasses(self._list_hubs())
self.data = data
diff --git a/pyanaconda/ui/gui/utils.py b/pyanaconda/ui/gui/utils.py
index e6573b8..f6687b7 100644
--- a/pyanaconda/ui/gui/utils.py
+++ b/pyanaconda/ui/gui/utils.py
@@ -290,10 +290,16 @@ def inner_func(*args, **kwargs):
def busyCursor():
window = Gdk.get_default_root_window()
+ if not window:
+ return
+
window.set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
def unbusyCursor():
window = Gdk.get_default_root_window()
+ if not window:
+ return
+
window.set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW))
def ignoreEscape(dlg):
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/c070f5b8f1c8a5a3fbbd200ed4a3e9b5cb8d0a47
More information about the anaconda-patches
mailing list