Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2008-10-11 18:26:54 (GMT)
committer Simon Schampijer <simon@schampijer.de>2008-10-11 18:26:54 (GMT)
commitaf9734abe670b713c2b24ac34caf10be31e1a09e (patch)
treee241a1ff7bbd3048eec10a7593d24950a1f454fa
parentfc80c73483ad509fa38e9f2eb1550d9a96ff4225 (diff)
Thanks buildbot
-rw-r--r--src/jarabe/desktop/schoolserver.py5
-rw-r--r--src/jarabe/journal/volumestoolbar.py1
2 files changed, 4 insertions, 2 deletions
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