Hello community, here is the log from the commit of package gnome-settings-daemon for openSUSE:Factory checked in at 2014-02-11 10:27:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes 2014-01-27 11:23:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes 2014-02-11 10:27:19.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 6 15:03:34 UTC 2014 - lpecha...@suse.cz + +- Add gnome-settings-daemon-upower-fix.patch: avoid immediate + hibernation/poweroff caused by GSD power plugin not being able to + determine battery charge (bnc#861365). + +------------------------------------------------------------------- New: ---- gnome-settings-daemon-upower-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.ZF3aqp/_old 2014-02-11 10:27:20.000000000 +0100 +++ /var/tmp/diff_new_pack.ZF3aqp/_new 2014-02-11 10:27:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-settings-daemon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -51,8 +51,10 @@ Patch19: gnome-settings-daemon-notify-idle-resumed.patch # PATCH-FIX-UPSTREAM gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch bgo#712302 zai...@opensuse.org -- Stop showing desktopfolder in nautilus sidebar when using gnome-shell. Patch20: gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch -# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-upower-backport.patch mgo...@suse.com -- Update for libupower-glib API changes. +# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-upower-backport.patch mgo...@suse.com -- Update for libupower-glib API changes. Patch21: gnome-settings-daemon-upower-backport.patch +# PATCH-FIX-OPENSUSE gnome-settings-daemon-upower-fix.patch bnc#861365 lpecha...@suse.cz -- Fixup gnome-settings-daemon-upower-backport.patch +Patch22: gnome-settings-daemon-upower-fix.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -148,6 +150,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build autoreconf -f -i ++++++ gnome-settings-daemon-upower-fix.patch ++++++ Index: gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c =================================================================== --- gnome-settings-daemon-3.10.2.orig/plugins/power/gsd-power-manager.c +++ gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c @@ -909,7 +909,7 @@ device_perhaps_recall (GsdPowerManager * static void engine_device_add (GsdPowerManager *manager, UpDevice *device) { - gboolean recall_notice; + gboolean recall_notice = FALSE; GsdPowerManagerWarning warning; UpDeviceState state; UpDeviceKind kind; @@ -936,6 +936,7 @@ engine_device_add (GsdPowerManager *mana if (kind == UP_DEVICE_KIND_BATTERY) { g_debug ("updating because we added a device"); + g_ptr_array_add (manager->priv->devices_array, g_object_ref (device)); engine_update_composite_device (manager); /* reset those values for the composite device */ @@ -1014,8 +1015,6 @@ engine_coldplug (GsdPowerManager *manage static void engine_device_added_cb (UpClient *client, UpDevice *device, GsdPowerManager *manager) { - /* add to list */ - g_ptr_array_add (manager->priv->devices_array, g_object_ref (device)); engine_device_add (manager, device); engine_check_recall (manager, device); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org