sugar: merge 4 more patches

5 files changed, 165 insertions, 2 deletions

diff --git a/rpms/sugar/disconnect-icon-in-wifi-palette-1736.patch b/rpms/sugar/disconnect-icon-in-wifi-palette-1736.patch
new file mode 100644
index 0000000..7423d90
--- /dev/null
+++ b/rpms/sugar/disconnect-icon-in-wifi-palette-1736.patch
@@ -0,0 +1,38 @@
+From 55f08d78c2a12a9a18e1e245fd0f0df8f76442b5 Mon Sep 17 00:00:00 2001
+From: Simon Schampijer <simon@schampijer.de>
+Date: Wed, 7 Jul 2010 12:23:23 +0200
+Subject: [PATCH] Disconnect icon in wifi palette #1736
+Organization: Sugar Labs Foundation
+X-Subversion: sucks
+
+---
+ extensions/deviceicon/network.py |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
+index 94a4293..ce21605 100644
+--- a/extensions/deviceicon/network.py
++++ b/extensions/deviceicon/network.py
+@@ -36,6 +36,8 @@ from sugar.graphics import style
+ from sugar.graphics.palette import Palette
+ from sugar.graphics.toolbutton import ToolButton
+ from sugar.graphics.tray import TrayIcon
++from sugar.graphics.menuitem import MenuItem
++from sugar.graphics.icon import Icon
+ from sugar.graphics import xocolor
+ from sugar.util import unique_id
+ from sugar import profile
+@@ -109,7 +111,9 @@ class WirelessPalette(Palette):
+         self._info.pack_start(_padded(self._ip_address_label))
+         self._info.show_all()
+ 
+-        self._disconnect_item = gtk.MenuItem(_('Disconnect...'))
++        self._disconnect_item = MenuItem(_('Disconnect...'))
++        icon = Icon(icon_size=gtk.ICON_SIZE_MENU, icon_name='media-eject')
++        self._disconnect_item.set_image(icon)
+         self._disconnect_item.connect('activate', self.__disconnect_activate_cb)
+         self.menu.append(self._disconnect_item)
+ 
+-- 
+1.7.1.1
+
diff --git a/rpms/sugar/improve-activity-updater-icon.patch b/rpms/sugar/improve-activity-updater-icon.patch
new file mode 100644
index 0000000..1ba4e23
--- /dev/null
+++ b/rpms/sugar/improve-activity-updater-icon.patch
@@ -0,0 +1,38 @@
+From 6b92d375b90427adf405c292529f23df953f6447 Mon Sep 17 00:00:00 2001
+From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
+Date: Mon, 14 Jun 2010 16:59:20 +0200
+Subject: [PATCH] Improve activity updater icon (Gary C. Martin)
+Organization: Sugar Labs Foundation
+X-Subversion: sucks
+
+---
+ data/icons/module-updater.svg |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/data/icons/module-updater.svg b/data/icons/module-updater.svg
+index 2329a4a..a521f61 100644
+--- a/data/icons/module-updater.svg
++++ b/data/icons/module-updater.svg
+@@ -1,15 +1,15 @@
+ <?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+ 	<!ENTITY stroke_color "#000">
+ 	<!ENTITY fill_color "#fff">
+-]><svg height="55px" viewBox="0 0 55 55" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" stroke="&stroke_color;" fill="&fill_color;">
++]><svg height="55px" viewBox="0 0 55 55" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g>
+   <g>
+-   <path d="M 31.752 7.088 C 41.935 9.118 49.609 18.107 49.609 28.887 C 49.609 41.173 39.65 51.129 27.374 51.129 C 15.086 51.129 5.133 41.173 5.133 28.887 C 5.133 19.648 10.768 11.723 18.801 8.365 " fill="none" stroke="&fill_color;" />
+-   <path d="M 36.134 15.154 L 31.752 7.088 L 40.439 4.13 " fill="none" stroke="&fill_color;" />
++   <path d="M 31.752 7.088 C 41.935 9.118 49.609 18.107 49.609 28.887 C 49.609 41.173 39.65 51.129 27.374 51.129 C 15.086 51.129 5.133 41.173 5.133 28.887 C 5.133 19.648 10.768 11.723 18.801 8.365 " fill="none" stroke="&fill_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" />
++   <path d="M 36.134 15.154 L 31.752 7.088 L 40.439 4.13 " fill="none" stroke="&fill_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" />
+   </g>
+   <g>
+    <g>
+-    <path d="M 38.57 25.886 C 37.597 25.886 36.718 26.282 36.082 26.918 L 31.021 31.979 L 31.02 17.022 C 31.018 16.124 30.675 15.221 29.99 14.533 C 28.613 13.159 26.383 13.159 25.01 14.533 C 24.321 15.222 23.98 16.122 23.979 17.023 L 23.977 31.978 L 18.918 26.918 C 18.281 26.281 17.4 25.886 16.429 25.887 C 14.484 25.885 12.908 27.465 12.908 29.408 C 12.907 30.381 13.304 31.263 13.936 31.899 L 27.5 45.463 L 41.062 31.898 C 41.697 31.262 42.09 30.382 42.093 29.41 C 42.094 27.463 40.516 25.885 38.57 25.886 Z " stroke="none" />
++    <path d="M 38.57 25.886 C 37.597 25.886 36.718 26.282 36.082 26.918 L 31.021 31.979 L 31.02 17.022 C 31.018 16.124 30.675 15.221 29.99 14.533 C 28.613 13.159 26.383 13.159 25.01 14.533 C 24.321 15.222 23.98 16.122 23.979 17.023 L 23.977 31.978 L 18.918 26.918 C 18.281 26.281 17.4 25.886 16.429 25.887 C 14.484 25.885 12.908 27.465 12.908 29.408 C 12.907 30.381 13.304 31.263 13.936 31.899 L 27.5 45.463 L 41.062 31.898 C 41.697 31.262 42.09 30.382 42.093 29.41 C 42.094 27.463 40.516 25.885 38.57 25.886 Z " fill="&fill_color;" stroke="none" />
+    </g>
+   </g>
+  </g>
+-- 
+1.7.1.1
+
diff --git a/rpms/sugar/indicate-inactive-state-in-mesh-device-icon.patch b/rpms/sugar/indicate-inactive-state-in-mesh-device-icon.patch
new file mode 100644
index 0000000..015df70
--- /dev/null
+++ b/rpms/sugar/indicate-inactive-state-in-mesh-device-icon.patch
@@ -0,0 +1,81 @@
+From 4851201a39c425717721e4dd05f65406b6d3e4ba Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd@laptop.org>
+Date: Wed, 7 Jul 2010 10:07:12 -0600
+Subject: [PATCH] Indicate inactive state in mesh device icon
+Organization: Sugar Labs Foundation
+X-Subversion: sucks
+
+When the mesh is not active, grey out the mesh device icon and update
+the palette text.
+
+Also remove the "Create new network" option from the mesh device
+palette.
+---
+ extensions/deviceicon/network.py |   24 ++++++++++++++++++++----
+ 1 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
+index ce21605..399ef78 100644
+--- a/extensions/deviceicon/network.py
++++ b/extensions/deviceicon/network.py
+@@ -597,16 +597,17 @@ class OlpcMeshDeviceView(ToolButton):
+         self._channel = 0
+ 
+         self._icon = PulsingIcon(icon_name=self._ICON_NAME)
+-        self._icon.props.pulse_color = xocolor.XoColor( \
++        self._inactive_color = xocolor.XoColor( \
+             "%s,%s" % (style.COLOR_BUTTON_GREY.get_svg(),
+                        style.COLOR_TRANSPARENT.get_svg()))
+-        self._icon.props.base_color = profile.get_color()
++        self._icon.props.pulse_color = profile.get_color()
++        self._icon.props.base_color = self._inactive_color
+ 
+         self.set_icon_widget(self._icon)
+         self._icon.show()
+ 
+         self.set_palette_invoker(FrameWidgetInvoker(self))
+-        self._palette = WirelessPalette(_("Mesh Network"))
++        self._palette = WirelessPalette(_("Mesh Network"), can_create=False)
+         self._palette.connect('deactivate-connection',
+                               self.__deactivate_connection)
+         self.set_palette(self._palette)
+@@ -665,7 +666,14 @@ class OlpcMeshDeviceView(ToolButton):
+             self._update_text()
+ 
+     def _update_text(self):
+-        text = _("Mesh Network") + " " + str(self._channel)
++        state = self._device_state
++        if state in (network.DEVICE_STATE_PREPARE, network.DEVICE_STATE_CONFIG,
++                     network.DEVICE_STATE_NEED_AUTH,
++                     network.DEVICE_STATE_IP_CONFIG,
++                     network.DEVICE_STATE_ACTIVATED):
++            text = _("Mesh Network") + " " + str(self._channel)
++        else:
++            text = _("Mesh Network")
+         self._palette.props.primary_text = text
+ 
+     def _update(self):
+@@ -675,12 +683,20 @@ class OlpcMeshDeviceView(ToolButton):
+                      network.DEVICE_STATE_CONFIG,
+                      network.DEVICE_STATE_NEED_AUTH,
+                      network.DEVICE_STATE_IP_CONFIG]:
++            self._icon.props.base_color = self._inactive_color
++            self._icon.props.pulse_color = profile.get_color()
+             self._palette.set_connecting()
+             self._icon.props.pulsing = True
+         elif state == network.DEVICE_STATE_ACTIVATED:
+             address = self._device_props.Get(_NM_DEVICE_IFACE, 'Ip4Address')
+             self._palette.set_connected_with_channel(self._channel, address)
++            self._icon.props.base_color = profile.get_color()
+             self._icon.props.pulsing = False
++        else:
++            self._icon.props.base_color = self._inactive_color
++            self._icon.props.pulsing = False
++            self._palette.set_disconnected()
++        self._update_text()
+ 
+     def __deactivate_connection(self, palette, data=None):
+         obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
+-- 
+1.7.1.1
+
diff --git a/rpms/sugar/sl2062.patch b/rpms/sugar/sl2062-catch-network-errors-when-trying-to-register-to-the-xs.patch
index bda59e7..bda59e7 100644
--- a/rpms/sugar/sl2062.patch
+++ b/rpms/sugar/sl2062-catch-network-errors-when-trying-to-register-to-the-xs.patch
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index f94f50d..43edb32 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.21dxr%{?dist}
+Release: 5.22dxr%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -23,10 +23,13 @@ Patch8: use-the-spanish-verb-quitar-for-unmounting-devices.patch
 Patch10: sl1842-journal-show-error-on-write-failure.patch
 Patch11: add-font-dpi-schema.patch
 Patch12: reverse-sort-order-of-activities-list.patch
-Patch13: sl2062.patch
+Patch13: sl2062-catch-network-errors-when-trying-to-register-to-the-xs.patch
 Patch14: gsm-errors-palette.patch
 Patch15: restore-sugar-launch-by-bundle-id-substring-fixes-89.patch
 Patch16: journal-xobundle-removal-wont-remove-installed-one.patch
+Patch18: disconnect-icon-in-wifi-palette-1736.patch
+Patch19: improve-activity-updater-icon.patch
+Patch20: indicate-inactive-state-in-mesh-device-icon.patch
 
 # Andres' journal filesize enhancement
 Patch101: sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch
@@ -138,6 +141,9 @@ multiple instances of sugar.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %patch101 -p1
 %patch102 -p1