Your message dated Fri, 31 Aug 2012 06:30:40 +0100
with message-id <1346391040.3415.4.ca...@jacala.jungle.funky-badger.org>
and subject line Re: Bug#686296: unblock: gnome-settings-daemon/3.4.2-5
has caused the Debian Bug report #686296,
regarding unblock: gnome-settings-daemon/3.4.2-5
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
686296: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686296
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package gnome-settings-daemon
It contains an important bug fix for the fallback/classic mode where the
battery status icon was not properly updated.
Full debdiff attached.
Cheers,
Michael
unblock gnome-settings-daemon/3.4.2-5
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnome-settings-daemon-3.4.2/debian/changelog gnome-settings-daemon-3.4.2/debian/changelog
--- gnome-settings-daemon-3.4.2/debian/changelog 2012-07-27 16:06:29.000000000 +0200
+++ gnome-settings-daemon-3.4.2/debian/changelog 2012-08-30 23:36:40.000000000 +0200
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.4.2-5) unstable; 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 <bi...@debian.org> Thu, 30 Aug 2012 23:36:38 +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:
diff -Nru gnome-settings-daemon-3.4.2/debian/patches/power-update-fallback-status-icon.patch gnome-settings-daemon-3.4.2/debian/patches/power-update-fallback-status-icon.patch
--- gnome-settings-daemon-3.4.2/debian/patches/power-update-fallback-status-icon.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-settings-daemon-3.4.2/debian/patches/power-update-fallback-status-icon.patch 2012-06-28 07:50:20.000000000 +0200
@@ -0,0 +1,34 @@
+commit fa834c27d783c290856d9d24fbc4a29acb8e4456
+Author: Daniel Drake <d...@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;
diff -Nru gnome-settings-daemon-3.4.2/debian/patches/series gnome-settings-daemon-3.4.2/debian/patches/series
--- gnome-settings-daemon-3.4.2/debian/patches/series 2012-07-27 13:38:20.000000000 +0200
+++ gnome-settings-daemon-3.4.2/debian/patches/series 2012-07-29 12:08:25.000000000 +0200
@@ -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
--- End Message ---
--- Begin Message ---
On Fri, 2012-08-31 at 00:33 +0200, Michael Biebl wrote:
> Please unblock package gnome-settings-daemon
>
> It contains an important bug fix for the fallback/classic mode where the
> battery status icon was not properly updated.
Unblocked; thanks.
Regards,
Adam
--- End Message ---