[Sugar-devel] [PATCH] Remove hard-coded School Server URL when XOs register #sl1976

Bernie Innocenti bernie at codewiz.org
Sun Jul 4 10:57:58 EDT 2010


El Sun, 04-07-2010 a las 10:33 +1200, Tim McNamara escribió:

> Ref http://bugs.sugarlabs.org/ticket/1976

> Bevaviour of the software is now independent of the hardware that
> Sugar is running. All registrations will look for Jabber server
> settings from /desktop/sugar/collaboration/jabber_server. However,
> this patch retains the REGISTER_URL as an option for systems
> administrators. This prevents currently written documentation for the
> XS / XO registration from breaking.

For upgrades, it's important to retain the old behavior in
case /desktop/sugar/collaboration/jabber_server is empty or unset. So
I'd fall back to "schoolserver" in that case.

Also, now that we don't do two different things for the XO and non-XO
case, the code paths could be unified (keeping only the sn/uuid code
inside the if).

If you post patches as plain text (rather than as attachments) it's
easier to review them with inline comments. "git send-email" automates
this workflow.


> Please note, I haven't got an XS to test this on, so am relying on
> maintainter to see if this fixes the bug.

I could test your next version of this patch in a classroom.

-- 
   // Bernie Innocenti - http://codewiz.org/
 \X/  Sugar Labs       - http://sugarlabs.org/



More information about the Sugar-devel mailing list