From 30edb542b16a544977cf22f2b1a669d4d618730c Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 17 Sep 2007 11:53:10 +0000
Subject: Cleanup the profile code and rename the Server section to Jabber.

---
(limited to 'shell/sugar-shell')

diff --git a/shell/sugar-shell b/shell/sugar-shell
index c2928c2..a054189 100755
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
@@ -26,8 +26,8 @@ import gtk
 import gobject
 
 from sugar import logger
-from sugar import profile
 from sugar import env
+from sugar.profile import get_profile
 
 logger.cleanup()
 logger.start('shell')
@@ -95,11 +95,10 @@ def main():
     _setup_translations()
 
     # Do initial setup if needed
-    if not profile.is_valid():
+    if not get_profile().is_valid():
         win = intro.IntroWindow()
         win.show_all()
         gtk.main()
-        profile.update()
 
     if os.environ.has_key("SUGAR_TP_DEBUG"):
         # Allow the user time to start up telepathy connection managers
--
cgit v0.9.1