diff options
| author | Dipankar Patro <dipankar@seeta.in> | 2010-10-15 14:37:55 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-10-15 16:35:56 (GMT) |
| commit | c2bb0475096a0f2ce27270c6d02a18c81118ce18 (patch) | |
| tree | 69be293139e5e23781b4f59e6f938eac7ddd9209 | |
| parent | 1685eb06cbf68c9cbeacd30cebd7221dd6c511ed (diff) | |
Removed hardcoded server url (SL #1976)
Previously registration url was set hardcoded for XO device.
Modififed the code for same behavior on all devices. Register
url is taken from gconf prop. If the gconf is empty or unset,
registration url falls back to 'schoolserver'.
| -rw-r--r-- | src/jarabe/desktop/schoolserver.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py index a05f56c..ab9b68a 100644 --- a/src/jarabe/desktop/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py @@ -89,9 +89,12 @@ def register_laptop(url=REGISTER_URL): else: sn = generate_serial_number() uuid_ = str(uuid.uuid1()) - setting_name = '/desktop/sugar/collaboration/jabber_server' - jabber_server = client.get_string(setting_name) - store_identifiers(sn, uuid_, jabber_server) + + setting_name = '/desktop/sugar/collaboration/jabber_server' + jabber_server = client.get_string(setting_name) + store_identifiers(sn, uuid_, jabber_server) + + if jabber_server: url = 'http://' + jabber_server + ':8080/' nick = client.get_string('/desktop/sugar/user/nick') |