r35653 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/power-update-fallback-status-icon.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Aug 30 21:36:36 2012
New Revision: 35653

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35653
Log:
debian/patches/power-update-fallback-status-icon.patch: Update battery
status icon in fallback mode when switching between battery and AC power.
Patch cherry-picked from upstream Git. (Closes: #678352)

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/power-update-fallback-status-icon.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=35653&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Thu Aug 30 21:36:36 2012
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.4.2-5) UNRELEASED; urgency=low
+
+  * debian/patches/power-update-fallback-status-icon.patch: Update battery
+    status icon in fallback mode when switching between battery and AC power.
+    Patch cherry-picked from upstream Git. (Closes: #678352)
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 30 Aug 2012 23:32:02 +0200
+
 gnome-settings-daemon (3.4.2-4) unstable; urgency=low
 
   * debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch:

Added: desktop/unstable/gnome-settings-daemon/debian/patches/power-update-fallback-status-icon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/power-update-fallback-status-icon.patch?rev=35653&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/power-update-fallback-status-icon.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/power-update-fallback-status-icon.patch [utf-8] Thu Aug 30 21:36:36 2012
@@ -1,0 +1,34 @@
+commit fa834c27d783c290856d9d24fbc4a29acb8e4456
+Author: Daniel Drake <dsd at laptop.org>
+Date:   Fri Jun 1 15:45:04 2012 -0600
+
+    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;

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=35653&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Thu Aug 30 21:36:36 2012
@@ -2,6 +2,7 @@
 10_smaller_syndaemon_timeout.patch
 power-check-null-devices.patch
 power-ignore-bad-dbus-requests.patch
+power-update-fallback-status-icon.patch
 revert_git_datetime_dropping.patch
 20_disable-wacom-support-on-s390-s390x.patch
 21_disable-wacom-on-non-Linux-platforms.patch