sl#1940: enable patch and fix it so it actually applies

2 files changed, 6 insertions, 5 deletions

diff --git a/rpms/sugar/register-session-failed-fix.patch b/rpms/sugar/sl1940-register-session-failed-fix.patch
index c470e66..e5060b2 100644
--- a/rpms/sugar/register-session-failed-fix.patch
+++ b/rpms/sugar/sl1940-register-session-failed-fix.patch
@@ -17,7 +17,7 @@ index 47db43f..218752c 100644
  
  from sugar import dispatch
  from sugar import env
-@@ -369,6 +370,16 @@ class NMSettingsConnection(dbus.service.Object):
+@@ -501,6 +502,16 @@ class NMSettingsConnection(dbus.service.Object):
                  if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
                      self.save()
  
@@ -31,8 +31,8 @@ index 47db43f..218752c 100644
 +        except:
 +            logging.error('Error calling libc.__res_init')
 +
-    def set_secrets(self, secrets):
-        self._secrets = secrets
-        if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
+     def set_secrets(self, secrets):
+         self._secrets = secrets
+         if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
 -- 
 
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 4b6b171..aa4416f 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.88.1
-Release: 5.28dxo%{?dist}
+Release: 5.29dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -170,6 +170,7 @@ multiple instances of sugar.
 %patch20 -p1
 %patch21 -p1
 #%patch22 -p1
+%patch23 -p1
 
 %patch101 -p1
 %patch102 -p1