From d2bbe5e7abba8bfe5e92c807b6296fe888ec2aec Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Sun, 18 Oct 2009 11:42:42 +0000
Subject: Revert 878ac4cbcf

---
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index 42b4cbd..8c43930 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -13,13 +13,6 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/desktop/sugar/user/default_nick</key>
-      <applyto>/desktop/sugar/user/default_nick</applyto>
-      <owner>sugar</owner>
-      <type>string</type>
-      <default>disabled</default>
-    </schema>
-    <schema>
       <key>/schemas/desktop/sugar/user/color</key>
       <applyto>/desktop/sugar/user/color</applyto>
       <owner>sugar</owner>
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index 17da465..94c6782 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -18,7 +18,6 @@ import os
 import logging
 from gettext import gettext as _
 import gconf
-import pwd
 
 import gtk
 import gobject
@@ -112,9 +111,6 @@ class _NamePage(_Page):
     def get_name(self):
         return self._entry.props.text
 
-    def set_name(self, new_name):
-        self._entry.props.text = new_name
-
     def activate(self):
         self._entry.props.widget.grab_focus()
 
@@ -160,19 +156,6 @@ class _IntroBox(hippo.CanvasBox):
         self._current_page = None
         self._next_button = None
 
-        client = gconf.client_get_default()
-        default_nick = client.get_string('/desktop/sugar/user/default_nick')
-        if default_nick:
-            self._page = self.PAGE_COLOR
-            if default_nick == 'disabled':
-                pw = pwd.getpwuid(os.getuid())
-                if pw.pw_gecos:
-                    self._name_page.set_name(pw.pw_gecos)
-                else:
-                    self._name_page.set_name(pw.pw_name)
-            else:
-                self._name_page.set_name(default_nick)
-
         self._setup_page()
 
     def _setup_page(self):
--
cgit v0.9.1