Backport 0.90 fixes (thanks to alsroot)

1 files changed, 35 insertions, 0 deletions

diff --git a/rpms/sugar/sugar-01-11-Add-missing-import-in-jarabe.model.network-2106.patch b/rpms/sugar/sugar-01-11-Add-missing-import-in-jarabe.model.network-2106.patch
new file mode 100644
index 0000000..adfb8bc
--- /dev/null
+++ b/rpms/sugar/sugar-01-11-Add-missing-import-in-jarabe.model.network-2106.patch
@@ -0,0 +1,35 @@
+From patchwork Sat Jan 15 14:10:40 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar,01/11] Add missing import in jarabe.model.network (#2106)
+Date: Sat, 15 Jan 2011 19:10:40 -0000
+From: Aleksey Lim <alsroot@member.fsf.org>
+X-Patchwork-Id: 562
+Message-Id: <1295100650-21516-2-git-send-email-alsroot@member.fsf.org>
+To: dextrose@lists.sugarlabs.org
+
+From: fran <fran@unknown>
+
+This was breaking sugar-control-panel invocations making it impossible
+to deregister from the school server.
+
+http://bugs.sugarlabs.org/ticket/2106
+http://dev.laptop.org/ticket/10261
+
+---
+src/jarabe/model/network.py |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
+index 5632624..d0c17e4 100644
+--- a/src/jarabe/model/network.py
++++ b/src/jarabe/model/network.py
+@@ -24,6 +24,7 @@ import os
+ import time
+ 
+ import dbus
++import dbus.service
+ import gobject
+ import ConfigParser
+ import gconf