Revert "factor out Sugar intro screen into separate script"

This reverts commit 9bcbda746abdc03747bb57e9e955940fd1bf135a that got pushed
by accident.

4 files changed, 3 insertions, 29 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 4472ef2..05a9215 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -3,7 +3,6 @@ python_scripts =		\
 	sugar-control-panel	\
 	sugar-emulator		\
 	sugar-install-bundle	\
-	sugar-intro		\
 	sugar-launch		\
 	sugar-session		\
 	sugar-ui-check
diff --git a/bin/sugar-intro b/bin/sugar-intro
deleted file mode 100755
index d059050..0000000
--- a/bin/sugar-intro
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-import gettext
-
-import gtk
-
-from jarabe import config
-from jarabe import intro
-
-
-gettext.bindtextdomain('sugar', config.locale_path)
-gettext.bindtextdomain('sugar-toolkit', config.locale_path)
-gettext.textdomain('sugar')
-intro.check_profile()
diff --git a/bin/sugar-session b/bin/sugar-session
index 812f6c7..8ea195f 100755
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -227,6 +227,7 @@ def main():
 
     from jarabe.desktop import homewindow
     from jarabe.model import sound
+    from jarabe import intro
 
     logger.start('shell')
 
@@ -244,6 +245,8 @@ def main():
     # even when we initially get blocked on the intro screen
     gobject.idle_add(unfreeze_dcon_cb)
 
+    intro.check_profile()
+
     start_ui_service()
     start_session_manager()
 
diff --git a/bin/sugar.in b/bin/sugar.in
index 4390ec2..12098db 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -e
 
 if [ "$(id -u)" -eq 0 -o "$(id -ru)" -eq 0 ] ; then
 	echo Refusing to run as root.
@@ -80,5 +79,4 @@ fi
 echo Xcursor.theme: sugar | xrdb -merge
 metacity --no-force-fullscreen -d $DISPLAY &
 
-sugar-intro
 exec sugar-session