From af9734abe670b713c2b24ac34caf10be31e1a09e Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 11 Oct 2008 18:26:54 +0000
Subject: Thanks buildbot

---
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
index db58778..6d78399 100644
--- a/src/jarabe/desktop/schoolserver.py
+++ b/src/jarabe/desktop/schoolserver.py
@@ -3,8 +3,9 @@ from gettext import gettext as _
 from xmlrpclib import ServerProxy, Error
 import socket
 import os
+import gconf
 
-from sugar import profile
+from sugar import get_profile
 
 REGISTER_URL = 'http://schoolserver:8080/'
 
@@ -21,6 +22,8 @@ def register_laptop(url=REGISTER_URL):
     sn = sn or 'SHF00000000'
     uuid = uuid or '00000000-0000-0000-0000-000000000000'
 
+    profile = get_profile()
+
     client = gconf.client_get_default()
     nick = client.get_string('/desktop/sugar/user/nick')
 
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index 4e5f5db..736a130 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -23,7 +23,6 @@ import gtk
 from sugar.datastore import datastore
 from sugar.graphics.radiotoolbutton import RadioToolButton
 from sugar.graphics.palette import Palette
-from sugar.graphics.xocolor import XoColor
 
 from jarabe.journal import volumesmanager
 
--
cgit v0.9.1