Bump sugar version and include some fixes

* Yum updater notifications integration patch update
* Two accessibility patches from uy
* Do not fail in NMless environment
* Check for empty cursor theme
* Bump release number to 56

6 files changed, 185 insertions, 19 deletions

diff --git a/rpms/sugar/0003-Yum-updater-notifications-integration.patch b/rpms/sugar/0003-Yum-updater-notifications-integration.patch
index 61d7b80..8e2418d 100644
--- a/rpms/sugar/0003-Yum-updater-notifications-integration.patch
+++ b/rpms/sugar/0003-Yum-updater-notifications-integration.patch
@@ -1,17 +1,31 @@
-From 73ea63c05b786dffa97639091f0187cb663a0809 Mon Sep 17 00:00:00 2001
+From patchwork Wed Feb 16 21:16:59 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [Sugar] Yum-updater notifications integration
+Date: Thu, 17 Feb 2011 02:16:59 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 675
+Message-Id: <1297891019-18618-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org,
+	anish@sugarlabs.org
+Cc: Aleksey Lim <alsroot@member.fsf.org>
+
 From: Aleksey Lim <alsroot@member.fsf.org>
-Date: Mon, 20 Dec 2010 16:36:05 -0300
-Subject: [PATCH] Yum-updater notifications integration
 
 Original-code: http://wiki.sugarlabs.org/go/Dextrose/Updater
 dextrose-port-by: Martin Abente <martin.abente.lahaye@gmail.com>
 
+VERSION 2 Including silbe's robustness suggestions.
+
+PLEASE REPLACE OLD PATCH WITH THIS ONE
+
 ---
- src/jarabe/desktop/homewindow.py |   32 ++++++++++++++++++++++++++++++++
- 1 files changed, 32 insertions(+), 0 deletions(-)
+src/jarabe/desktop/homewindow.py |   36 ++++++++++++++++++++++++++++++++++++
+ 1 files changed, 36 insertions(+), 0 deletions(-)
 
 diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
-index d830ed0..bd5daf7 100644
+index d830ed0..34184a2 100644
 --- a/src/jarabe/desktop/homewindow.py
 +++ b/src/jarabe/desktop/homewindow.py
 @@ -17,6 +17,8 @@
@@ -43,15 +57,20 @@ index d830ed0..bd5daf7 100644
  class HomeWindow(gtk.Window):
      def __init__(self):
          logging.debug('STARTUP: Loading the desktop window')
-@@ -72,6 +81,29 @@ class HomeWindow(gtk.Window):
+@@ -71,6 +80,33 @@ class HomeWindow(gtk.Window):
+ 
          shell.get_model().zoom_level_changed.connect(
                                       self.__zoom_level_changed_cb)
- 
-+        systembus = dbus.SystemBus()
-+        systembus.add_signal_receiver(self.__reboot_cb, 'Reboot',
-+                                      _DBUS_SYSTEM_IFACE)
-+        systembus.add_signal_receiver(self.__relogin_cb, 'Relogin',
-+                                      _DBUS_SYSTEM_IFACE)
++        
++        try:
++            systembus = dbus.SystemBus()
++        except dbus.DBusException:
++            logging.error('DBus SystemBus is not available')
++        else:
++            systembus.add_signal_receiver(self.__reboot_cb, 'Reboot',
++                                          _DBUS_SYSTEM_IFACE)
++            systembus.add_signal_receiver(self.__relogin_cb, 'Relogin',
++                                          _DBUS_SYSTEM_IFACE)
 +
 +    def _system_alert(self, replaces_id, app_icon, message):
 +        service = notifications.get_service()
@@ -69,10 +88,6 @@ index d830ed0..bd5daf7 100644
 +        self._system_alert(_SYSTEM_RELOGIN_ID, 'system-logout',
 +                _('Please, restart Sugar to take into account ' \
 +                        'new updates'))
-+
+ 
      def _deactivate_view(self, level):
          group = palettegroup.get_group("default")
-         group.popdown()
--- 
-1.7.1
-
diff --git a/rpms/sugar/accessibility_0012_add-accel-mouse-default.patch b/rpms/sugar/accessibility_0012_add-accel-mouse-default.patch
new file mode 100644
index 0000000..85372dd
--- /dev/null
+++ b/rpms/sugar/accessibility_0012_add-accel-mouse-default.patch
@@ -0,0 +1,24 @@
+diff -u -r -N sugar-0.88.1-original/src/jarabe/model/accessibility.py sugar-0.88.1/src/jarabe/model/accessibility.py
+--- sugar-0.88.1-original/src/jarabe/model/accessibility.py    2010-09-07 09:05:03.356621000 -0300
++++ sugar-0.88.1/src/jarabe/model/accessibility.py    2010-09-07 09:11:39.978625385 -0300
+@@ -150,6 +150,7 @@
+ 
+     WHITE_CURSOR_THEME="FlatbedCursors.White.Huge"
+     DEFAULT_CURSOR_THEME="sugar"
++    DEFAULT_ACCEL_MOUSE=3
+ 
+     def get_white_mouse(self):
+         client = gconf.client_get_default()
+@@ -192,8 +193,11 @@
+     def setup_accessibility(self):
+         client = gconf.client_get_default()
+         is_accessibility = client.dir_exists("/desktop/sugar/accessibility")
++        mouse = Mouse()
+         if is_accessibility:
+             keyboard = Keyboard()
+             keyboard.run_config_keyboard()
+-            mouse = Mouse()
+             mouse.run_config_mouse()
++        else:
++            mouse.set_accel_mouse(mouse.DEFAULT_ACCEL_MOUSE)
++            mouse._set_accel_mouse_setting()
diff --git a/rpms/sugar/accessibility_0013_add-theme-mouse-default.patch b/rpms/sugar/accessibility_0013_add-theme-mouse-default.patch
new file mode 100644
index 0000000..4fb43e1
--- /dev/null
+++ b/rpms/sugar/accessibility_0013_add-theme-mouse-default.patch
@@ -0,0 +1,9 @@
+diff -u -r -N sugar-0.88.1.orig/src/jarabe/model/accessibility.py sugar-0.88.1/src/jarabe/model/accessibility.py
+--- sugar-0.88.1.orig/src/jarabe/model/accessibility.py    2010-09-09 17:10:44.658376397 -0300
++++ sugar-0.88.1/src/jarabe/model/accessibility.py    2010-09-09 17:13:03.646501286 -0300
+@@ -200,4 +200,5 @@
+             mouse.run_config_mouse()
+         else:
+             mouse.set_accel_mouse(mouse.DEFAULT_ACCEL_MOUSE)
++            mouse.set_white_mouse(False)
+             mouse._set_accel_mouse_setting()
diff --git a/rpms/sugar/sugar-Do-not-fail-in-NM-less-environment.patch b/rpms/sugar/sugar-Do-not-fail-in-NM-less-environment.patch
new file mode 100644
index 0000000..b29c1b0
--- /dev/null
+++ b/rpms/sugar/sugar-Do-not-fail-in-NM-less-environment.patch
@@ -0,0 +1,52 @@
+From patchwork Thu Feb 17 12:35:30 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] Do not fail in NM-less environment
+Date: Thu, 17 Feb 2011 17:35:30 -0000
+From: Aleksey Lim <alsroot@activitycentral.org>
+X-Patchwork-Id: 677
+Message-Id: <1297946130-32247-1-git-send-email-alsroot@activitycentral.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ src/jarabe/model/network.py |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+
+diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
+index dd9a061..efc3c90 100644
+--- a/src/jarabe/model/network.py
++++ b/src/jarabe/model/network.py
+@@ -784,6 +784,9 @@ def get_settings():
+     return _nm_settings
+ 
+ def find_connection_by_ssid(ssid):
++    if get_settings() is None:
++        return None
++
+     connections = get_settings().connections
+ 
+     for conn_index in connections:
+@@ -918,6 +921,9 @@ def load_connections():
+     load_gsm_connection()
+ 
+ def find_gsm_connection():
++    if get_settings() is None:
++        return None
++
+     connections = get_settings().connections
+ 
+     for connection in connections.values():
+@@ -928,7 +934,10 @@ def find_gsm_connection():
+     return None
+ 
+ def count_wifi_connections():
+-    return len(get_settings().connections)
++    if get_settings() is None:
++        return 0
++    else:
++        return len(get_settings().connections)
+ 
+ def clear_wifi_connections():
+     if _nm_settings is not None:
diff --git a/rpms/sugar/sugar-check-for-empty-cursor_theme.patch b/rpms/sugar/sugar-check-for-empty-cursor_theme.patch
new file mode 100644
index 0000000..a1180db
--- /dev/null
+++ b/rpms/sugar/sugar-check-for-empty-cursor_theme.patch
@@ -0,0 +1,52 @@
+From patchwork Wed Mar  9 16:15:10 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] check for empty cursor_theme
+Date: Wed, 09 Mar 2011 21:15:10 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 714
+Message-Id: <1299687310-2855-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org,
+	anish@sugarlabs.org
+
+In dextrose2 caacupe tests we noticed that many laptops
+had the standard x cursor theme instead of the sugar one.
+Apparently this bug was also present on dextrose1 builds.
+
+An interesting finding while looking at this report was
+that the accesibility code for changing cursor it simply
+does not affect the cursor at all, and the real change is
+being done at bin/sugar.
+
+I have not been able to determine when or how this
+empty value is being set (yet), but this patch will
+make sure it shows the sugar cursor theme whenever 
+it happens.
+
+Could this patch make sense for mainstream sugar also?
+
+---
+bin/sugar.in |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/bin/sugar.in b/bin/sugar.in
+index bd6e95e..73af03c 100644
+--- a/bin/sugar.in
++++ b/bin/sugar.in
+@@ -80,10 +80,12 @@ fi
+ # Set cursor theme
+ gconftool-2 --dir-exists=/desktop/sugar/peripherals/mouse
+ EXIST_SUGAR_CURSOR_THEME=$(echo $?)
++CURSOR_THEME="sugar"
+ if [[ $EXIST_SUGAR_CURSOR_THEME == 0 ]]; then
+-    CURSOR_THEME=$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme);
+-else
+-    CURSOR_THEME="sugar"
++    STORED_CURSOR_THEME=$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme);
++    if [[ $STORED_CURSOR_THEME != "" ]]; then
++        CURSOR_THEME=$STORED_CURSOR_THEME
++    fi
+ fi
+ 
+ 
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index fb86cd9..89febcf 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.54dxo%{?dist}
+Release: 5.56dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -83,6 +83,8 @@ patch704: accessibility_0004_cp_accessibility_mouse.patch
 patch705: accessibility_0005_cp_accessibility_capital_letters.patch
 patch706: accessibility_0006_virtualkeyboard.patch
 patch707: accessibility_0008_cp_show-virtualkeyboard-for-accessibility.patch
+patch708: accessibility_0012_add-accel-mouse-default.patch
+patch709: accessibility_0013_add-theme-mouse-default.patch
 
 # Translations
 patch801: accessibility_0007_cp_translations.patch
@@ -181,6 +183,9 @@ patch3101: Always-enable-wireless-workaround.patch
 #lease.sig path fix for both xo-1 and xo-1.5
 patch3201: Lease-info-fix-all-xo-models-path-version.patch
 
+#Don't fail in NMless environment
+patch3301: sugar-Do-not-fail-in-NM-less-environment.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -317,6 +322,8 @@ multiple instances of sugar.
 %patch705 -p1
 %patch706 -p1
 %patch707 -p1
+%patch708 -p1
+%patch709 -p1
 
 %patch801 -p1
 %patch802 -p1
@@ -390,6 +397,8 @@ multiple instances of sugar.
 
 %patch3201 -p1
 
+%patch3301 -p1
+
 %build
 autoreconf
 %configure
@@ -466,6 +475,11 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Mon Mar 13 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.56
+- Don't fail in NMless environment
+- Add two accessiblilty patches
+- Update Yum updater notifications integration patch
+
 * Mon Feb 14 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.54
 - Lease info fix for XO1 and XO1.5
 - Temporary fix for sl#2602