Move window manager handling up in the file, fix two underscroes for callbacks

1 files changed, 11 insertions, 14 deletions

diff --git a/src/jarabe/main.py b/src/jarabe/main.py
index d6d24b0..c56576d 100755
--- a/src/jarabe/main.py
+++ b/src/jarabe/main.py
@@ -162,9 +162,18 @@ def start_home():
     screen.connect('window-manager-changed', __window_manager_changed_cb)
     _check_for_window_manager(screen)
 
-def intro_window_done_cb(window):
+def __intro_window_done_cb(window):
     start_home()
 
+def __window_manager_changed_cb(screen):
+    _check_for_window_manager(screen)
+
+def _check_for_window_manager(screen):
+    wm_name = screen.get_window_manager_name()
+    if wm_name is not None:
+        screen.disconnect_by_func(__window_manager_changed_cb)
+        bootstrap()
+
 def cleanup_temporary_files():
     try:
         # Remove temporary files. See http://bugs.sugarlabs.org/ticket/1876
@@ -221,7 +230,7 @@ def main():
 
     if not intro.check_profile():
         win = IntroWindow()
-        win.connect("done", intro_window_done_cb)
+        win.connect("done", __intro_window_done_cb)
         win.show_all()
     else:
         start_home()
@@ -231,16 +240,4 @@ def main():
     except KeyboardInterrupt:
         print 'Ctrl+C pressed, exiting...'
 
-
-def __window_manager_changed_cb(screen):
-    _check_for_window_manager(screen)
-
-
-def _check_for_window_manager(screen):
-    wm_name = screen.get_window_manager_name()
-    if wm_name is not None:
-        screen.disconnect_by_func(__window_manager_changed_cb)
-        bootstrap()
-
-
 main()