From 92aae66021eda9a8e9d97ee3de7b6719d81694fa Mon Sep 17 00:00:00 2001
From: bhavya <bhavya@Bhavya.myguest.virtualbox.org>
Date: Sat, 25 Mar 2023 14:12:45 +0530
Subject: [PATCH 1/3] Added Validation check for screen

---
 src/jarabe/main.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/jarabe/main.py b/src/jarabe/main.py
index adeed46e8..ec1336642 100755
--- a/src/jarabe/main.py
+++ b/src/jarabe/main.py
@@ -340,7 +340,19 @@ def _check_group_label():
     return intro.check_group_label()
 
 
+def _validation_check():
+
+    screen = Wnck.Screen.get_default()
+    if screen is not None:
+        return True
+    else:
+        return False
+
+
 def main():
+    if not _validation_check():
+        sys.exit()
+        
     Gst.init(sys.argv)
 
     cleanup_temporary_files()

From b27a875af1801374fdae169f55e913ddaac432ac Mon Sep 17 00:00:00 2001
From: bhavya <bhavya@Bhavya.myguest.virtualbox.org>
Date: Sat, 25 Mar 2023 14:33:03 +0530
Subject: [PATCH 2/3] Performing validation check after initializing the
 Gstreamer library.

---
 src/jarabe/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jarabe/main.py b/src/jarabe/main.py
index ec1336642..cee3ad2c7 100755
--- a/src/jarabe/main.py
+++ b/src/jarabe/main.py
@@ -350,11 +350,11 @@ def _validation_check():
 
 
 def main():
+    Gst.init(sys.argv)
+
     if not _validation_check():
         sys.exit()
         
-    Gst.init(sys.argv)
-
     cleanup_temporary_files()
 
     _start_window_manager()

From b1c106f833981d445a3a41672d65ed647ac5e6b3 Mon Sep 17 00:00:00 2001
From: bhavya <bhavya@Bhavya.myguest.virtualbox.org>
Date: Sat, 25 Mar 2023 18:31:34 +0530
Subject: [PATCH 3/3] Checking screen None in _start_window_manager

---
 src/jarabe/main.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/jarabe/main.py b/src/jarabe/main.py
index cee3ad2c7..40b306091 100755
--- a/src/jarabe/main.py
+++ b/src/jarabe/main.py
@@ -198,13 +198,16 @@ def _restart_window_manager():
 def _start_window_manager():
     global _cursor_theme_settings, _cursor_theme
 
+    screen = Wnck.Screen.get_default()
+    if screen is None:
+        return sys.exit()
+
     _cursor_theme_settings = Gio.Settings.new('org.gnome.desktop.interface')
     _cursor_theme = _cursor_theme_settings.get_string('cursor-theme')
     _cursor_theme_settings.set_string('cursor-theme', 'sugar')
 
     _restart_window_manager()
 
-    screen = Wnck.Screen.get_default()
     screen.connect('window-manager-changed', __window_manager_changed_cb)
 
     _check_for_window_manager(screen)
@@ -340,21 +343,9 @@ def _check_group_label():
     return intro.check_group_label()
 
 
-def _validation_check():
-
-    screen = Wnck.Screen.get_default()
-    if screen is not None:
-        return True
-    else:
-        return False
-
-
 def main():
     Gst.init(sys.argv)
 
-    if not _validation_check():
-        sys.exit()
-        
     cleanup_temporary_files()
 
     _start_window_manager()