Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-11-06 12:43:03 (GMT)
committer Simon Schampijer <simon@laptop.org>2012-11-06 20:05:45 (GMT)
commit0e854281f1c4e51b6a73129b4c4aaee93f5a0285 (patch)
tree541f8b28b4b3d5030bbead7aaeb5249e48848565 /bin
parent0a4864fa06dccd97b0907ff16a80c058b39f34db (diff)
Move IntroWindow creation to sugar-session
It avoids the unexpected side effect (showing the intro UI implicityly when we are just checking the profile existence). It also prepares for listening to an IntroWindow done signal instead of blocking in a mainloop. Signed-off-by: Daniel Narvaez <dwnarvaez@gmail.com> Acked-by: Simon Schampijer <simon@laptop.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/sugar-session7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/sugar-session b/bin/sugar-session
index 23f88a1..5c72ff2 100755
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -278,6 +278,7 @@ def main():
from jarabe.desktop import homewindow
from jarabe.model import sound
from jarabe import intro
+ from jarabe.intro.window import IntroWindow
logger.start('shell')
@@ -301,7 +302,11 @@ def main():
# TODO #3204
if subprocess.call('echo $DISPLAY; xsetroot -cursor_name left_ptr', shell=True):
logging.warning('Can not reset cursor')
- intro.check_profile()
+
+ if not intro.check_profile():
+ win = IntroWindow()
+ win.show_all()
+ Gtk.main()
start_ui_service()
start_session_manager()