[gnome-settings-daemon/f17] Add patch to fix charging status icon fall back

[Peter Robinson]

commit fd91600c69211ac54a25b303028be65695a15c6a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Jun 7 22:43:45 2012 +0100

    Add patch to fix charging status icon fall back

 gnome-settings-daemon.spec |    7 ++++++-
 gsd-fallback-icon.patch    |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 32a43c9..dbcee3b 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        3.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@ Patch1: gsd-wacom.patch
 # Fixing this properly involves some new functionality in systemd,
 # which won't be showing up until F18.
 Patch2: gsd-auto-update-type-is-none.patch
+Patch3: gsd-fallback-icon.patch
 
 Requires: control-center-filesystem
 
@@ -74,6 +75,7 @@ developing applications that use %{name}.
 %patch0 -p1 -b .calc
 %patch1 -p1 -b .wacom
 %patch2 -p1 -b .update-none
+%patch3 -p1 -b .fallback-icon
 
 autoreconf -i -f
 
@@ -223,6 +225,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Thu Jun  7 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 3.4.2-2
+- Add patch to fix charging status icon fall back
+
 * Tue May 15 2012 Richard Hughes <hughsient at gmail.com> - 3.4.2-1
 - Update to 3.4.2
 
diff --git a/gsd-fallback-icon.patch b/gsd-fallback-icon.patch
new file mode 100644
index 0000000..2c15fee
--- /dev/null
+++ b/gsd-fallback-icon.patch
@@ -0,0 +1,35 @@
+From fa834c27d783c290856d9d24fbc4a29acb8e4456 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd at laptop.org>
+Date: Fri, 01 Jun 2012 21:45:04 +0000
+Subject: power: update fallback status icon on icon state change
+
+When the icon was being changed from one icon to another, the fallback
+icon was not being updated.
+
+This meant that unplugging or re-plugging AC power on OLPC laptops
+was not updating the icon (even though the tooltip updated just fine).
+
+Add a missing call to update the GtkStatusIcon when the internal GIcon
+changes.
+
+Fixes http://dev.laptop.org/ticket/11878
+
+https://bugzilla.gnome.org/show_bug.cgi?id=677313
+---
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 1d60723..abec33f 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -711,6 +711,10 @@ engine_recalculate_state_icon (GsdPowerManager *manager)
+ 
+         /* icon before, now different */
+         if (!g_icon_equal (manager->priv->previous_icon, icon)) {
++
++                /* set fallback icon */
++                gtk_status_icon_set_from_gicon (manager->priv->status_icon, icon);
++
+                 g_object_unref (manager->priv->previous_icon);
+                 manager->priv->previous_icon = icon;
+                 return TRUE;
+--
+cgit v0.9.0.2