make sugar shell easier to profile startup times

shell/sugar-shell

@@ -69,17 +69,6 @@ def _setup_translations():
     gettext.bindtextdomain(domain, env.get_locale_path())
     gettext.textdomain(domain)
 
-_save_session_info()
-_start_matchbox()
-_setup_translations()
-
-# Do initial setup if needed
-if not profile.is_valid():
-	win = intro.IntroWindow()
-	win.show_all()
-	gtk.main()
-	profile.update()
-
 def check_gabble(bus_name):
     try:
         import dbus
@@ -92,6 +81,18 @@ def check_gabble(bus_name):
         pass
     return False
 
+def main()
+    _save_session_info()
+    _start_matchbox()
+    _setup_translations()
+
+    # Do initial setup if needed
+    if not profile.is_valid():
+        win = intro.IntroWindow()
+        win.show_all()
+        gtk.main()
+        profile.update()
+
     if os.environ.has_key("TP_DEBUG"):
         # Allow the user time to start up telepathy connection managers
         # using the Sugar DBus bus address
@@ -117,6 +118,15 @@ model = ShellModel()
     shell = Shell(model)
     service = ShellService(shell)
 
+if name == '__main__':
+    # running the gtk.main outside of the main() function allows us to 
+    # profile startup times.  To profile startup times replace the following
+    # call to main with:
+    # import cProfile
+    # cProfile.run('main()', '/home/olpc/sugar-startup.stats')
+
+    main()
+
     try:
         gtk.main()
     except KeyboardInterrupt: