Merge lp:~darkxst/ubuntu/utopic/gnome-settings-daemon/lp1372346 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Tim Lunn]

Merge g-s-d 3.12 from debian

[Martin Pitt (pitti)]

This mostly looks good to me. There is one removed key though:

--- /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml…………………2014-07-10 11:22:10.000000000 +0200
+++ ./usr/share/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml………………2014-09-30 14:40:06.000000000 +0200
@@ -107,10 +107,6 @@
       <summary>NumLock state</summary>
       <description>The remembered state of the NumLock LED.</description>
     </key>
- <key name="input-sources-switcher" enum="org.gnome.settings-daemon.GsdInputSourcesSwitcher">
- <default>'off'</default>
- <summary>Modifiers-only input sources switcher shortcut</summary>
- </key>

together with the removed GsdInputSourcesSwitcher enum in org.gnome.settings-daemon.enums.xml. Is that a concern for backwards compatibility?

review: Needs Information

[Sebastien Bacher (seb128)]

Thanks Martin, cinnamon uses that key but it looks like they have renamed the schemas for their own use. I'm unsure if other code is relying on it but it would be safer to revert the change imho

[Martin Pitt (pitti)]

Ack, GsdInputSourcesSwitcher does not exist in unity-settings-daemon.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-14 00:01:03 +0000
+++ debian/changelog	2014-09-29 12:18:03 +0000
@@ -1,3 +1,104 @@
+gnome-settings-daemon (3.12.2-1ubuntu1) utopic; urgency=medium
+
+  * New Upstream Release (LP:# 1372346)
+  * Merge with Debian, remaining changes:
+    + Split out schemas into gnome-settings-daemon-schemas so 
+      unity-settings-daemon can use them 
+    + debian/patches:
+       - 05_disable_corner_tapping.patch:
+          Disable corner tapping when disabling tap to click
+       - 43_disable_locale_settings.patch:
+          Don't set locales after sourcing .profile
+       - 45_suppress-printer-may-not-be-connected-notification.patch
+       - 53_sync_input_sources_to_accountsservice.patch
+       - 64_restore_terminal_keyboard_shortcut_schema.patch
+       - correct_logout_action.patch
+          display the logout action on ctrl-alt-del (lp: #961501)
+       - migrate_metacity_keys.patch
+          Migrate screenshot/terminal keys from metacity gconf as well
+          (LP: #1058004)
+       - nexus-orientation.patch
+          Fix screen rotation on nexus7
+       - ubuntu-lid-close-suspend.patch
+          Reimplement support for setting lid close suspend actions
+       - ubuntu-force-lock-group.patch
+          Lock the XKB group when ISO_Next_Group is pressed (lp: #1318673)
+       - revert_background_dropping.patch
+          Keep gsettings keys background u-s-d needs them
+       - revert-gsettings-removals.patch
+          Revert gsettings keys that were dropped since 3.8, for u-s-d
+    + debian/gnome-settings-daemon.install: Install apport hook
+    + debian/rules: install upstart scripts
+  * Revert power plugin to 3.10 until we have new Upower
+
+ -- Tim Lunn <[e-mail]>  Sat, 13 Sep 2014 11:15:22 +1000
+
+gnome-settings-daemon (3.12.2-1) unstable; urgency=medium
+
+  [ Laurent Bigonville ]
+  * debian/rules: Install rfkill udev rules in /lib/udev/rules.d instead of
+    /usr/lib/udev/rules.d
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 15 Jul 2014 00:02:20 +0200
+
+gnome-settings-daemon (3.12.1-3) experimental; urgency=medium
+
+  * debian/gnome-settings-daemon.install,
+    debian/rules:
+    + Only install rfkill udev rules on linux.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 03 May 2014 11:35:17 +0200
+
+gnome-settings-daemon (3.12.1-2) experimental; urgency=medium
+
+  * Brown paper bag release.
+  * debian/rules:
+    + It's DEB_CONFIGURE_EXTRA_FLAGS, not _EXTRA_ARGS.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Fri, 02 May 2014 20:19:30 +0200
+
+gnome-settings-daemon (3.12.1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * debian/rules:
+    + Disable rfkill support on !linux.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Fri, 02 May 2014 17:58:13 +0200
+
+gnome-settings-daemon (3.12.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 24 Mar 2014 20:12:45 +0100
+
+gnome-settings-daemon (3.11.91-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac:
+    - bump upower to 0.99.0, gnome-desktop 3.11.1, geoclue 2.1.2
+    - add xkb-data (xkeyboard-config)
+  * Ship uaccess tagging udev rule
+  * Ship input-devices-example.sh
+  * Bump Standards-Version to 3.9.5
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 04 Mar 2014 21:10:41 +0100
+
+gnome-settings-daemon (3.10.1-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Sync b-d with Ubuntu's gnome3 teams packaging
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/04_superP.patch:
+    + Add upstream bug info.
+
+ -- Sjoerd Simons <[e-mail]>  Fri, 01 Nov 2013 23:07:44 +0100
+
 gnome-settings-daemon (3.8.6.1-0ubuntu15) utopic; urgency=low
 
   * debian/patches/git_lp1339244.patch:
@@ -137,6 +238,27 @@
 
  -- Sebastien Bacher <[e-mail]>  Wed, 06 Nov 2013 11:23:01 +0100
 
+gnome-settings-daemon (3.8.5-2) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * debian/gnome-settings-daemon.examples: Install input-device-example.sh as
+    an example (Closes: #709526)
+
+  [ Emilio Pozuelo Monfort ]
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 13 Oct 2013 17:37:46 +0200
+
+gnome-settings-daemon (3.8.5-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/rules: Call dh-autoreconf with --as-needed to minimize the runtime
+    dependencies
+  * debian/gnome-settings-daemon.install: Install dbus service files, IBus
+    support is shipping org.freedesktop.IBus.service
+
+ -- Laurent Bigonville <[e-mail]>  Mon, 09 Sep 2013 20:14:29 +0200
+
 gnome-settings-daemon (3.8.5-0ubuntu12) trusty; urgency=low
 
   * debian/patches/fix_media_keys_on_unity.patch: Another reworking. Try to
@@ -309,6 +431,126 @@
 
  -- Jeremy Bicha <[e-mail]>  Mon, 09 Sep 2013 10:21:09 -0400
 
+gnome-settings-daemon (3.8.4-2) experimental; urgency=low
+
+  * debian/control.in, debian/rules: Re-enable ibus support (Closes: #720489)
+  * debian/control.in: Bump Standards-Version to 3.9.4 (no further changes)
+  * debian/rules: Drop removed --enable-pulse configure flag
+
+ -- Laurent Bigonville <[e-mail]>  Sat, 24 Aug 2013 14:25:09 +0200
+
+gnome-settings-daemon (3.8.4-1) experimental; urgency=low
+
+  [ Thomas Bechtold ]
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4.
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 16 Aug 2013 20:06:53 +0200
+
+gnome-settings-daemon (3.8.3-1) experimental; urgency=low
+
+  [ Deng Xiyue ]
+  * Disable "-Wl,-z,defs" on mipsel in order to fix segfault.
+    (Closes: #629351)
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 08 Jun 2013 18:48:22 +0200
+
+gnome-settings-daemon (3.8.2-2) experimental; urgency=low
+
+  * debian/gnome-settings-daemon.maintscript:
+    + Properly set the version so that users who upgraded to a package
+      that had already stopped shipping the conffile also get it removed.
+      Really closes: #704184.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 26 May 2013 19:49:26 +0200
+
+gnome-settings-daemon (3.8.2-1) experimental; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-settings-daemon.maintscript:
+    + Remove obsolete conffile. Closes: #704184.
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Drop patches merged upstream:
+    - 08-Fix-build-on-non-Linux-platforms.patch
+    - 12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
+    - 13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch
+  * Drop 11-cursor-add-error-quark.patch, not needed.
+
+ -- Andreas Henriksson <[e-mail]>  Sat, 25 May 2013 17:18:18 +0200
+
+gnome-settings-daemon (3.8.0-2) experimental; urgency=low
+
+  * debian/control.in:
+    + Bump libgnome-desktop-3-dev build dependency to get a .symbols
+      file with Build-Depends-Package, to ensure a proper runtime
+      dependency.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Thu, 28 Mar 2013 12:59:02 +0100
+
+gnome-settings-daemon (3.8.0-1) experimental; urgency=low
+
+  * debian/patches/08-Fix-build-on-non-Linux-platforms.patch:
+    + Fix the build on kfreebsd and hurd by including stdlib.h
+      before using NULL.
+  * New upstream release.
+    + debian/control.in:
+      - Bump libgnome-desktop3-dev requirement for the cursor fix.
+    + debian/patches/05_disable_cursor_manager.patch:
+      - Dropped, fixed upstream in a different way.
+    + d/p/11-cursor-add-error-quark.patch
+      d/p/12-cursor-set-an-error-if-we-can-t-create-a-monitor.patch
+      d/p/13-cursor-set-error-if-we-don-t-have-the-necessary-X-su.patch:
+      - New patches. The upstream fix to disable the cursor with
+        Xorg < 1.14 was incomplete. With these patches we gracefully
+        fail with Xorg < 1.14 and the cursor plugin will be enabled with
+        Xorg >= 1.14.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Wed, 27 Mar 2013 16:48:21 +0100
+
+gnome-settings-daemon (3.7.92-1) experimental; urgency=low
+
+  [ Andreas Henriksson ]
+  * New upstream release
+  * Bump the following build-dependencies according to configure.ac
+    - libglib2.0-dev, libgtk-3-dev, gsettings-desktop-schemas-dev,
+      libgnome-desktop-3-dev, libpulse-dev, libwacom-dev
+  * Add build-dependency on librsvg2-dev (>= 2.36.2)
+  * Add a runtime dependency on systemd (except on hurd and kfreebsd)
+    as needed by the power plugin.
+  * Drop debian/patches/power-check-null-devices.patch, fixed upstream.
+  * Drop debian/patches/power-ignore-bad-dbus-requests.patch, fixed upstream.
+  * Remaining patches refreshed to apply cleanly.
+
+  [ Sjoerd Simons ]
+  * debian/patches/revert_git_datetime_dropping.patch:
+    - Dropped. Control center uses datetime directly now
+  * debian/control.in: Break gnome-control-center (<< 3.7) as the DateTime
+    mechanism is now dropped.
+  * debian/control.in: Remove gstreamer build-depends, no longer needed
+  * New upstream release (3.7.92)
+  * debian/patches/05_disable_cursor_manager.patch
+    + Added. Disable the cursor manager, causes crashes with Xorg 1.12. Remove
+    once Xorg 1.14 is available or when bgo#696118 is fixed upstream
+
+ -- Sjoerd Simons <[e-mail]>  Sat, 23 Mar 2013 16:34:51 +0100
+
+gnome-settings-daemon (3.6.4-1) experimental; urgency=low
+
+  [ Frederic Peters ]
+  * debian/control.in: bump {build-,}dependency on gsettings-desktop-schemas.
+
+  [ Aron Xu ]
+  * debian/control.in debian/rules: disable ibus integration (Closes: #694301).
+
+  [ Sjoerd Simons ]
+  * New upstream release
+
+ -- Sjoerd Simons <[e-mail]>  Fri, 15 Feb 2013 22:12:34 +0100
 gnome-settings-daemon (3.6.4-0ubuntu19) saucy; urgency=low
 
   * Install the ibus dbus service (LP: #1194138)
@@ -572,6 +814,109 @@
 
  -- Sebastien Bacher <[e-mail]>  Wed, 21 Nov 2012 17:16:23 +0100
 
+gnome-settings-daemon (3.6.1-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/10_smaller_syndaemon_timeout.patch:
+    + Dropped, fixed upstream
+  * debian/patches/22_backlight_optional.patch:
+    + Dropped, fixed upstream
+  * debian/control: Update build-depends
+  * debian/patches/*: refreshed
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 14 Oct 2012 21:16:55 +0200
+
+gnome-settings-daemon (3.4.2+git20120925.a4c817-1) unstable; urgency=low
+
+  * debian/g-s-d.gsettings-override: disable remember-numlock-state, 
+    because of the infamous https://bugzilla.gnome.org/679151
+  * New upstream git snapshot from the stable branch (which will not be 
+    released despite the amount of useful bug fixes).
+  * 10_smaller_syndaemon_timeout.patch: refreshed.
+  * Drop merged patches: power-update-fallback-status-icon.patch,
+    20_disable-wacom-support-on-s390-s390x.patch, 
+    21_disable-wacom-on-non-Linux-platforms.patch,
+    24-common-Try-XI-2.2-if-XI-2.0-fails.patch.
+  * Bump libwacom dependency.
+
+ -- Josselin Mouette <[e-mail]>  Sat, 29 Sep 2012 12:17:15 +0200
+
+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 <[e-mail]>  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:
+    * Added: Fix keybindings for newer libxi2 (Closes: #678250) (From
+      upstream git)
+
+ -- Sjoerd Simons <[e-mail]>  Fri, 27 Jul 2012 16:06:28 +0200
+
+gnome-settings-daemon (3.4.2-3) unstable; urgency=low
+
+  [ Jeremy Bicha ]
+  * debian/control.in: Stop depending on libgnome2-common
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+  * Drop obsolete --enable-gconf-bridge configure switch and Build-Depends on
+    libgconf2-dev.
+  * Remove obsolete Breaks.
+  * Add Breaks against gnome-shell (<< 3.4) for the incompatible changes in
+    the Power D-Bus API. Closes: #675130
+
+ -- Michael Biebl <[e-mail]>  Wed, 30 May 2012 12:43:11 +0200
+
+gnome-settings-daemon (3.4.2-2) experimental; urgency=low
+
+  * debian/patches/22_backlight_optional.patch: Don't enable backlight helper
+    if GUdev is not available.
+
+ -- Michael Biebl <[e-mail]>  Sun, 20 May 2012 06:19:23 +0200
+
+gnome-settings-daemon (3.4.2-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
+    + Removed, fixed upstream
+  * debian/patches/02-lock-screensaver-on-lid-close.patch:
+    + Removed, fixed upstream
+  * debian/patches/04_superP.patch: Refreshed
+  * Sync with Ubuntu:
+    + Update build-depend versions of various items
+    + Add build-depend on libnss3-dev for smartcard support
+    + Add build-depend on libwacom-dev, xserver-xorg-input-wacom and
+      libxtst-dev for wacom support
+    + debian/patches/10_smaller_syndaemon_timeout.patch:
+      - Added: Only disable touchpach clicks, not mouse movements (bgo: #673055)
+    + debian/patches/power-check-null-devices.patch:
+      - Added: Fix crash when up_client_get_devices returns NULL (bgo: #674827)
+    + debian/patches/power-ignore-bad-dbus-requests.patch:
+      - Added: If we get a DBus request while the manager isn't active, ignore
+        it (bgo: #674829)
+    + debian/patches/revert_git_datetime_dropping.patch
+      - Added: Don't switch to systemd for datetime functionality just yet
+
+  [ Michael Biebl ]
+  * Refresh patches.
+  * Drop dependency on hwdata. This is no longer necessary and handled via
+    libgnome-desktop now.
+  * Cherry-pick two upstream patches which disable wacom support on s390,
+    s390x and non-Linux plattforms as xserver-xorg-input-wacom is not available
+    there. Mark the xserver-xorg-input-wacom and libwacom-dev Build-Depends
+    accordingly.
+  * Bump Standards-Version to 3.9.3.
+  * Remove libdbus-glib-1-dev dependency from gnome-settings-daemon-dev, no
+    longer required.
+
+ -- Michael Biebl <[e-mail]>  Sat, 19 May 2012 23:36:19 +0200
+
 gnome-settings-daemon (3.4.2-0ubuntu14) quantal; urgency=low
 
   * debian/patches/git_power_dbus_path.patch:
@@ -1014,6 +1359,43 @@
 
  -- Sebastien Bacher <[e-mail]>  Wed, 15 Feb 2012 11:41:52 +0100
 
+gnome-settings-daemon (3.2.2-3) unstable; urgency=low
+
+  * Correctly lock the screensaver on lid-close when lid-close action is set
+    to blank and lock is enabled. Patch cherry-picked from upstream Git.
+    Closes: #662747
+
+ -- Michael Biebl <[e-mail]>  Fri, 16 Mar 2012 14:46:08 +0100
+
+gnome-settings-daemon (3.2.2-2) unstable; urgency=low
+
+  [ Sjoerd Simons ]
+  * debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
+    + Added, fix handling of XF86RotateWindows (bgo#664363)
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+ -- Michael Biebl <[e-mail]>  Sat, 17 Dec 2011 00:12:47 +0100
+
+gnome-settings-daemon (3.2.2-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release (3.2.2-1)
+  * debian/control.in: Add liblcms2-dev to the build-depends for display color
+    management
+  * debian/gnome-settings-daemon.install: Also install the helper service files
+
+  [ Josselin Mouette ]
+  * Disable -z defs on ia64. This should really be avoided because it
+    can cause runtime errors, but since binutils won’t be fixed it
+    causes runtime errors anyway. Closes: #537572.
+
+  [ Sjoerd Simons ]
+  * Set -z,defs *before* setting --warn-unresolved-symbols in the linker flags
+    otherwise the build will fail with unresolved symbol *errors*
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 13 Nov 2011 16:25:33 +0100
 gnome-settings-daemon (3.2.2-0ubuntu17) precise; urgency=low
 
   * debian/patches/disable_three_touch_tap.patch
@@ -1154,6 +1536,37 @@
 
  -- Rodrigo Moya <[e-mail]>  Thu, 10 Nov 2011 12:15:05 +0100
 
+gnome-settings-daemon (3.2.1-1) experimental; urgency=low
+
+  [ Michael Biebl ]
+  * Use the new maintscript facility in dh_installdeb to remove the obsolete
+    conffiles:
+    - Bump Build-Depends on debhelper to (>= 8.1.0~).
+    - Add Pre-Depends: ${misc:Pre-Depends}.
+    - Replace preinst/postinst/postrm scripts with a
+      gnome-settings-daemon.maintscript file.
+
+  [ Josselin Mouette ]
+  * 04_superP.patch: new patch. Allow to reconfigure the Super-P 
+    shortcut which is otherwise hardcoded to VIDEO_OUT.
+
+  [ Sjoerd Simons ]
+  * New upstream release (3.2.1)
+  * debian/patches/01_medias_keys_dont_go_up_to_11.patch:
+    + Removed, merged upsteram
+  * debian/patches/02_missing_format.patch:
+    + Removed, fixed upstream
+  * debian/patches/03_deal_with_absence_of_gnome-session.patch:
+    + Removed, merged upstream
+  * debian/patches/04_superP.patch: Refreshed
+  * debian/control.in: Update build-depends
+  * debian/control.in: Add hwdata and libcolord-dev build-depends
+  * debian/control.in: make gnome-settings-daemon recommend hwdata
+  * debian/control.in: Make the gsettings-desktop-schemas depend more precise
+
+ -- Sjoerd Simons <[e-mail]>  Wed, 26 Oct 2011 14:01:21 +0200
+
+
 gnome-settings-daemon (3.2.1-0ubuntu3) oneiric-proposed; urgency=low
 
   * debian/patches/00git_remove_assertions.patch:
@@ -1551,6 +1964,53 @@
 
  -- Rodrigo Moya <[e-mail]>  Fri, 24 Jun 2011 12:33:25 +0200
 
+gnome-settings-daemon (3.0.3-3) unstable; urgency=low
+
+  * debian/patches/03_deal_with_absence_of_gnome-session.patch:
+    - Deal with absence of gnome-session gracefully and don't crash if
+      gnome-session is not running. Patch cherry-picked from upstream Git.
+      Closes: #645429
+  * Remove obsolete conffiles in /etc/gnome/config on upgrades.
+    Closes: #645443
+
+ -- Michael Biebl <[e-mail]>  Mon, 17 Oct 2011 18:07:27 +0200
+
+gnome-settings-daemon (3.0.3-2) unstable; urgency=low
+
+  * debian/control.in:
+    - Make libgudev-1.0-dev linux-any.
+
+ -- Michael Biebl <[e-mail]>  Fri, 14 Oct 2011 16:14:37 +0200
+
+gnome-settings-daemon (3.0.3-1) unstable; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release.
+  * Removed 01_numlock.patch (b-g-o #631989 is fixed)
+  * Added 01_medias_keys_dont_go_up_to_11.patch
+  * Added 02_missing_format.patch
+  * debian/control.in
+    - Standards-Version is 3.9.2, no changes needed.
+    - Added dependencied to enable the update plugin (packagekit)
+    - Bumped pulseaudio dependency according to the volume patch
+
+  [ Josselin Mouette ]
+  * Move g-s-d-dev to libdevel. Closes: #640125.
+
+  [ Jordi Mallach ]
+  * Update Vcs-* fields to new URLs.
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+  * debian/watch:
+    - Switch to version 3.
+    - Track .xz tarballs.
+  * Bump debhelper compatibility level to 8.
+    - Update Build-Depends on debhelper.
+    - Strip debian/tmp/ from .install files.
+
+ -- Michael Biebl <[e-mail]>  Fri, 14 Oct 2011 13:17:13 +0200
+
 gnome-settings-daemon (3.0.2-1ubuntu4) oneiric; urgency=low
 
   * debian/control.in: stop depending on libgnome2-common
@@ -1583,6 +2043,40 @@
 
  -- Rodrigo Moya <[e-mail]>  Tue, 24 May 2011 11:27:08 +0200
 
+gnome-settings-daemon (3.0.2-1) experimental; urgency=low
+
+  [ Guido Günther ]
+  * Bump build-dependency on libgnome-desktop-3-dev (Closes: #622689)
+
+  [ Rodrigo Moya ]
+  * Rebase from Debian, remaining Ubuntu changes:
+  * debian/control:
+    - Build-depend on libnotify4-dev, not libnotify-dev
+    - Add Buil-depend on libappindicator3-dev
+    - Add Vcs-Bzr URL
+  * debian/gnome-settings-daemon.install:
+  * debian/gnome-settings-daemon.postinst:
+    - Keep autostart files in standard directories
+  * debian/gnome-update-wallpaper-cache.c:
+  * debian/rules:
+    - Add wallpaper cache updater program
+  * debian/patches/02_missing_libs.patch:
+    - Add missing X11 libraries to build dependencies
+  * debian/patches/05_disable_corner_tapping.patch:
+    - Disable corner tapping when disabling tap to click
+  * debian/patches/06_use_application_indicator.patch:
+    - Use application indicators
+  * debian/patches/16_use_synchronous_notifications.patch:
+    - Use synchronous notifications when they are supported
+  * debian/patches/17_react_when_streams_removed.patch:
+    - React to stream-removed signal from GvcMixerControl
+  * debian/patches/40_xres_lcddefault.patch:
+    - OpenOffice.org subpixel font rendering broken with new cairo
+  * debian/gnome-settings-daemon.gconf-defaults:
+    - Needs to be moved to GSettings
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 04 May 2011 13:07:16 +0200
+
 gnome-settings-daemon (3.0.1-1ubuntu4) oneiric; urgency=low
 
   * debian/gnome-settings-daemon.gconf-defaults:
@@ -1638,38 +2132,6 @@
 
 gnome-settings-daemon (3.0.0.1-1ubuntu1) oneiric; urgency=low
 
-  [ Guido Günther ]
-  * Bump build-dependency on libgnome-desktop-3-dev (Closes: #622689)
-
-  [ Rodrigo Moya ]
-  * Rebase from Debian, remaining Ubuntu changes:
-  * debian/control:
-    - Build-depend on libnotify4-dev, not libnotify-dev
-    - Add Buil-depend on libappindicator3-dev
-    - Add Vcs-Bzr URL
-  * debian/gnome-settings-daemon.install:
-  * debian/gnome-settings-daemon.postinst:
-    - Keep autostart files in standard directories
-  * debian/gnome-update-wallpaper-cache.c:
-  * debian/rules:
-    - Add wallpaper cache updater program
-  * debian/patches/02_missing_libs.patch:
-    - Add missing X11 libraries to build dependencies
-  * debian/patches/05_disable_corner_tapping.patch:
-    - Disable corner tapping when disabling tap to click
-  * debian/patches/06_use_application_indicator.patch:
-    - Use application indicators
-  * debian/patches/16_use_synchronous_notifications.patch:
-    - Use synchronous notifications when they are supported
-  * debian/patches/17_react_when_streams_removed.patch:
-    - React to stream-removed signal from GvcMixerControl
-  * debian/patches/40_xres_lcddefault.patch:
-    - OpenOffice.org subpixel font rendering broken with new cairo
-  * debian/gnome-settings-daemon.gconf-defaults:
-    - Needs to be moved to GSettings
-
- -- Rodrigo Moya <[e-mail]>  Wed, 04 May 2011 13:07:16 +0200
-
 gnome-settings-daemon (3.0.0.1-1) experimental; urgency=low
 
   * New upstream release.
@@ -1803,6 +2265,22 @@
 
  -- Sjoerd Simons <[e-mail]>  Sat, 11 Dec 2010 16:20:56 +0000
 
+gnome-settings-daemon (2.30.2-4) unstable; urgency=low
+
+  * Update for libnotify 0.7. Closes: #630277
+    - Bump Build-Depends on libnotify-dev to (>= 0.7.0).
+    - Add debian/patches/14_libnotify_0.7.patch.
+
+ -- Michael Biebl <[e-mail]>  Tue, 02 Aug 2011 05:14:40 +0200
+
+gnome-settings-daemon (2.30.2-3) unstable; urgency=low
+
+  * 11_retry-startup.patch: when starting the Xsettings manager, try 
+    again several times because there is a race condition on the X side.
+    Closes: #614682.
+
+ -- Josselin Mouette <[e-mail]>  Sat, 09 Apr 2011 12:29:30 +0200
+
 gnome-settings-daemon (2.30.2-2) unstable; urgency=low
 
   * 13_monitor_kfreebsd.patch: new patch. Don’t monitor fdescfs.

=== modified file 'debian/control'
--- debian/control	2014-05-28 12:42:05 +0000
+++ debian/control	2014-09-29 12:18:03 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Sjoerd Simons <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 9),
                gnome-pkg-tools,
@@ -15,37 +15,37 @@
                dh-autoreconf,
                autotools-dev,
                intltool (>= 0.37.1),
-               libdbus-glib-1-dev (>= 0.74),
-               libglib2.0-dev (>= 2.35.3),
+               libaccountsservice-dev (>= 0.6.34),
+               libglib2.0-dev (>= 2.37.7),
                libgtk-3-dev (>= 3.7.8),
-               libnotify-dev (>= 0.7.0),
+               libnotify-dev (>= 0.7.3),
                libxt-dev,
                libxi-dev,
+               libxtst-dev,
                libfontconfig1-dev,
                libxext-dev,
                libx11-dev,
-               libxtst-dev,
-               gsettings-desktop-schemas-dev (>= 3.7.2.1),
-               libgnome-desktop-3-dev (>= 3.7.90),
+               libibus-1.0-dev (>= 1.5.2),
+               gsettings-desktop-schemas-dev (>= 3.9.91),
+               libgnome-desktop-3-dev (>= 3.11.1),
                libpulse-dev (>= 1:2.0),
-               librsvg2-dev (>= 2.36.2),
                libcanberra-gtk3-dev,
                libcups2-dev,
                libpolkit-gobject-1-dev,
-               libaccountsservice-dev (>= 0.6.34),
-               libappindicator3-dev (>= 0.4.90),
-               hwdata,
-               libupower-glib-dev (>= 0.9.11),
-               libcolord-dev (>= 0.1.12),
+               libpackagekit-glib2-dev (>= 0.6.4),
+               libupower-glib-dev (>= 0.9.0),
+               libgudev-1.0-dev [linux-any],
+               libcolord-dev (>= 1.0.2),
                liblcms2-dev,
                libnss3-dev,
-               libgudev-1.0-dev,
-               libwacom-dev (>= 0.7),
-               xserver-xorg-input-wacom,
-               libgnomekbd-dev (>= 3.5.1),
-               libxklavier-dev,
-               libsystemd-login-dev (>= 183),
-               libibus-1.0-dev (>= 1.5.0)
+               libwacom-dev (>= 0.7) [!hurd-any !kfreebsd-any !s390 !s390x],
+               xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
+               librsvg2-dev (>= 2.36.2),
+               libgweather-3-dev (>= 3.9.5),
+               libgeocode-glib-dev (>= 3.10.0),
+               geoclue-2.0 (>= 2.1.2),
+               xkb-data,
+               libxkbfile-dev,
 Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-settings-daemon/ubuntu
 
@@ -53,23 +53,19 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         accountsservice (>= 0.6.34),
-         gsettings-desktop-schemas (>= 3.7.2.1),
+         systemd [!hurd-any !kfreebsd-any],
+         gsettings-desktop-schemas (>= 3.10.0),
          nautilus-data (>= 2.91.3-1),
          gnome-settings-daemon-schemas (= ${source:Version}) 
 Recommends: ibus (>= 1.5.0),
             pulseaudio,
-            systemd-services
 Pre-Depends: ${misc:Pre-Depends}
-Breaks: rhythmbox (<< 0.11.5),
-        banshee (<< 0.13.2+dfsg-7),
-        totem (<< 2.22.0),
-        gnome-control-center (<< 1:3.6.3-0ubuntu35),
-        gnome-session (<< 3.9.90-0ubuntu6),
+Breaks: gnome-session (<< 2.24),
         gnome-screensaver (<< 2.28.0),
         gnome-color-manager (<< 3.0),
-        unity-greeter (<< 0.2.1-0ubuntu1),
-        indicator-datetime (<< 12.10.3daily13.03.26)
+        gnome-shell ( << 3.7),
+        gnome-control-center ( << 3.7),
+        gdm (<< 3.0)
 Suggests: x11-xserver-utils,
           gnome-screensaver,
           metacity | x-window-manager
@@ -98,6 +94,7 @@
  This package contains the schemas used by gnome-settings-daemon
 
 Package: gnome-settings-daemon-dev
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},

=== modified file 'debian/control.in'
--- debian/control.in	2014-05-28 12:42:05 +0000
+++ debian/control.in	2014-09-29 12:18:03 +0000
@@ -11,37 +11,37 @@
                dh-autoreconf,
                autotools-dev,
                intltool (>= 0.37.1),
-               libdbus-glib-1-dev (>= 0.74),
-               libglib2.0-dev (>= 2.35.3),
+               libaccountsservice-dev (>= 0.6.34),
+               libglib2.0-dev (>= 2.37.7),
                libgtk-3-dev (>= 3.7.8),
-               libnotify-dev (>= 0.7.0),
+               libnotify-dev (>= 0.7.3),
                libxt-dev,
                libxi-dev,
+               libxtst-dev,
                libfontconfig1-dev,
                libxext-dev,
                libx11-dev,
-               libxtst-dev,
-               gsettings-desktop-schemas-dev (>= 3.7.2.1),
-               libgnome-desktop-3-dev (>= 3.7.90),
+               libibus-1.0-dev (>= 1.5.2),
+               gsettings-desktop-schemas-dev (>= 3.9.91),
+               libgnome-desktop-3-dev (>= 3.11.1),
                libpulse-dev (>= 1:2.0),
-               librsvg2-dev (>= 2.36.2),
                libcanberra-gtk3-dev,
                libcups2-dev,
                libpolkit-gobject-1-dev,
-               libaccountsservice-dev (>= 0.6.34),
-               libappindicator3-dev (>= 0.4.90),
-               hwdata,
-               libupower-glib-dev (>= 0.9.11),
-               libcolord-dev (>= 0.1.12),
+               libpackagekit-glib2-dev (>= 0.6.4),
+               libupower-glib-dev (>= 0.9.0),
+               libgudev-1.0-dev [linux-any],
+               libcolord-dev (>= 1.0.2),
                liblcms2-dev,
                libnss3-dev,
-               libgudev-1.0-dev,
-               libwacom-dev (>= 0.7),
-               xserver-xorg-input-wacom,
-               libgnomekbd-dev (>= 3.5.1),
-               libxklavier-dev,
-               libsystemd-login-dev (>= 183),
-               libibus-1.0-dev (>= 1.5.0)
+               libwacom-dev (>= 0.7) [!hurd-any !kfreebsd-any !s390 !s390x],
+               xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
+               librsvg2-dev (>= 2.36.2),
+               libgweather-3-dev (>= 3.9.5),
+               libgeocode-glib-dev (>= 3.10.0),
+               geoclue-2.0 (>= 2.1.2),
+               xkb-data,
+               libxkbfile-dev,
 Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-settings-daemon/ubuntu
 
@@ -49,23 +49,19 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         accountsservice (>= 0.6.34),
-         gsettings-desktop-schemas (>= 3.7.2.1),
+         systemd [!hurd-any !kfreebsd-any],
+         gsettings-desktop-schemas (>= 3.10.0),
          nautilus-data (>= 2.91.3-1),
          gnome-settings-daemon-schemas (= ${source:Version}) 
 Recommends: ibus (>= 1.5.0),
             pulseaudio,
-            systemd-services
 Pre-Depends: ${misc:Pre-Depends}
-Breaks: rhythmbox (<< 0.11.5),
-        banshee (<< 0.13.2+dfsg-7),
-        totem (<< 2.22.0),
-        gnome-control-center (<< 1:3.6.3-0ubuntu35),
-        gnome-session (<< 3.9.90-0ubuntu6),
+Breaks: gnome-session (<< 2.24),
         gnome-screensaver (<< 2.28.0),
         gnome-color-manager (<< 3.0),
-        unity-greeter (<< 0.2.1-0ubuntu1),
-        indicator-datetime (<< 12.10.3daily13.03.26)
+        gnome-shell ( << 3.7),
+        gnome-control-center ( << 3.7),
+        gdm (<< 3.0)
 Suggests: x11-xserver-utils,
           gnome-screensaver,
           metacity | x-window-manager
@@ -94,6 +90,7 @@
  This package contains the schemas used by gnome-settings-daemon
 
 Package: gnome-settings-daemon-dev
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},

=== added file 'debian/gnome-settings-daemon.examples'
--- debian/gnome-settings-daemon.examples	1970-01-01 00:00:00 +0000
+++ debian/gnome-settings-daemon.examples	2014-09-29 12:18:03 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/gnome-settings-daemon-3.0/input-device-example.sh

=== modified file 'debian/gnome-settings-daemon.install'
--- debian/gnome-settings-daemon.install	2014-02-07 15:53:04 +0000
+++ debian/gnome-settings-daemon.install	2014-09-29 12:18:03 +0000
@@ -1,9 +1,9 @@
-etc
+etc/xdg/autostart
 usr/lib/gnome-settings-daemon*
-usr/share/dbus-1
+usr/share/dbus-1/services
 usr/share/icons
 usr/share/locale
-usr/share/gnome-settings-daemon
+usr/share/gnome-settings-daemon*
 usr/share/polkit-1
 debian/source_gnome-settings-daemon.py /usr/share/apport/package-hooks
 

=== modified file 'debian/gnome-settings-daemon.maintscript'
--- debian/gnome-settings-daemon.maintscript	2014-02-20 10:33:02 +0000
+++ debian/gnome-settings-daemon.maintscript	2014-09-29 12:18:03 +0000
@@ -1,8 +1,11 @@
-rm_conffile /etc/gnome/config/Editres.ad 3.6.3-0ubuntu3~
-rm_conffile /etc/gnome/config/Emacs.ad 3.6.3-0ubuntu3~
-rm_conffile /etc/gnome/config/General.ad 3.6.3-0ubuntu3~
-rm_conffile /etc/gnome/config/Motif.ad 3.6.3-0ubuntu3~
-rm_conffile /etc/gnome/config/Tk.ad 3.6.3-0ubuntu3~
-rm_conffile /etc/gnome/config/Xaw.ad 3.6.3-0ubuntu3~
-rm_conffile /etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf 3.6.4-0ubuntu7~ 
-rm_conffile /etc/xdg/autostart/gnome-fallback-mount-helper.desktop 3.8.6.1-0ubuntu9~
+rm_conffile /etc/xdg/autostart/gnome-settings-daemon.desktop 2.26.1-1~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/xrdb 2.26.1-1~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/Editres.ad 3.0.3-3~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/Tk.ad 3.0.3-3~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/Emacs.ad 3.0.3-3~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/Motif.ad 3.0.3-3~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/General.ad 3.0.3-3~ gnome-settings-daemon
+rm_conffile /etc/gnome/config/Xaw.ad 3.0.3-3~ gnome-settings-daemon
+rm_conffile /etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf 3.6.4-0ubuntu7~ gnome-settings-daemon
+rm_conffile /etc/xdg/autostart/gnome-fallback-mount-helper.desktop 3.8.6.1-0ubuntu9~ gnome-settings-daemon
+

=== removed file 'debian/gnome-update-wallpaper-cache.c'
--- debian/gnome-update-wallpaper-cache.c	2010-11-19 09:13:10 +0000
+++ debian/gnome-update-wallpaper-cache.c	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Didier Roche <[e-mail]>
- * 
- * Bug: https://bugs.launchpad.net/bugs/530024
- */
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include <libgnome-desktop/gnome-bg.h>
-
-static GOptionEntry entries[] =
-{
-  { NULL }
-};
-
-main (int argc, char *argv[])
-{
-    GOptionContext *context = NULL;
-    GError         *error = NULL;
-
-    GdkScreen *screen;
-    GdkRectangle rect;
-    GnomeBG *bg;
-    GSettings *settings;
-    GdkPixbuf *pixbuf;
-
-    gdk_init (&argc, &argv);
-
-    context = g_option_context_new ("- refresh wallpaper cache");
-    g_option_context_add_main_entries (context, entries, NULL);
-    if (!g_option_context_parse (context, &argc, &argv, &error)) {
-        g_printerr ("option parsing failed: %s\n", error->message);
-        g_option_context_free(context);
-        g_error_free (error);
-        return (1);
-    }
-    if (context)
-        g_option_context_free (context);
-
-    /* cache only the first monitor */
-    screen = gdk_screen_get_default ();
-    gdk_screen_get_monitor_geometry (screen, 0, &rect);
-
-    bg = gnome_bg_new ();
-    settings = g_settings_new ("org.gnome.desktop.background");
-    gnome_bg_load_from_preferences (bg, settings);
-
-    pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, rect.width, rect.height);
-    gnome_bg_draw (bg, pixbuf, screen, FALSE);
-
-    g_object_unref (settings);
-
-    return (0);
-}

=== modified file 'debian/patches/43_disable_locale_settings.patch'
--- debian/patches/43_disable_locale_settings.patch	2013-08-29 08:40:06 +0000
+++ debian/patches/43_disable_locale_settings.patch	2014-09-29 12:18:03 +0000
@@ -9,14 +9,14 @@
 * settings by editing ~/.profile.
 *
 
-Index: gnome-settings-daemon-3.7.3/gnome-settings-daemon/main.c
+Index: gnome-settings-daemon-3.12.2/gnome-settings-daemon/main.c
 ===================================================================
---- gnome-settings-daemon-3.7.3.orig/gnome-settings-daemon/main.c	2012-12-20 09:33:43.000000000 -0500
-+++ gnome-settings-daemon-3.7.3/gnome-settings-daemon/main.c	2012-12-20 23:57:37.873288435 -0500
-@@ -348,9 +348,6 @@
+--- gnome-settings-daemon-3.12.2.orig/gnome-settings-daemon/main.c
++++ gnome-settings-daemon-3.12.2/gnome-settings-daemon/main.c
+@@ -312,9 +312,6 @@ name_acquired_handler (GDBusConnection *
          GDBusProxy *proxy;
  
-         proxy = gnome_settings_session_get_session_proxy ();
+         proxy = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
 -        /* Always call this first, as Setenv can only be called before
 -           any client registers */
 -        set_locale (proxy);

=== removed file 'debian/patches/48_register_client_before_idle_callbacks.patch'
--- debian/patches/48_register_client_before_idle_callbacks.patch	2013-07-08 15:23:17 +0000
+++ debian/patches/48_register_client_before_idle_callbacks.patch	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-Index: gnome-settings-daemon-3.6.1/gnome-settings-daemon/main.c
-===================================================================
---- gnome-settings-daemon-3.6.1.orig/gnome-settings-daemon/main.c	2012-10-26 10:19:49.467004174 +0200
-+++ gnome-settings-daemon-3.6.1/gnome-settings-daemon/main.c	2012-10-26 10:19:49.527004177 +0200
-@@ -303,28 +303,6 @@
- }
- #endif
- 
--static void
--got_session_proxy (GObject      *source_object,
--                   GAsyncResult *res,
--                   gpointer      user_data)
--{
--        GDBusProxy *proxy;
--        GError *error = NULL;
--
--        proxy = g_dbus_proxy_new_finish (res, &error);
--        if (proxy == NULL) {
--                g_debug ("Could not connect to the Session manager: %s", error->message);
--                g_error_free (error);
--        } else {
--#ifdef HAVE_IBUS
--                /* This will register with gnome-session after calling Setenv. */
--                set_legacy_ibus_env_vars (proxy);
--#else
--                register_with_gnome_session (proxy);
--#endif
--        }
--}
--
- static gboolean
- on_term_signal_pipe_closed (GIOChannel *source,
-                             GIOCondition condition,
-@@ -374,16 +352,6 @@
- {
-         g_assert (bus != NULL);
- 
--        g_dbus_proxy_new (bus,
--                          G_DBUS_PROXY_FLAGS_NONE,
--                          NULL,
--                          GNOME_SESSION_DBUS_NAME,
--                          GNOME_SESSION_DBUS_OBJECT,
--                          GNOME_SESSION_DBUS_INTERFACE,
--                          NULL,
--                          (GAsyncReadyCallback) got_session_proxy,
--                          NULL);
--
-         watch_for_term_signal (manager);
- }
- 
-@@ -406,6 +374,56 @@
-         gtk_main_quit ();
- }
- 
-+static gboolean
-+do_register_client (gpointer user_data)
-+{
-+        GDBusProxy *proxy = (GDBusProxy *) user_data;
-+        g_assert (proxy != NULL);
-+
-+        const char *startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
-+        g_dbus_proxy_call (proxy,
-+                           "RegisterClient",
-+                           g_variant_new ("(ss)", "gnome-settings-daemon", startup_id ? startup_id : ""),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           -1,
-+                           NULL,
-+                           (GAsyncReadyCallback) on_client_registered,
-+                           manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+queue_register_client (void)
-+{
-+        GDBusConnection *bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-+        if (!bus)
-+                return;
-+
-+        GError *error = NULL;
-+        GDBusProxy *proxy = g_dbus_proxy_new_sync (bus,
-+                                                   G_DBUS_PROXY_FLAGS_NONE,
-+                                                   NULL,
-+                                                   GNOME_SESSION_DBUS_NAME,
-+                                                   GNOME_SESSION_DBUS_OBJECT,
-+                                                   GNOME_SESSION_DBUS_INTERFACE,
-+                                                   NULL,
-+                                                   &error);
-+        g_object_unref (bus);
-+
-+        if (proxy == NULL) {
-+                g_debug ("Could not connect to the Session manager: %s", error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        /* Register the daemon with gnome-session */
-+        g_signal_connect (G_OBJECT (proxy), "g-signal",
-+                          G_CALLBACK (on_session_over), NULL);
-+
-+        g_idle_add_full (G_PRIORITY_DEFAULT, do_register_client, proxy, NULL);
-+}
-+
- static void
- bus_register (void)
- {
-@@ -499,6 +517,8 @@
- 
-         notify_init ("gnome-settings-daemon");
- 
-+        queue_register_client ();
-+
-         bus_register ();
- 
-         gnome_settings_profile_start ("gnome_settings_manager_new");

=== modified file 'debian/patches/53_sync_input_sources_to_accountsservice.patch'
--- debian/patches/53_sync_input_sources_to_accountsservice.patch	2013-09-10 05:03:12 +0000
+++ debian/patches/53_sync_input_sources_to_accountsservice.patch	2014-09-29 12:18:03 +0000
@@ -1,15 +1,15 @@
 --- a/plugins/keyboard/gsd-keyboard-manager.c
 +++ b/plugins/keyboard/gsd-keyboard-manager.c
-@@ -50,6 +50,8 @@
+@@ -47,6 +47,8 @@
  #include <ibus.h>
  #endif
  
 +#include <act/act.h>
 +
- #include "gnome-settings-session.h"
+ #include "gnome-settings-bus.h"
  #include "gnome-settings-profile.h"
  #include "gsd-keyboard-manager.h"
-@@ -969,6 +971,67 @@
+@@ -953,6 +955,67 @@
          g_free (rules_file_path);
  }
  
@@ -77,7 +77,7 @@
  static gboolean
  apply_input_sources_settings (GSettings          *settings,
                                gpointer            keys,
-@@ -984,11 +1047,20 @@
+@@ -968,11 +1031,20 @@
          gchar *layout = NULL;
          gchar *variant = NULL;
          gchar **options = NULL;
@@ -100,12 +100,12 @@
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -195,7 +195,7 @@
+@@ -200,7 +200,7 @@
  fi
  AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
  
--PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(KEYBOARD, xkbfile xkeyboard-config $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile xkeyboard-config $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
  
- dnl ---------------------------------------------------------------------------
- dnl - Housekeeping plugin stuff
+ XKB_BASE=$($PKG_CONFIG --variable xkb_base xkeyboard-config)
+ AC_SUBST(XKB_BASE)

=== modified file 'debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch'
--- debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch	2013-08-29 08:40:06 +0000
+++ debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch	2014-09-29 12:18:03 +0000
@@ -1,10 +1,8 @@
-Index: gnome-settings-daemon-3.7.91/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-===================================================================
---- gnome-settings-daemon-3.7.91.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-03-08 18:25:20.441961407 -0500
-+++ gnome-settings-daemon-3.7.91/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-03-08 18:25:20.437961407 -0500
-@@ -130,6 +130,11 @@
-       <_summary>Copy a screenshot of an area to clipboard</_summary>
-       <_description>Binding to copy a screenshot of an area to clipboard.</_description>
+--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+@@ -135,6 +135,11 @@
+       <_summary>Record a short video of the screen</_summary>
+       <description>Binding to record a short video of the screen</description>
      </key>
 +    <key name="terminal" type="s">
 +      <default>'&lt;Primary&gt;&lt;Alt&gt;t'</default>
@@ -14,11 +12,9 @@
      <key name="www" type="s">
        <default>'XF86WWW'</default>
        <_summary>Launch web browser</_summary>
-Index: gnome-settings-daemon-3.7.91/plugins/media-keys/gsd-media-keys-manager.c
-===================================================================
---- gnome-settings-daemon-3.7.91.orig/plugins/media-keys/gsd-media-keys-manager.c	2013-03-08 18:25:20.441961407 -0500
-+++ gnome-settings-daemon-3.7.91/plugins/media-keys/gsd-media-keys-manager.c	2013-03-08 18:25:20.441961407 -0500
-@@ -960,6 +960,22 @@
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -979,6 +979,22 @@
  }
  
  static void
@@ -41,9 +37,9 @@
  gnome_session_shutdown (GsdMediaKeysManager *manager)
  {
  	GError *error = NULL;
-@@ -2250,6 +2266,9 @@
-         case AREA_SCREENSHOT_CLIP_KEY:
-                 gsd_screenshot_take (type);
+@@ -2319,6 +2335,9 @@
+         case SCREENCAST_KEY:
+                 do_screencast_action (manager);
                  break;
 +        case TERMINAL_KEY:
 +                do_terminal_action (manager);
@@ -51,22 +47,20 @@
          case WWW_KEY:
                  do_url_action (manager, "http", timestamp);
                  break;
-Index: gnome-settings-daemon-3.7.91/plugins/media-keys/shortcuts-list.h
-===================================================================
---- gnome-settings-daemon-3.7.91.orig/plugins/media-keys/shortcuts-list.h	2013-03-08 18:25:20.441961407 -0500
-+++ gnome-settings-daemon-3.7.91/plugins/media-keys/shortcuts-list.h	2013-03-08 18:25:34.201960831 -0500
-@@ -51,6 +51,7 @@
-         SCREENSHOT_CLIP_KEY,
+--- a/plugins/media-keys/shortcuts-list.h
++++ b/plugins/media-keys/shortcuts-list.h
+@@ -52,6 +52,7 @@
          WINDOW_SCREENSHOT_CLIP_KEY,
          AREA_SCREENSHOT_CLIP_KEY,
+         SCREENCAST_KEY,
 +        TERMINAL_KEY,
          WWW_KEY,
          PLAY_KEY,
          PAUSE_KEY,
-@@ -122,6 +123,7 @@
-         { SCREENSHOT_CLIP_KEY, "screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
+@@ -126,6 +127,7 @@
          { WINDOW_SCREENSHOT_CLIP_KEY, "window-screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_NORMAL },
          { AREA_SCREENSHOT_CLIP_KEY, "area-screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
+         { SCREENCAST_KEY, "screencast", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
 +        { TERMINAL_KEY, "terminal", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
          { WWW_KEY, "www", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
          { PLAY_KEY, "play", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },

=== removed file 'debian/patches/git_enable_auto_hidpi.patch'
--- debian/patches/git_enable_auto_hidpi.patch	2014-02-18 18:01:34 +0000
+++ debian/patches/git_enable_auto_hidpi.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-From 260359bc74dda450dda6bff1c4a17dd126a61b18 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <[e-mail]>
-Date: Tue, 20 Aug 2013 12:30:29 +0000
-Subject: xsettings: Enable the automatic hidpi selection
-
-gnome-shell can now handle Gtk+ enabling scaling by default, so its
-now safe to automatically enable this.
----
-diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
-index 1620566..cb018a0 100644
---- a/plugins/xsettings/gsd-xsettings-manager.c
-+++ b/plugins/xsettings/gsd-xsettings-manager.c
-@@ -454,11 +454,6 @@ get_window_scale (GnomeXSettingsManager *manager)
-                         if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT)
-                                 window_scale = 2;
-                 }
--
--                /* TODO: For now we don't support automatic scale picking, because it
--                   any scale but 1 breaks gnome-shell. Remove this when gnome-shell
--                   is fixed. */
--                window_scale = 1;
-         }
- 
-         return window_scale;
---
-cgit v0.9.2

=== removed file 'debian/patches/git_hidpi_scalling.patch'
--- debian/patches/git_hidpi_scalling.patch	2014-02-03 16:17:38 +0000
+++ debian/patches/git_hidpi_scalling.patch	1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
-From 047f030235972fdab5e15aff484006caf914216a Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <[e-mail]>
-Date: Mon, 01 Jul 2013 12:14:23 +0000
-Subject: xsettings: Add support for window-scaling
-
-We read the scale-factor gsettings and propagate to gdk, including doing
-auto-detection if the setting is 0.
-
-NOTE: The auto-detection code is currently disabled as enabling
-scaling breaks gnome-shell. When this is fixed we want to enable this.
-
-We also scale the old Xft.DPI setting by the window scale so that old
-applications get a decent size on very high dpi monitors, plus we report the
-unscaled dpi so that window scale aware apps (like gtk) can avoid this
-dpi scaling.
-
-We also scale the cursor theme size so that you will get matching sizes
-for cursors.
----
-Index: gnome-settings-daemon-3.8.6.1/plugins/xsettings/gsd-xsettings-manager.c
-===================================================================
---- gnome-settings-daemon-3.8.6.1.orig/plugins/xsettings/gsd-xsettings-manager.c	2014-02-03 12:06:40.014501405 +0000
-+++ gnome-settings-daemon-3.8.6.1/plugins/xsettings/gsd-xsettings-manager.c	2014-02-03 12:08:05.314504245 +0000
-@@ -59,6 +59,8 @@
- #define GTK_MODULES_ENABLED_KEY  "enabled-gtk-modules"
- 
- #define TEXT_SCALING_FACTOR_KEY "text-scaling-factor"
-+#define SCALING_FACTOR_KEY "scaling-factor"
-+#define CURSOR_SIZE_KEY "cursor-size"
- 
- #define FONT_ANTIALIASING_KEY "antialiasing"
- #define FONT_HINTING_KEY      "hinting"
-@@ -218,6 +220,8 @@
-  */
- #define DPI_FALLBACK 96
- 
-+#define HIDPI_LIMIT (DPI_FALLBACK * 2)
-+
- typedef struct _TranslationEntry TranslationEntry;
- typedef void (* TranslationFunc) (GnomeXSettingsManager *manager,
-                                   TranslationEntry      *trans,
-@@ -359,7 +363,7 @@
-         { "org.gnome.desktop.interface", "menubar-accel",          "Gtk/MenuBarAccel",        translate_string_string },
-         { "org.gnome.desktop.interface", "enable-animations",      "Gtk/EnableAnimations",    translate_bool_int },
-         { "org.gnome.desktop.interface", "cursor-theme",           "Gtk/CursorThemeName",     translate_string_string },
--        { "org.gnome.desktop.interface", "cursor-size",            "Gtk/CursorThemeSize",     translate_int_int },
-+        /* cursor-size is handled via the Xft side as it needs the scaling factor */
-         { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
-         { "org.gnome.desktop.interface", "show-unicode-menu",      "Gtk/ShowUnicodeMenu",     translate_bool_int },
-         { "org.gnome.desktop.interface", "automatic-mnemonics",    "Gtk/AutoMnemonics",       translate_bool_int },
-@@ -408,10 +412,56 @@
-         return dpi * factor;
- }
- 
-+static int
-+get_window_scale (GnomeXSettingsManager *manager)
-+{
-+	GSettings  *interface_settings;
-+        int window_scale;
-+        GdkRectangle rect;
-+        GdkDisplay *display;
-+        GdkScreen *screen;
-+        int width_mm, height_mm;
-+        int monitor_scale;
-+        double dpi_x, dpi_y;
-+
-+	interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
-+        window_scale =
-+                g_settings_get_uint (interface_settings, SCALING_FACTOR_KEY);
-+        if (window_scale == 0) {
-+                display = gdk_display_get_default ();
-+                screen = gdk_display_get_default_screen (display);
-+                gdk_screen_get_monitor_geometry (screen, 0, &rect);
-+                width_mm = gdk_screen_get_monitor_width_mm (screen, 0);
-+                height_mm = gdk_screen_get_monitor_height_mm (screen, 0);
-+                monitor_scale = gdk_screen_get_monitor_scale_factor (screen, 0);
-+
-+                window_scale = 1;
-+                if (width_mm > 0 && height_mm > 0) {
-+                        dpi_x = (double)rect.width * monitor_scale / (width_mm / 25.4);
-+                        dpi_y = (double)rect.height * monitor_scale / (height_mm / 25.4);
-+                        /* We don't completely trust these values so both
-+                           must be high, and never pick higher ratio than
-+                           2 automatically */
-+                        if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT)
-+                                window_scale = 2;
-+                }
-+
-+                /* TODO: For now we don't support automatic scale picking, because it
-+                   any scale but 1 breaks gnome-shell. Remove this when gnome-shell
-+                   is fixed. */
-+                window_scale = 1;
-+        }
-+
-+        return window_scale;
-+}
-+
- typedef struct {
-         gboolean    antialias;
-         gboolean    hinting;
-+        int         scaled_dpi;
-         int         dpi;
-+        int         window_scale;
-+        int         cursor_size;
-         const char *rgba;
-         const char *hintstyle;
- } GnomeXftSettings;
-@@ -421,10 +471,15 @@
- xft_settings_get (GnomeXSettingsManager *manager,
-                   GnomeXftSettings      *settings)
- {
-+	GSettings  *interface_settings;
-         GsdFontAntialiasingMode antialiasing;
-         GsdFontHinting hinting;
-         GsdFontRgbaOrder order;
-         gboolean use_rgba = FALSE;
-+        double dpi;
-+        int cursor_size;
-+
-+	interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
- 
-         antialiasing = g_settings_get_enum (manager->priv->plugin_settings, FONT_ANTIALIASING_KEY);
-         hinting = g_settings_get_enum (manager->priv->plugin_settings, FONT_HINTING_KEY);
-@@ -432,7 +487,12 @@
- 
-         settings->antialias = (antialiasing != GSD_FONT_ANTIALIASING_MODE_NONE);
-         settings->hinting = (hinting != GSD_FONT_HINTING_NONE);
--        settings->dpi = get_dpi_from_gsettings (manager) * 1024; /* Xft wants 1/1024ths of an inch */
-+        settings->window_scale = get_window_scale (manager);
-+        dpi = get_dpi_from_gsettings (manager);
-+        settings->dpi = dpi * 1024; /* Xft wants 1/1024ths of an inch */
-+        settings->scaled_dpi = dpi * settings->window_scale * 1024;
-+        cursor_size = g_settings_get_int (interface_settings, CURSOR_SIZE_KEY);
-+        settings->cursor_size = cursor_size * settings->window_scale;
-         settings->rgba = "rgb";
-         settings->hintstyle = "hintfull";
- 
-@@ -498,8 +558,11 @@
-                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/Antialias", settings->antialias);
-                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/Hinting", settings->hinting);
-                 xsettings_manager_set_string (manager->priv->managers [i], "Xft/HintStyle", settings->hintstyle);
--                xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->dpi);
-+                xsettings_manager_set_int (manager->priv->managers [i], "Gdk/WindowScalingFactor", settings->window_scale);
-+                xsettings_manager_set_int (manager->priv->managers [i], "Gdk/UnscaledDPI", settings->dpi);
-+                xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->scaled_dpi);
-                 xsettings_manager_set_string (manager->priv->managers [i], "Xft/RGBA", settings->rgba);
-+                xsettings_manager_set_int (manager->priv->managers [i], "Gtk/CursorThemeSize", settings->cursor_size);
-         }
-         gnome_settings_profile_end (NULL);
- }
-@@ -552,7 +615,7 @@
-         g_debug("xft_settings_set_xresources: orig res '%s'", add_string->str);
- 
-         update_property (add_string, "Xft.dpi",
--                                g_ascii_dtostr (dpibuf, sizeof (dpibuf), (double) settings->dpi / 1024.0));
-+                                g_ascii_dtostr (dpibuf, sizeof (dpibuf), (double) settings->scaled_dpi / 1024.0));
-         update_property (add_string, "Xft.antialias",
-                                 settings->antialias ? "1" : "0");
-         update_property (add_string, "Xft.hinting",
-@@ -810,7 +873,8 @@
-         guint             i;
-         GVariant         *value;
- 
--        if (g_str_equal (key, TEXT_SCALING_FACTOR_KEY)) {
-+        if (g_str_equal (key, TEXT_SCALING_FACTOR_KEY) ||
-+            g_str_equal (key, SCALING_FACTOR_KEY)) {
-         	xft_callback (NULL, key, manager);
-         	return;
- 	}

=== removed file 'debian/patches/git_keybindings_add_screen_reader_toggle.patch'
--- debian/patches/git_keybindings_add_screen_reader_toggle.patch	2013-08-22 02:56:26 +0000
+++ debian/patches/git_keybindings_add_screen_reader_toggle.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-From f20df9907933d24519a5e69d565cf25715349fda Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= <[e-mail]>
-Date: Tue, 13 Aug 2013 20:41:49 +0200
-Subject: [PATCH] Adding shortcut for toggle screen reader
-
-https://bugzilla.gnome.org/show_bug.cgi?id=705929
----
- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-index a46888d..0af3978 100644
---- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-@@ -146,7 +146,7 @@
-       <_description>Binding to show the screen magnifier</_description>
-     </key>
-     <key name="screenreader" type="s">
--      <default>''</default>
-+      <default>'&lt;Alt&gt;&lt;Super&gt;s'</default>
-       <_summary>Toggle screen reader</_summary>
-       <_description>Binding to start the screen reader</_description>
-     </key>
--- 
-1.8.3.2
-

=== removed file 'debian/patches/git_lp1339244.patch'
--- debian/patches/git_lp1339244.patch	2014-07-14 00:01:03 +0000
+++ debian/patches/git_lp1339244.patch	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-From 2329da7dad28f61109cecd8ca8ce93580f62f349 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[e-mail]>
-Date: Fri, 25 Apr 2014 15:42:39 +0200
-Subject: common: Check the exit status of hotplug scripts correctly
-
-Instead of comparing the shell's exit code by hand, use
-g_spawn_check_exit_status() to get the script's exit code.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710791
-
-Index: gnome-settings-daemon-3.8.6.1/plugins/common/gsd-input-helper.c
-===================================================================
---- gnome-settings-daemon-3.8.6.1.orig/plugins/common/gsd-input-helper.c
-+++ gnome-settings-daemon-3.8.6.1/plugins/common/gsd-input-helper.c
-@@ -499,6 +499,7 @@ run_custom_command (GdkDevice
-                     CustomCommand           command)
- {
-         GSettings *settings;
-+        GError *error = NULL;
-         char *cmd;
-         char *argv[7];
-         int exit_status;
-@@ -526,15 +527,25 @@ run_custom_command (GdkDevice
-         argv[6] = NULL;
- 
-         rc = g_spawn_sync (g_get_home_dir (), argv, NULL, G_SPAWN_SEARCH_PATH,
--                           NULL, NULL, NULL, NULL, &exit_status, NULL);
-+                           NULL, NULL, NULL, NULL, &exit_status, &error);
- 
--        if (rc == FALSE)
--                g_warning ("Couldn't execute command '%s', verify that this is a valid command.", cmd);
-+        if (rc == FALSE) {
-+                g_warning ("Couldn't execute command '%s', verify that this is a valid command: %s", cmd, error->message);
-+                g_clear_error (&error);
-+        }
- 
-         g_free (argv[0]);
-         g_free (argv[4]);
- 
--        return (exit_status == 1);
-+        if (!g_spawn_check_exit_status (exit_status, &error)) {
-+                if (g_error_matches (error, G_SPAWN_EXIT_ERROR, 1)) {
-+                        g_clear_error (&error);
-+                        return TRUE;
-+                }
-+                g_clear_error (&error);
-+        }
-+
-+        return FALSE;
- }
- 
- GList *

=== removed file 'debian/patches/git_micmute.patch'
--- debian/patches/git_micmute.patch	2014-03-14 06:21:12 +0000
+++ debian/patches/git_micmute.patch	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Author: Bastien Nocera <[e-mail]>
-Origion: upstream
-Description: media-keys: Add XF86AudioMicMute as a mic mute key
- Needed because of https://bugs.freedesktop.org/show_bug.cgi?id=54171 being fixed
-Applied-Upstream: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=3a8beaaf380a483ce33363031d8d276c371d7af1
----
----
- plugins/media-keys/shortcuts-list.h |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/plugins/media-keys/shortcuts-list.h
-+++ b/plugins/media-keys/shortcuts-list.h
-@@ -109,6 +109,7 @@ static struct {
-         { VOLUME_DOWN_KEY, "volume-down", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
-         { VOLUME_UP_KEY, "volume-up", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
-         { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "F20", SHELL_KEYBINDING_MODE_ALL },
-+        { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "XF86AudioMicMute", SHELL_KEYBINDING_MODE_ALL },
-         { MUTE_QUIET_KEY, NULL, N_("Quiet Volume Mute"), "<Alt>XF86AudioMute", SHELL_KEYBINDING_MODE_ALL },
-         { VOLUME_DOWN_QUIET_KEY, NULL, N_("Quiet Volume Down"), "<Alt>XF86AudioLowerVolume", SHELL_KEYBINDING_MODE_ALL },
-         { VOLUME_UP_QUIET_KEY, NULL, N_("Quiet Volume Up"), "<Alt>XF86AudioRaiseVolume", SHELL_KEYBINDING_MODE_ALL },

=== removed file 'debian/patches/git_new_screencast_keybinding.patch'
--- debian/patches/git_new_screencast_keybinding.patch	2014-05-28 12:42:05 +0000
+++ debian/patches/git_new_screencast_keybinding.patch	1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-From 1ae70dc6ff141e248e8198ee1d82e1bec6ed4434 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <[e-mail]>
-Date: Thu, 18 Jul 2013 01:10:02 +0000
-Subject: media-keys: Add a binding to take a short screencast of the screen
-
-https://bugzilla.gnome.org/show_bug.cgi?id=704435
----
-Index: gnome-settings-daemon-3.8.6.1/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-===================================================================
---- gnome-settings-daemon-3.8.6.1.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-+++ gnome-settings-daemon-3.8.6.1/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-@@ -135,6 +135,11 @@
-       <_summary>Launch terminal</_summary>
-       <_description>Binding to launch the terminal.</_description>
-     </key>
-+    <key name="screencast" type="s">
-+      <default>'&lt;Ctrl&gt;&lt;Shift&gt;&lt;Alt&gt;R'</default>
-+      <_summary>Record a short video of the screen</_summary>
-+      <description>Binding to record a short video of the screen</description>
-+    </key>
-     <key name="www" type="s">
-       <default>'XF86WWW'</default>
-       <_summary>Launch web browser</_summary>
-Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/gsd-media-keys-manager.c
-===================================================================
---- gnome-settings-daemon-3.8.6.1.orig/plugins/media-keys/gsd-media-keys-manager.c
-+++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/gsd-media-keys-manager.c
-@@ -80,6 +80,9 @@
- 
- #define SHELL_GRABBER_RETRY_INTERVAL 1
- 
-+/* Screencasts last for 5 mins */
-+#define SCREENCAST_LENGTH 300
-+
- static const gchar introspection_xml[] =
- "<node name='/org/gnome/SettingsDaemon/MediaKeys'>"
- "  <interface name='org.gnome.SettingsDaemon.MediaKeys'>"
-@@ -172,6 +175,11 @@ struct GsdMediaKeysManagerPrivate
-         GCancellable    *shell_cancellable;
-         GCancellable    *grab_cancellable;
- 
-+        /* Screencast stuff */
-+        GDBusProxy      *screencast_proxy;
-+        guint            screencast_timeout_id;
-+        GCancellable    *screencast_cancellable;
-+
-         /* systemd stuff */
-         GDBusProxy      *logind_proxy;
-         gint             inhibit_keys_fd;
-@@ -1967,6 +1975,61 @@ do_battery_action (GsdMediaKeysManager *
- }
- 
- static void
-+screencast_stop (GsdMediaKeysManager *manager)
-+{
-+        if (manager->priv->screencast_timeout_id > 0) {
-+                g_source_remove (manager->priv->screencast_timeout_id);
-+                manager->priv->screencast_timeout_id = 0;
-+        }
-+
-+        g_dbus_proxy_call (manager->priv->screencast_proxy,
-+                           "StopScreencast", NULL,
-+                           G_DBUS_CALL_FLAGS_NONE, -1,
-+                           manager->priv->screencast_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static gboolean
-+screencast_timeout (gpointer user_data)
-+{
-+        GsdMediaKeysManager *manager = user_data;
-+        screencast_stop (manager);
-+        return G_SOURCE_REMOVE;
-+}
-+
-+static void
-+screencast_start (GsdMediaKeysManager *manager)
-+{
-+        g_dbus_proxy_call (manager->priv->screencast_proxy,
-+                           "Screencast",
-+                           /* Translators: this is a filename used for screencast
-+                            * recording, where "%d" and "%t" date and time, e.g.
-+                            * "Screencast from 07-17-2013 10:00:46 PM.webm" */
-+                           /* xgettext:no-c-format */
-+                           g_variant_new_parsed ("(%s, @a{sv} {})",
-+                                                 _("Screencast from %d %t.webm")),
-+                           G_DBUS_CALL_FLAGS_NONE, -1,
-+                           manager->priv->screencast_cancellable,
-+                           NULL, NULL);
-+
-+        manager->priv->screencast_timeout_id = g_timeout_add_seconds (SCREENCAST_LENGTH,
-+                                                                      screencast_timeout,
-+                                                                      manager);
-+}
-+
-+static void
-+do_screencast_action (GsdMediaKeysManager *manager)
-+{
-+        if (manager->priv->screencast_proxy == NULL)
-+                return;
-+
-+        if (manager->priv->screencast_timeout_id == 0)
-+                screencast_start (manager);
-+        else
-+                screencast_stop (manager);
-+}
-+
-+static void
- do_custom_action (GsdMediaKeysManager *manager,
-                   guint                deviceid,
-                   MediaKey            *key,
-@@ -2044,6 +2107,9 @@ do_action (GsdMediaKeysManager *manager,
-         case TERMINAL_KEY:
-                 do_terminal_action (manager);
-                 break;
-+        case SCREENCAST_KEY:
-+                do_screencast_action (manager);
-+                break;
-         case WWW_KEY:
-                 do_url_action (manager, "http", timestamp);
-                 break;
-@@ -2221,6 +2287,17 @@ on_shell_proxy_ready (GObject      *sour
- }
- 
- static void
-+on_screencast_proxy_ready (GObject      *source,
-+                           GAsyncResult *result,
-+                           gpointer      data)
-+{
-+        GsdMediaKeysManager *manager = data;
-+
-+        manager->priv->screencast_proxy =
-+                g_dbus_proxy_new_for_bus_finish (result, NULL);
-+}
-+
-+static void
- on_key_grabber_ready (GObject      *source,
-                       GAsyncResult *result,
-                       gpointer      data)
-@@ -2261,6 +2338,14 @@ on_shell_appeared (GDBusConnection   *co
-                                   SHELL_DBUS_NAME,
-                                   manager->priv->shell_cancellable,
-                                   on_shell_proxy_ready, manager);
-+
-+        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-+                                  0, NULL,
-+                                  name_owner,
-+                                  SHELL_DBUS_PATH "/Screencast",
-+                                  SHELL_DBUS_NAME ".Screencast",
-+                                  manager->priv->screencast_cancellable,
-+                                  on_screencast_proxy_ready, manager);
- }
- 
- static void
-@@ -2330,6 +2415,7 @@ start_media_keys_idle_cb (GsdMediaKeysMa
- 
-         ensure_cancellable (&manager->priv->grab_cancellable);
-         ensure_cancellable (&manager->priv->shell_cancellable);
-+        ensure_cancellable (&manager->priv->screencast_cancellable);
- 
-         manager->priv->name_owner_id =
-                 g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -2399,6 +2485,7 @@ gsd_media_keys_manager_stop (GsdMediaKey
-         g_clear_object (&priv->power_proxy);
-         g_clear_object (&priv->power_screen_proxy);
-         g_clear_object (&priv->power_keyboard_proxy);
-+        g_clear_object (&priv->screencast_proxy);
- 
-         if (manager->priv->name_owner_id) {
-                 g_bus_unwatch_name (manager->priv->name_owner_id);
-@@ -2434,6 +2521,11 @@ gsd_media_keys_manager_stop (GsdMediaKey
-                 g_clear_object (&priv->shell_cancellable);
-         }
- 
-+        if (priv->screencast_cancellable != NULL) {
-+                g_cancellable_cancel (priv->screencast_cancellable);
-+                g_clear_object (&priv->screencast_cancellable);
-+        }
-+
-         g_clear_object (&priv->sink);
-         g_clear_object (&priv->source);
-         g_clear_object (&priv->volume);
-Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/shortcuts-list.h
-===================================================================
---- gnome-settings-daemon-3.8.6.1.orig/plugins/media-keys/shortcuts-list.h
-+++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/shortcuts-list.h
-@@ -51,6 +51,7 @@ typedef enum {
-         SCREENSHOT_CLIP_KEY,
-         WINDOW_SCREENSHOT_CLIP_KEY,
-         AREA_SCREENSHOT_CLIP_KEY,
-+        SCREENCAST_KEY,
-         TERMINAL_KEY,
-         WWW_KEY,
-         PLAY_KEY,
-@@ -123,6 +124,7 @@ static struct {
-         { SCREENSHOT_CLIP_KEY, "screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
-         { WINDOW_SCREENSHOT_CLIP_KEY, "window-screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_NORMAL },
-         { AREA_SCREENSHOT_CLIP_KEY, "area-screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
-+        { SCREENCAST_KEY, "screencast", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
-         { TERMINAL_KEY, "terminal", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
-         { WWW_KEY, "www", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
-         { PLAY_KEY, "play", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },

=== removed file 'debian/patches/git_touchpad_scrolling.patch'
--- debian/patches/git_touchpad_scrolling.patch	2013-10-16 14:38:52 +0000
+++ debian/patches/git_touchpad_scrolling.patch	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-From 36920e3a9c193badec2898a9a8b979f51d7be094 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <[e-mail]>
-Date: Fri, 11 Oct 2013 10:52:37 +0000
-Subject: mouse: fix two finger scrolling detection
-
-https://bugzilla.gnome.org/show_bug.cgi?id=702858
----
-diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
-index 768a1e3..e86c709 100644
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -717,19 +717,16 @@ set_scroll_method (GsdMouseManager         *manager,
- {
-         int rc;
-         XDevice *xdevice;
--        Atom act_type, prop_edge, prop_twofinger;
-+        Atom act_type, prop, prop_edge, prop_twofinger;
-         int act_format;
-         unsigned long nitems, bytes_after;
-         unsigned char *data;
- 
-+        prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Capabilities", True);
-         prop_edge = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Edge Scrolling", False);
-         prop_twofinger = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Synaptics Two-Finger Scrolling", False);
--        if (!prop_twofinger && method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING) {
--                method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;
--                g_settings_set_enum (manager->priv->touchpad_settings, KEY_SCROLL_METHOD, method);
--        }
- 
--        if (!prop_edge || !prop_twofinger)
-+        if (!prop_edge || !prop_twofinger || !prop)
-                 return;
- 
-         xdevice = open_gdk_device (device);
-@@ -745,6 +742,20 @@ set_scroll_method (GsdMouseManager         *manager,
- 
-         gdk_error_trap_push ();
-         rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
-+                                 prop, 0, 2, False,
-+                                 XA_INTEGER, &act_type, &act_format, &nitems,
-+                                 &bytes_after, &data);
-+        if (rc == Success && act_type != None) {
-+                if (!(data[3]) && method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING) {
-+                        g_warning ("Two finger scroll is not supported by %s", gdk_device_get_name (device));
-+                        method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;
-+                        g_settings_set_enum (manager->priv->touchpad_settings, KEY_SCROLL_METHOD, method);
-+                }
-+
-+                XFree (data);
-+        }
-+
-+        rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
-                                  prop_edge, 0, 1, False,
-                                  XA_INTEGER, &act_type, &act_format, &nitems,
-                                  &bytes_after, &data);
---

=== removed file 'debian/patches/git_xsettings_segfaults.patch'
--- debian/patches/git_xsettings_segfaults.patch	2014-05-28 12:42:05 +0000
+++ debian/patches/git_xsettings_segfaults.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-From a1acdc0aa5af1c2716ff30bcfb8987de7ca3acc9 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <[e-mail]>
-Date: Sat, 9 Nov 2013 10:59:54 +1100
-Subject: xsettings: unwatch dbus before destroying xsettings managers
-
-fix possible race since notify_have_shell is getting called after the
-managers are destroyed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711238
-
-
---- a/plugins/xsettings/gsd-xsettings-manager.c
-+++ b/plugins/xsettings/gsd-xsettings-manager.c
-@@ -966,6 +966,9 @@
- 
-         g_debug ("Stopping xsettings manager");
- 
-+        if (p->shell_name_watch_id > 0)
-+                g_bus_unwatch_name (p->shell_name_watch_id);
-+
-         if (p->managers != NULL) {
-                 for (i = 0; p->managers [i]; ++i)
-                         xsettings_manager_destroy (p->managers [i]);
-@@ -981,9 +984,6 @@
- 
-         stop_fontconfig_monitor (manager);
- 
--        if (manager->priv->shell_name_watch_id > 0)
--                g_bus_unwatch_name (manager->priv->shell_name_watch_id);
--
-         if (p->settings != NULL) {
-                 g_hash_table_destroy (p->settings);
-                 p->settings = NULL;

=== modified file 'debian/patches/nexus-orientation.patch'
--- debian/patches/nexus-orientation.patch	2013-07-08 15:23:17 +0000
+++ debian/patches/nexus-orientation.patch	2014-09-29 12:18:03 +0000
@@ -1,11 +1,11 @@
 ## Description: Autorotate Nexus screen
 ## Origin/Author: [e-mail]
 ## Bug: https://bugs.launchpad.net/ubuntu-nexus7/+bug/1110360
-Index: gnome-settings-daemon-3.6.4/plugins/orientation/gsd-orientation-manager.c
+Index: gnome-settings-daemon-3.12.2/plugins/orientation/gsd-orientation-manager.c
 ===================================================================
---- gnome-settings-daemon-3.6.4.orig/plugins/orientation/gsd-orientation-manager.c	2013-02-13 13:36:14.606221356 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/orientation/gsd-orientation-manager.c	2013-02-13 13:36:38.130337989 +0200
-@@ -23,6 +23,7 @@
+--- gnome-settings-daemon-3.12.2.orig/plugins/orientation/gsd-orientation-manager.c
++++ gnome-settings-daemon-3.12.2/plugins/orientation/gsd-orientation-manager.c
+@@ -22,6 +22,7 @@
  
  #include "config.h"
  
@@ -13,7 +13,7 @@
  #include <glib.h>
  #include <gtk/gtk.h>
  #include <gdk/gdk.h>
-@@ -87,6 +88,14 @@
+@@ -88,6 +89,14 @@ G_DEFINE_TYPE (GsdOrientationManager, gs
  
  static gpointer manager_object = NULL;
  
@@ -25,10 +25,10 @@
 +static char *mpu6050_accel_y = NULL;
 +static gboolean mpu_timer(GsdOrientationManager *manager);
 +
- static GObject *
- gsd_orientation_manager_constructor (GType                     type,
-                                guint                      n_construct_properties,
-@@ -312,8 +321,11 @@
+ static void
+ gsd_orientation_manager_class_init (GsdOrientationManagerClass *klass)
+ {
+@@ -290,8 +299,11 @@ orientation_lock_changed_cb (GSettings
                  return;
  
          manager->priv->orientation_lock = new;
@@ -41,7 +41,7 @@
                  /* Handle the rotations that could have occurred while
                   * we were locked */
                  do_rotation (manager);
-@@ -372,12 +384,14 @@
+@@ -358,12 +370,14 @@ on_bus_gotten (GObject               *so
  static GUdevDevice *
  get_accelerometer (GUdevClient *client)
  {
@@ -57,7 +57,7 @@
          for (l = list; l != NULL; l = l->next) {
                  GUdevDevice *dev;
  
-@@ -408,6 +422,53 @@
+@@ -394,6 +408,53 @@ get_accelerometer (GUdevClient *client)
          return ret;
  }
  
@@ -111,7 +111,7 @@
  static gboolean
  gsd_orientation_manager_idle_cb (GsdOrientationManager *manager)
  {
-@@ -432,6 +493,16 @@
+@@ -419,6 +480,16 @@ gsd_orientation_manager_idle_cb (GsdOrie
          g_debug ("Found accelerometer at sysfs path '%s'", manager->priv->sysfs_path);
  
          manager->priv->prev_orientation = get_orientation_from_device (dev);

=== added file 'debian/patches/revert-gsettings-removals.patch'
--- debian/patches/revert-gsettings-removals.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert-gsettings-removals.patch	2014-09-29 12:18:03 +0000
@@ -0,0 +1,113 @@
+From 4d13c5025c73f0f4cdc6cefb7c81c40313790623 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Sat, 13 Sep 2014 11:57:02 +1000
+ Revert gsettings key removals, these are still need by unity-settings-daemon
+
+---
+ ...ings-daemon.peripherals.wacom.gschema.xml.in.in |  5 +++
+ ...gnome.settings-daemon.plugins.gschema.xml.in.in | 13 +++++++
+ ...settings-daemon.plugins.power.gschema.xml.in.in | 40 ++++++++++++++++++++++
+ plugins/power/gsd-power-manager.c                  | 32 +++++++++++++++++
+ 5 files changed, 94 insertions(+)
+
+diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+index 5908fbc..d642c85 100644
+--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+@@ -41,6 +41,11 @@
+       <_summary>Wacom touch feature</_summary>
+       <_description>Enable this to move the cursor when the user touches the tablet.</_description>
+     </key>
++    <key name="tablet-pc-button" type="b">
++      <default>false</default>
++      <_summary>Wacom tablet PC feature</_summary>
++      <_description>Enable this to only report stylus events when the tip is pressed.</_description>
++    </key>
+     <key name="last-calibrated-resolution" type="(ii)">
+       <default>(-1, -1)</default>
+       <_summary>Wacom last calibrated resolution</_summary>
+diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+index 65682df..57a058d 100644
+--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+@@ -23,6 +23,7 @@
+     <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
+     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
+     <child name="print-notifications" schema="org.gnome.settings-daemon.plugins.print-notifications"/>
++    <child name="remote-display" schema="org.gnome.settings-daemon.plugins.remote-display"/>
+     <child name="screensaver-proxy" schema="org.gnome.settings-daemon.plugins.screensaver-proxy"/>
+     <child name="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
+     <child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/>
+@@ -90,6 +91,18 @@
+       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+     </key>
+   </schema>
++  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.remote-display" path="/org/gnome/settings-daemon/plugins/remote-display/">
++    <key name="active" type="b">
++      <default>true</default>
++      <_summary>Activation of this plugin</_summary>
++      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
++    </key>
++    <key name="priority" type="i">
++      <default>0</default>
++      <_summary>Priority to use for this plugin</_summary>
++      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
++    </key>
++  </schema>
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.rfkill" path="/org/gnome/settings-daemon/plugins/rfkill/">
+     <key name="active" type="b">
+       <default>true</default>
+diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+index 1fd60e7..8db3973 100644
+--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+@@ -66,5 +66,45 @@
+       <summary>Battery critical low action</summary>
+       <description>The action to take when the battery is critically low.</description>
+     </key>
++    <key name="percentage-low" type="i">
++      <default>10</default>
++      <_summary>Percentage considered low</_summary>
++      <_description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</_description>
++    </key>
++    <key name="percentage-critical" type="i">
++      <default>3</default>
++      <_summary>Percentage considered critical</_summary>
++      <_description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</_description>
++    </key>
++    <key name="percentage-action" type="i">
++      <default>2</default>
++      <_summary>Percentage action is taken</_summary>
++      <_description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</_description>
++    </key>
++    <key name="time-low" type="i">
++      <default>1200</default>
++      <_summary>The time remaining when low</_summary>
++      <_description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</_description>
++    </key>
++    <key name="time-critical" type="i">
++      <default>300</default>
++      <_summary>The time remaining when critical</_summary>
++      <_description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</_description>
++    </key>
++    <key name="time-action" type="i">
++      <default>120</default>
++      <_summary>The time remaining when action is taken</_summary>
++      <_description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</_description>
++    </key>
++    <key name="use-time-for-policy" type="b">
++      <default>true</default>
++      <_summary>Whether to use time-based notifications</_summary>
++      <_description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</_description>
++    </key>
++    <key name="notify-perhaps-recall" type="b">
++      <default>true</default>
++      <_summary>If we should show the recalled battery warning for a broken battery</_summary>
++      <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
++    </key>
+   </schema>
+ </schemalist>
+-- 
+2.1.0
+
+

=== added file 'debian/patches/revert_media-keys_fix_battery_key.patch'
--- debian/patches/revert_media-keys_fix_battery_key.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert_media-keys_fix_battery_key.patch	2014-09-29 12:18:03 +0000
@@ -0,0 +1,112 @@
+From 2b112903b45497747bb196be80fa5eb49d18a562 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Tue, 16 Sep 2014 12:18:59 +1000
+Subject: [PATCH] Revert "media-keys: Fix battery key handling"
+
+This reverts commit 79ce8533b0b7d406744fc5b1732fcc67ebc74b4f.
+---
+ configure.ac                                |  2 +-
+ plugins/media-keys/gsd-media-keys-manager.c | 34 ++++++++++-------------------
+ 2 files changed, 12 insertions(+), 24 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 501cb43..930e12f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -208,7 +208,7 @@ dnl ---------------------------------------------------------------------------
+ dnl - media-keys plugin stuff
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3 upower-glib >= $UPOWER_REQUIRED_VERSION])
++PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3])
+ PKG_CHECK_MODULES(GVC, [gobject-2.0 libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION])
+ AM_CONDITIONAL(HAVE_INTROSPECTION, false)
+ 
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index 71eb16c..5e628f4 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -39,8 +39,6 @@
+ #include <gio/gdesktopappinfo.h>
+ #include <gio/gunixfdlist.h>
+ 
+-#include <libupower-glib/upower.h>
+-
+ #ifdef HAVE_GUDEV
+ #include <gudev/gudev.h>
+ #endif
+@@ -162,7 +160,6 @@ struct GsdMediaKeysManagerPrivate
+         GDBusProxy      *power_proxy;
+         GDBusProxy      *power_screen_proxy;
+         GDBusProxy      *power_keyboard_proxy;
+-        UpDevice        *composite_device;
+ 
+         /* Shell stuff */
+         GsdShell        *shell_proxy;
+@@ -1950,24 +1947,21 @@ do_brightness_action (GsdMediaKeysManager *manager,
+ static void
+ do_battery_action (GsdMediaKeysManager *manager)
+ {
+-        gdouble percentage;
+-        UpDeviceKind kind;
+-        gchar *icon_name;
++        GVariant *icon_var, *percentage;
++        char *label = NULL;
+ 
+-        g_return_if_fail (manager->priv->composite_device != NULL);
++        if (manager->priv->power_proxy == NULL)
++                return;
+ 
+-        g_object_get (manager->priv->composite_device,
+-                      "kind", &kind,
+-                      "icon-name", &icon_name,
+-                      "percentage", &percentage,
+-                      NULL);
++        icon_var = g_dbus_proxy_get_cached_property (manager->priv->power_proxy, "Icon");
++        percentage = g_dbus_proxy_get_cached_property (manager->priv->power_proxy, "Percentage");
+ 
+-        if (kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_BATTERY) {
+-                g_debug ("showing battery level OSD");
+-                show_osd (manager, icon_name, NULL, percentage);
+-        }
++        if (g_variant_get_double (percentage) >= 0.0)
++                label = g_strdup_printf ("%d %%", (int) g_variant_get_double (percentage));
+ 
+-        g_free (icon_name);
++        show_osd (manager, g_variant_get_string (icon_var, NULL),
++                  label, g_variant_get_double (percentage));
++        g_free (label);
+ }
+ 
+ static void
+@@ -2488,7 +2482,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
+         g_clear_object (&priv->power_proxy);
+         g_clear_object (&priv->power_screen_proxy);
+         g_clear_object (&priv->power_keyboard_proxy);
+-        g_clear_object (&priv->composite_device);
+         g_clear_object (&priv->mpris_controller);
+         g_clear_object (&priv->screencast_proxy);
+ 
+@@ -2712,7 +2705,6 @@ on_bus_gotten (GObject             *source_object,
+ {
+         GDBusConnection *connection;
+         GError *error = NULL;
+-        UpClient *up_client;
+ 
+         if (manager->priv->bus_cancellable == NULL ||
+             g_cancellable_is_cancelled (manager->priv->bus_cancellable)) {
+@@ -2775,10 +2767,6 @@ on_bus_gotten (GObject             *source_object,
+                           NULL,
+                           (GAsyncReadyCallback) power_keyboard_ready_cb,
+                           manager);
+-
+-        up_client = up_client_new ();
+-        manager->priv->composite_device = up_client_get_display_device (up_client);
+-        g_object_unref (up_client);
+ }
+ 
+ static void
+-- 
+2.1.0
+
+

=== added file 'debian/patches/revert_power_310.patch'
--- debian/patches/revert_power_310.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert_power_310.patch	2014-09-29 12:18:03 +0000
@@ -0,0 +1,3143 @@
+From 092b9692f6be1c5c57bee8146ff26f26fa360c0b Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Tue, 16 Sep 2014 08:51:23 +1000
+Subject: [PATCH] revert power panel to 3.10
+
+---
+ plugins/power/Makefile.am               |    2 +-
+ plugins/power/gpm-common.c              |  904 +++++++++++++++++++-
+ plugins/power/gpm-common.h              |   12 +-
+ plugins/power/gsd-power-constants.h     |    3 +-
+ plugins/power/gsd-power-manager.c       | 1394 +++++++++++++++++++++++++++----
+ plugins/power/gsd-power-manager.h       |    3 +-
+ plugins/power/gsd-power-plugin.c        |    3 +-
+ plugins/power/gsm-inhibitor-flag.h      |    4 +-
+ plugins/power/gsm-manager-logout-mode.h |    3 +-
+ plugins/power/gsm-presence-flag.h       |    4 +-
+ plugins/power/test.py                   |   22 +-
+ 11 files changed, 2158 insertions(+), 196 deletions(-)
+
+Index: gnome-settings-daemon/plugins/power/Makefile.am
+===================================================================
+--- gnome-settings-daemon.orig/plugins/power/Makefile.am
++++ gnome-settings-daemon/plugins/power/Makefile.am
+@@ -77,7 +77,7 @@ gsd_test_power_SOURCES =				\
+ 	test-power.c
+ 
+ gsd_test_power_CFLAGS = $(libpower_la_CFLAGS)
+-gsd_test_power_CPPFLAGS = $(libpower_la_CPPFLAGS) -DGSD_MOCK=1
++gsd_test_power_CPPFLAGS = $(libpower_la_CPPFLAGS) -DGSD_MOCK=1 -DGSD_ACTION_DELAY=1
+ gsd_test_power_LDADD =					\
+ 	-lm						\
+ 	$(top_builddir)/plugins/common/libcommon.la	\
+Index: gnome-settings-daemon/plugins/power/gpm-common.c
+===================================================================
+--- gnome-settings-daemon.orig/plugins/power/gpm-common.c
++++ gnome-settings-daemon/plugins/power/gpm-common.c
+@@ -98,6 +98,892 @@ gpm_get_timestring (guint time_secs)
+         return timestring;
+ }
+ 
++static const gchar *
++gpm_upower_get_device_icon_index (UpDevice *device)
++{
++        gdouble percentage;
++        /* get device properties */
++        g_object_get (device, "percentage", &percentage, NULL);
++        if (percentage < 10)
++                return "000";
++        else if (percentage < 30)
++                return "020";
++        else if (percentage < 50)
++                return "040";
++        else if (percentage < 70)
++                return "060";
++        else if (percentage < 90)
++                return "080";
++        return "100";
++}
++
++static const gchar *
++gpm_upower_get_device_icon_suffix (UpDevice *device)
++{
++        gdouble percentage;
++        /* get device properties */
++        g_object_get (device, "percentage", &percentage, NULL);
++        if (percentage < 10)
++                return "caution";
++        else if (percentage < 30)
++                return "low";
++        else if (percentage < 60)
++                return "good";
++        return "full";
++}
++
++GIcon *
++gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
++{
++        GString *filename;
++        gchar **iconnames;
++        const gchar *kind_str;
++        const gchar *suffix_str;
++        const gchar *index_str;
++        UpDeviceKind kind;
++        UpDeviceState state;
++        gboolean is_present;
++        gdouble percentage;
++        GIcon *icon = NULL;
++
++        g_return_val_if_fail (device != NULL, NULL);
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "state", &state,
++                      "percentage", &percentage,
++                      "is-present", &is_present,
++                      NULL);
++
++        /* get correct icon prefix */
++        filename = g_string_new (NULL);
++
++        /* get the icon from some simple rules */
++        if (kind == UP_DEVICE_KIND_LINE_POWER) {
++                if (use_symbolic)
++                        g_string_append (filename, "ac-adapter-symbolic;");
++                g_string_append (filename, "ac-adapter;");
++
++        } else if (kind == UP_DEVICE_KIND_MONITOR) {
++                if (use_symbolic)
++                        g_string_append (filename, "gpm-monitor-symbolic;");
++                g_string_append (filename, "gpm-monitor;");
++
++        } else {
++
++                kind_str = up_device_kind_to_string (kind);
++                if (!is_present) {
++                        if (use_symbolic)
++                                g_string_append (filename, "battery-missing-symbolic;");
++                        g_string_append_printf (filename, "gpm-%s-missing;", kind_str);
++                        g_string_append_printf (filename, "gpm-%s-000;", kind_str);
++                        g_string_append (filename, "battery-missing;");
++
++                } else {
++                        switch (state) {
++                        case UP_DEVICE_STATE_EMPTY:
++                                if (use_symbolic)
++                                        g_string_append (filename, "battery-empty-symbolic;");
++                                g_string_append_printf (filename, "gpm-%s-empty;", kind_str);
++                                g_string_append_printf (filename, "gpm-%s-000;", kind_str);
++                                g_string_append (filename, "battery-empty;");
++                                break;
++                        case UP_DEVICE_STATE_FULLY_CHARGED:
++                                if (use_symbolic) {
++                                        g_string_append (filename, "battery-full-charged-symbolic;");
++                                        g_string_append (filename, "battery-full-charging-symbolic;");
++                                }
++                                g_string_append_printf (filename, "gpm-%s-full;", kind_str);
++                                g_string_append_printf (filename, "gpm-%s-100;", kind_str);
++                                g_string_append (filename, "battery-full-charged;");
++                                g_string_append (filename, "battery-full-charging;");
++                                break;
++                        case UP_DEVICE_STATE_CHARGING:
++                        case UP_DEVICE_STATE_PENDING_CHARGE:
++                                suffix_str = gpm_upower_get_device_icon_suffix (device);
++                                index_str = gpm_upower_get_device_icon_index (device);
++                                if (use_symbolic)
++                                        g_string_append_printf (filename, "battery-%s-charging-symbolic;", suffix_str);
++                                g_string_append_printf (filename, "gpm-%s-%s-charging;", kind_str, index_str);
++                                g_string_append_printf (filename, "battery-%s-charging;", suffix_str);
++                                break;
++                        case UP_DEVICE_STATE_DISCHARGING:
++                        case UP_DEVICE_STATE_PENDING_DISCHARGE:
++                                suffix_str = gpm_upower_get_device_icon_suffix (device);
++                                index_str = gpm_upower_get_device_icon_index (device);
++                                if (use_symbolic)
++                                        g_string_append_printf (filename, "battery-%s-symbolic;", suffix_str);
++                                g_string_append_printf (filename, "gpm-%s-%s;", kind_str, index_str);
++                                g_string_append_printf (filename, "battery-%s;", suffix_str);
++                                break;
++                        default:
++                                if (use_symbolic)
++                                        g_string_append (filename, "battery-missing-symbolic;");
++                                g_string_append (filename, "gpm-battery-missing;");
++                                g_string_append (filename, "battery-missing;");
++                        }
++                }
++        }
++
++        /* nothing matched */
++        if (filename->len == 0) {
++                g_warning ("nothing matched, falling back to default icon");
++                g_string_append (filename, "dialog-warning;");
++        }
++
++        g_debug ("got filename: %s", filename->str);
++
++        iconnames = g_strsplit (filename->str, ";", -1);
++        icon = g_themed_icon_new_from_names (iconnames, -1);
++
++        g_strfreev (iconnames);
++        g_string_free (filename, TRUE);
++        return icon;
++}
++
++/**
++ * gpm_precision_round_down:
++ * @value: The input value
++ * @smallest: The smallest increment allowed
++ *
++ * 101, 10      100
++ * 95,  10      90
++ * 0,   10      0
++ * 112, 10      110
++ * 100, 10      100
++ **/
++static gint
++gpm_precision_round_down (gfloat value, gint smallest)
++{
++        gfloat division;
++        if (fabs (value) < 0.01)
++                return 0;
++        if (smallest == 0) {
++                g_warning ("divisor zero");
++                return 0;
++        }
++        division = (gfloat) value / (gfloat) smallest;
++        division = floorf (division);
++        division *= smallest;
++        return (gint) division;
++}
++
++gchar *
++gpm_upower_get_device_summary (UpDevice *device)
++{
++        const gchar *kind_desc = NULL;
++        const gchar *device_desc = NULL;
++        GString *description;
++        guint time_to_full_round;
++        guint time_to_empty_round;
++        gchar *time_to_full_str = NULL;
++        gchar *time_to_empty_str = NULL;
++        UpDeviceKind kind;
++        UpDeviceState state;
++        gdouble percentage;
++        gboolean is_present;
++        gint64 time_to_full;
++        gint64 time_to_empty;
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "state", &state,
++                      "percentage", &percentage,
++                      "is-present", &is_present,
++                      "time-to-full", &time_to_full,
++                      "time-to-empty", &time_to_empty,
++                      NULL);
++
++        description = g_string_new (NULL);
++        kind_desc = gpm_device_kind_to_localised_string (kind, 1);
++        device_desc = gpm_device_to_localised_string (device);
++
++        /* not installed */
++        if (!is_present) {
++                g_string_append (description, device_desc);
++                goto out;
++        }
++
++        /* don't display all the extra stuff for keyboards and mice */
++        if (kind == UP_DEVICE_KIND_MOUSE ||
++            kind == UP_DEVICE_KIND_KEYBOARD ||
++            kind == UP_DEVICE_KIND_PDA) {
++                g_string_append (description, kind_desc);
++                g_string_append_printf (description, " (%.0f%%)", percentage);
++                goto out;
++        }
++
++        /* we care if we are on AC */
++        if (kind == UP_DEVICE_KIND_PHONE) {
++                if (state == UP_DEVICE_STATE_CHARGING || !(state == UP_DEVICE_STATE_DISCHARGING)) {
++                        g_string_append (description, device_desc);
++                        g_string_append_printf (description, " (%.0f%%)", percentage);
++                        goto out;
++                }
++                g_string_append (description, kind_desc);
++                g_string_append_printf (description, " (%.0f%%)", percentage);
++                goto out;
++        }
++
++        /* precalculate so we don't get Unknown time remaining */
++        time_to_full_round = gpm_precision_round_down (time_to_full, GPM_UP_TIME_PRECISION);
++        time_to_empty_round = gpm_precision_round_down (time_to_empty, GPM_UP_TIME_PRECISION);
++
++        /* we always display "Laptop battery 16 minutes remaining" as we need to clarify what device we are refering to */
++        if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++
++                g_string_append (description, device_desc);
++
++                if (kind == UP_DEVICE_KIND_BATTERY && time_to_empty_round > GPM_UP_TEXT_MIN_TIME) {
++                        time_to_empty_str = gpm_get_timestring (time_to_empty_round);
++                        g_string_append (description, " - ");
++                        /* TRANSLATORS: The laptop battery is charged, and we know a time.
++                         * The parameter is the time, e.g. 7 hours 6 minutes */
++                        g_string_append_printf (description, _("provides %s laptop runtime"), time_to_empty_str);
++                }
++                goto out;
++        }
++        if (state == UP_DEVICE_STATE_DISCHARGING) {
++
++                if (time_to_empty_round > GPM_UP_TEXT_MIN_TIME) {
++                        time_to_empty_str = gpm_get_timestring (time_to_empty_round);
++                        /* TRANSLATORS: the device is discharging, and we have a time remaining
++                         * The first parameter is the device type, e.g. "Laptop battery" and
++                         * the second is the time, e.g. 7 hours 6 minutes */
++                        g_string_append_printf (description, _("%s %s remaining"),
++                                                kind_desc, time_to_empty_str);
++                        g_string_append_printf (description, " (%.0f%%)", percentage);
++                } else {
++                        g_string_append (description, device_desc);
++                        g_string_append_printf (description, " (%.0f%%)", percentage);
++                }
++                goto out;
++        }
++        if (state == UP_DEVICE_STATE_CHARGING) {
++
++                if (time_to_full_round > GPM_UP_TEXT_MIN_TIME &&
++                    time_to_empty_round > GPM_UP_TEXT_MIN_TIME) {
++
++                        /* display both discharge and charge time */
++                        time_to_full_str = gpm_get_timestring (time_to_full_round);
++                        time_to_empty_str = gpm_get_timestring (time_to_empty_round);
++
++                        /* TRANSLATORS: device is charging, and we have a time to full and a percentage
++                         * The first parameter is the device type, e.g. "Laptop battery" and
++                         * the second is the time, e.g. "7 hours 6 minutes" */
++                        g_string_append_printf (description, _("%s %s until charged"),
++                                                kind_desc, time_to_full_str);
++                        g_string_append_printf (description, " (%.0f%%)", percentage);
++
++                        g_string_append (description, " - ");
++                        /* TRANSLATORS: the device is charging, and we have a time to full and empty.
++                         * The parameter is a time string, e.g. "7 hours 6 minutes" */
++                        g_string_append_printf (description, _("provides %s battery runtime"),
++                                                time_to_empty_str);
++                } else if (time_to_full_round > GPM_UP_TEXT_MIN_TIME) {
++
++                        /* display only charge time */
++                        time_to_full_str = gpm_get_timestring (time_to_full_round);
++
++                        /* TRANSLATORS: device is charging, and we have a time to full and a percentage.
++                         * The first parameter is the device type, e.g. "Laptop battery" and
++                         * the second is the time, e.g. "7 hours 6 minutes" */
++                        g_string_append_printf (description, _("%s %s until charged"),
++                                                kind_desc, time_to_full_str);
++                        g_string_append_printf (description, " (%.0f%%)", percentage);
++                } else {
++                        g_string_append (description, device_desc);
++                        g_string_append_printf (description, " (%.0f%%)", percentage);
++                }
++                goto out;
++        }
++        if (state == UP_DEVICE_STATE_PENDING_DISCHARGE) {
++                g_string_append (description, device_desc);
++                g_string_append_printf (description, " (%.0f%%)", percentage);
++                goto out;
++        }
++        if (state == UP_DEVICE_STATE_PENDING_CHARGE) {
++                g_string_append (description, device_desc);
++                g_string_append_printf (description, " (%.0f%%)", percentage);
++                goto out;
++        }
++        if (state == UP_DEVICE_STATE_EMPTY) {
++                g_string_append (description, device_desc);
++                goto out;
++        }
++
++        /* fallback */
++        g_warning ("in an undefined state we are not charging or "
++                     "discharging and the batteries are also not charged");
++        g_string_append (description, device_desc);
++        g_string_append_printf (description, " (%.0f%%)", percentage);
++out:
++        g_free (time_to_full_str);
++        g_free (time_to_empty_str);
++        return g_string_free (description, FALSE);
++}
++
++gchar *
++gpm_upower_get_device_description (UpDevice *device)
++{
++        GString *details;
++        const gchar *text;
++        gchar *time_str;
++        UpDeviceKind kind;
++        UpDeviceState state;
++        UpDeviceTechnology technology;
++        gdouble percentage;
++        gdouble capacity;
++        gdouble energy;
++        gdouble energy_full;
++        gdouble energy_full_design;
++        gdouble energy_rate;
++        gboolean is_present;
++        gint64 time_to_full;
++        gint64 time_to_empty;
++        gchar *vendor = NULL;
++        gchar *serial = NULL;
++        gchar *model = NULL;
++
++        g_return_val_if_fail (device != NULL, NULL);
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "state", &state,
++                      "percentage", &percentage,
++                      "is-present", &is_present,
++                      "time-to-full", &time_to_full,
++                      "time-to-empty", &time_to_empty,
++                      "technology", &technology,
++                      "capacity", &capacity,
++                      "energy", &energy,
++                      "energy-full", &energy_full,
++                      "energy-full-design", &energy_full_design,
++                      "energy-rate", &energy_rate,
++                      "vendor", &vendor,
++                      "serial", &serial,
++                      "model", &model,
++                      NULL);
++
++        details = g_string_new ("");
++        text = gpm_device_kind_to_localised_string (kind, 1);
++        /* TRANSLATORS: the type of data, e.g. Laptop battery */
++        g_string_append_printf (details, "<b>%s</b> %s\n", _("Product:"), text);
++
++        if (!is_present) {
++                /* TRANSLATORS: device is missing */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Status:"), _("Missing"));
++        } else if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                /* TRANSLATORS: device is charged */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Status:"), _("Charged"));
++        } else if (state == UP_DEVICE_STATE_CHARGING) {
++                /* TRANSLATORS: device is charging */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Status:"), _("Charging"));
++        } else if (state == UP_DEVICE_STATE_DISCHARGING) {
++                /* TRANSLATORS: device is discharging */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Status:"), _("Discharging"));
++        }
++
++        if (percentage >= 0) {
++                /* TRANSLATORS: percentage */
++                g_string_append_printf (details, "<b>%s</b> %.1f%%\n", _("Percentage charge:"), percentage);
++        }
++        if (vendor) {
++                /* TRANSLATORS: manufacturer */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Vendor:"), vendor);
++        }
++        if (technology != UP_DEVICE_TECHNOLOGY_UNKNOWN) {
++                text = gpm_device_technology_to_localised_string (technology);
++                /* TRANSLATORS: how the battery is made, e.g. Lithium Ion */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Technology:"), text);
++        }
++        if (serial) {
++                /* TRANSLATORS: serial number of the battery */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Serial number:"), serial);
++        }
++        if (model) {
++                /* TRANSLATORS: model number of the battery */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Model:"), model);
++        }
++        if (time_to_full > 0) {
++                time_str = gpm_get_timestring (time_to_full);
++                /* TRANSLATORS: time to fully charged */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Charge time:"), time_str);
++                g_free (time_str);
++        }
++        if (time_to_empty > 0) {
++                time_str = gpm_get_timestring (time_to_empty);
++                /* TRANSLATORS: time to empty */
++                g_string_append_printf (details, "<b>%s</b> %s\n", _("Discharge time:"), time_str);
++                g_free (time_str);
++        }
++        if (capacity > 0) {
++                const gchar *condition;
++                if (capacity > 99) {
++                        /* TRANSLATORS: Excellent, Good, Fair and Poor are all related to battery Capacity */
++                        condition = _("Excellent");
++                } else if (capacity > 90) {
++                        condition = _("Good");
++                } else if (capacity > 70) {
++                        condition = _("Fair");
++                } else {
++                        condition = _("Poor");
++                }
++                /* TRANSLATORS: %.1f is a percentage and %s the condition (Excellent, Good, ...) */
++                g_string_append_printf (details, "<b>%s</b> %.1f%% (%s)\n",
++                                        _("Capacity:"), capacity, condition);
++        }
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++                if (energy > 0) {
++                        /* TRANSLATORS: current charge */
++                        g_string_append_printf (details, "<b>%s</b> %.1f Wh\n",
++                                                _("Current charge:"), energy);
++                }
++                if (energy_full > 0 &&
++                    energy_full_design != energy_full) {
++                        /* TRANSLATORS: last full is the charge the battery was seen to charge to */
++                        g_string_append_printf (details, "<b>%s</b> %.1f Wh\n",
++                                                _("Last full charge:"), energy_full);
++                }
++                if (energy_full_design > 0) {
++                        /* Translators:  */
++                        /* TRANSLATORS: Design charge is the amount of charge the battery is designed to have when brand new */
++                        g_string_append_printf (details, "<b>%s</b> %.1f Wh\n",
++                                                _("Design charge:"), energy_full_design);
++                }
++                if (energy_rate > 0) {
++                        /* TRANSLATORS: the charge or discharge rate */
++                        g_string_append_printf (details, "<b>%s</b> %.1f W\n",
++                                                _("Charge rate:"), energy_rate);
++                }
++        }
++        if (kind == UP_DEVICE_KIND_MOUSE ||
++            kind == UP_DEVICE_KIND_KEYBOARD) {
++                if (energy > 0) {
++                        /* TRANSLATORS: the current charge for CSR devices */
++                        g_string_append_printf (details, "<b>%s</b> %.0f/7\n",
++                                                _("Current charge:"), energy);
++                }
++                if (energy_full_design > 0) {
++                        /* TRANSLATORS: the design charge for CSR devices */
++                        g_string_append_printf (details, "<b>%s</b> %.0f/7\n",
++                                                _("Design charge:"), energy_full_design);
++                }
++        }
++        /* remove the last \n */
++        g_string_truncate (details, details->len-1);
++
++        g_free (vendor);
++        g_free (serial);
++        g_free (model);
++        return g_string_free (details, FALSE);
++}
++
++const gchar *
++gpm_device_kind_to_localised_string (UpDeviceKind kind, guint number)
++{
++        const gchar *text = NULL;
++        switch (kind) {
++        case UP_DEVICE_KIND_LINE_POWER:
++                /* TRANSLATORS: system power cord */
++                text = ngettext ("AC adapter", "AC adapters", number);
++                break;
++        case UP_DEVICE_KIND_BATTERY:
++                /* TRANSLATORS: laptop primary battery */
++                text = ngettext ("Laptop battery", "Laptop batteries", number);
++                break;
++        case UP_DEVICE_KIND_UPS:
++                /* TRANSLATORS: battery-backed AC power source */
++                text = ngettext ("UPS", "UPSs", number);
++                break;
++        case UP_DEVICE_KIND_MONITOR:
++                /* TRANSLATORS: a monitor is a device to measure voltage and current */
++                text = ngettext ("Monitor", "Monitors", number);
++                break;
++        case UP_DEVICE_KIND_MOUSE:
++                /* TRANSLATORS: wireless mice with internal batteries */
++                text = ngettext ("Mouse", "Mice", number);
++                break;
++        case UP_DEVICE_KIND_KEYBOARD:
++                /* TRANSLATORS: wireless keyboard with internal battery */
++                text = ngettext ("Keyboard", "Keyboards", number);
++                break;
++        case UP_DEVICE_KIND_PDA:
++                /* TRANSLATORS: portable device */
++                text = ngettext ("PDA", "PDAs", number);
++                break;
++        case UP_DEVICE_KIND_PHONE:
++                /* TRANSLATORS: cell phone (mobile...) */
++                text = ngettext ("Cell phone", "Cell phones", number);
++                break;
++#if UP_CHECK_VERSION(0,9,5)
++        case UP_DEVICE_KIND_MEDIA_PLAYER:
++                /* TRANSLATORS: media player, mp3 etc */
++                text = ngettext ("Media player", "Media players", number);
++                break;
++        case UP_DEVICE_KIND_TABLET:
++                /* TRANSLATORS: tablet device */
++                text = ngettext ("Tablet", "Tablets", number);
++                break;
++        case UP_DEVICE_KIND_COMPUTER:
++                /* TRANSLATORS: tablet device */
++                text = ngettext ("Computer", "Computers", number);
++                break;
++#endif
++        default:
++                g_warning ("enum unrecognised: %i", kind);
++                text = up_device_kind_to_string (kind);
++        }
++        return text;
++}
++
++const gchar *
++gpm_device_kind_to_icon (UpDeviceKind kind)
++{
++        const gchar *icon = NULL;
++        switch (kind) {
++        case UP_DEVICE_KIND_LINE_POWER:
++                icon = "ac-adapter";
++                break;
++        case UP_DEVICE_KIND_BATTERY:
++                icon = "battery";
++                break;
++        case UP_DEVICE_KIND_UPS:
++                icon = "network-wired";
++                break;
++        case UP_DEVICE_KIND_MONITOR:
++                icon = "application-certificate";
++                break;
++        case UP_DEVICE_KIND_MOUSE:
++                icon = "input-mouse";
++                break;
++        case UP_DEVICE_KIND_KEYBOARD:
++                icon = "input-keyboard";
++                break;
++        case UP_DEVICE_KIND_PDA:
++                icon = "pda";
++                break;
++        case UP_DEVICE_KIND_PHONE:
++                icon = "phone";
++                break;
++#if UP_CHECK_VERSION(0,9,5)
++        case UP_DEVICE_KIND_MEDIA_PLAYER:
++                icon = "multimedia-player";
++                break;
++        case UP_DEVICE_KIND_TABLET:
++                icon = "input-tablet";
++                break;
++        case UP_DEVICE_KIND_COMPUTER:
++                icon = "computer-apple-ipad";
++                break;
++#endif
++        default:
++                g_warning ("enum unrecognised: %i", kind);
++                icon = "gtk-help";
++        }
++        return icon;
++}
++
++const gchar *
++gpm_device_technology_to_localised_string (UpDeviceTechnology technology_enum)
++{
++        const gchar *technology = NULL;
++        switch (technology_enum) {
++        case UP_DEVICE_TECHNOLOGY_LITHIUM_ION:
++                /* TRANSLATORS: battery technology */
++                technology = _("Lithium Ion");
++                break;
++        case UP_DEVICE_TECHNOLOGY_LITHIUM_POLYMER:
++                /* TRANSLATORS: battery technology */
++                technology = _("Lithium Polymer");
++                break;
++        case UP_DEVICE_TECHNOLOGY_LITHIUM_IRON_PHOSPHATE:
++                /* TRANSLATORS: battery technology */
++                technology = _("Lithium Iron Phosphate");
++                break;
++        case UP_DEVICE_TECHNOLOGY_LEAD_ACID:
++                /* TRANSLATORS: battery technology */
++                technology = _("Lead acid");
++                break;
++        case UP_DEVICE_TECHNOLOGY_NICKEL_CADMIUM:
++                /* TRANSLATORS: battery technology */
++                technology = _("Nickel Cadmium");
++                break;
++        case UP_DEVICE_TECHNOLOGY_NICKEL_METAL_HYDRIDE:
++                /* TRANSLATORS: battery technology */
++                technology = _("Nickel metal hydride");
++                break;
++        case UP_DEVICE_TECHNOLOGY_UNKNOWN:
++                /* TRANSLATORS: battery technology */
++                technology = _("Unknown technology");
++                break;
++        default:
++                g_assert_not_reached ();
++                break;
++        }
++        return technology;
++}
++
++const gchar *
++gpm_device_state_to_localised_string (UpDeviceState state)
++{
++        const gchar *state_string = NULL;
++
++        switch (state) {
++        case UP_DEVICE_STATE_CHARGING:
++                /* TRANSLATORS: battery state */
++                state_string = _("Charging");
++                break;
++        case UP_DEVICE_STATE_DISCHARGING:
++                /* TRANSLATORS: battery state */
++                state_string = _("Discharging");
++                break;
++        case UP_DEVICE_STATE_EMPTY:
++                /* TRANSLATORS: battery state */
++                state_string = _("Empty");
++                break;
++        case UP_DEVICE_STATE_FULLY_CHARGED:
++                /* TRANSLATORS: battery state */
++                state_string = _("Charged");
++                break;
++        case UP_DEVICE_STATE_PENDING_CHARGE:
++                /* TRANSLATORS: battery state */
++                state_string = _("Waiting to charge");
++                break;
++        case UP_DEVICE_STATE_PENDING_DISCHARGE:
++                /* TRANSLATORS: battery state */
++                state_string = _("Waiting to discharge");
++                break;
++        default:
++                g_assert_not_reached ();
++                break;
++        }
++        return state_string;
++}
++
++const gchar *
++gpm_device_to_localised_string (UpDevice *device)
++{
++        UpDeviceState state;
++        UpDeviceKind kind;
++        gboolean present;
++
++        /* get device parameters */
++        g_object_get (device,
++                      "is-present", &present,
++                      "kind", &kind,
++                      "state", &state,
++                      NULL);
++
++        /* laptop battery */
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++
++                if (!present) {
++                        /* TRANSLATORS: device not present */
++                        return _("Laptop battery not present");
++                }
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Laptop battery is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Laptop battery is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Laptop battery is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Laptop battery is charged");
++                }
++                if (state == UP_DEVICE_STATE_PENDING_CHARGE) {
++                        /* TRANSLATORS: battery state */
++                        return _("Laptop battery is waiting to charge");
++                }
++                if (state == UP_DEVICE_STATE_PENDING_DISCHARGE) {
++                        /* TRANSLATORS: battery state */
++                        return _("Laptop battery is waiting to discharge");
++                }
++        }
++
++        /* UPS */
++        if (kind == UP_DEVICE_KIND_UPS) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("UPS is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("UPS is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("UPS is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("UPS is charged");
++                }
++        }
++
++        /* mouse */
++        if (kind == UP_DEVICE_KIND_MOUSE) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Mouse is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Mouse is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Mouse is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Mouse is charged");
++                }
++        }
++
++        /* keyboard */
++        if (kind == UP_DEVICE_KIND_KEYBOARD) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Keyboard is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Keyboard is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Keyboard is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Keyboard is charged");
++                }
++        }
++
++        /* PDA */
++        if (kind == UP_DEVICE_KIND_PDA) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("PDA is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("PDA is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("PDA is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("PDA is charged");
++                }
++        }
++
++        /* phone */
++        if (kind == UP_DEVICE_KIND_PHONE) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Cell phone is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Cell phone is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Cell phone is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Cell phone is charged");
++                }
++        }
++#if UP_CHECK_VERSION(0,9,5)
++
++        /* media player */
++        if (kind == UP_DEVICE_KIND_MEDIA_PLAYER) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Media player is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Media player is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Media player is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Media player is charged");
++                }
++        }
++
++        /* tablet */
++        if (kind == UP_DEVICE_KIND_TABLET) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Tablet is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Tablet is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Tablet is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Tablet is charged");
++                }
++        }
++
++        /* computer */
++        if (kind == UP_DEVICE_KIND_COMPUTER) {
++
++                if (state == UP_DEVICE_STATE_CHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Computer is charging");
++                }
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        /* TRANSLATORS: battery state */
++                        return _("Computer is discharging");
++                }
++                if (state == UP_DEVICE_STATE_EMPTY) {
++                        /* TRANSLATORS: battery state */
++                        return _("Computer is empty");
++                }
++                if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
++                        /* TRANSLATORS: battery state */
++                        return _("Computer is charged");
++                }
++        }
++#endif
++
++        return gpm_device_kind_to_localised_string (kind, 1);
++}
++
+ static gboolean
+ parse_vm_kernel_cmdline (gboolean *is_virtual_machine)
+ {
+@@ -576,7 +1462,7 @@ backlight_get_max (GnomeRRScreen *rr_scr
+ 
+ gboolean
+ backlight_set_percentage (GnomeRRScreen *rr_screen,
+-                          gint *value,
++                          guint value,
+                           GError **error)
+ {
+         GnomeRROutput *output;
+@@ -587,23 +1473,17 @@ backlight_set_percentage (GnomeRRScreen
+ 
+         /* prefer xbacklight */
+         output = get_primary_output (rr_screen);
+-        if (output != NULL) {
+-                if (!gnome_rr_output_set_backlight (output, *value, error))
+-                        return ret;
+-                *value = gnome_rr_output_get_backlight (output);
+-                return TRUE;
+-        }
++        if (output != NULL)
++                return gnome_rr_output_set_backlight (output, value, error);
+ 
+         /* fall back to the polkit helper */
+         max = backlight_helper_get_value ("get-max-brightness", error);
+         if (max < 0)
+                 return ret;
+-        discrete = PERCENTAGE_TO_ABS (min, max, *value);
++        discrete = PERCENTAGE_TO_ABS (min, max, value);
+         ret = backlight_helper_set_value ("set-brightness",
+                                           discrete,
+                                           error);
+-        if (ret)
+-                *value = ABS_TO_PERCENTAGE (min, max, discrete);
+ 
+         return ret;
+ }
+@@ -639,7 +1519,7 @@ backlight_step_up (GnomeRRScreen *rr_scr
+                 now = gnome_rr_output_get_backlight (output);
+                 if (now < 0)
+                        return percentage_value;
+-                step = MAX(gnome_rr_output_get_min_backlight_step (output), BRIGHTNESS_STEP_AMOUNT(max - min + 1));
++                step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
+                 discrete = MIN (now + step, max);
+                 ret = gnome_rr_output_set_backlight (output,
+                                                      discrete,
+@@ -698,7 +1578,7 @@ backlight_step_down (GnomeRRScreen *rr_s
+                 now = gnome_rr_output_get_backlight (output);
+                 if (now < 0)
+                        return percentage_value;
+-                step = MAX (gnome_rr_output_get_min_backlight_step (output), BRIGHTNESS_STEP_AMOUNT (max - min + 1));
++                step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
+                 discrete = MAX (now - step, 0);
+                 ret = gnome_rr_output_set_backlight (output,
+                                                      discrete,
+Index: gnome-settings-daemon/plugins/power/gpm-common.h
+===================================================================
+--- gnome-settings-daemon.orig/plugins/power/gpm-common.h
++++ gnome-settings-daemon/plugins/power/gpm-common.h
+@@ -29,6 +29,16 @@ G_BEGIN_DECLS
+ 
+ /* UPower helpers */
+ gchar           *gpm_get_timestring                     (guint           time);
++const gchar     *gpm_device_to_localised_string         (UpDevice       *device);
++const gchar     *gpm_device_kind_to_localised_string    (UpDeviceKind    kind,
++                                                         guint           number);
++const gchar     *gpm_device_kind_to_icon                (UpDeviceKind    kind);
++const gchar     *gpm_device_technology_to_localised_string (UpDeviceTechnology technology_enum);
++const gchar     *gpm_device_state_to_localised_string   (UpDeviceState   state);
++GIcon           *gpm_upower_get_device_icon             (UpDevice       *device,
++                                                         gboolean        use_symbolic);
++gchar           *gpm_upower_get_device_summary          (UpDevice       *device);
++gchar           *gpm_upower_get_device_description      (UpDevice       *device);
+ 
+ /* Power helpers */
+ gboolean         gsd_power_is_hardware_a_vm             (void);
+@@ -50,7 +60,7 @@ int              backlight_get_percentag
+ int              backlight_get_min                      (GnomeRRScreen *rr_screen);
+ int              backlight_get_max                      (GnomeRRScreen *rr_screen, GError **error);
+ gboolean         backlight_set_percentage               (GnomeRRScreen *rr_screen,
+-                                                         gint *value,
++                                                         guint value,
+                                                          GError **error);
+ int              backlight_step_up                      (GnomeRRScreen *rr_screen, GError **error);
+ int              backlight_step_down                    (GnomeRRScreen *rr_screen, GError **error);
+Index: gnome-settings-daemon/plugins/power/gsd-power-constants.h
+===================================================================
+--- gnome-settings-daemon.orig/plugins/power/gsd-power-constants.h
++++ gnome-settings-daemon/plugins/power/gsd-power-constants.h
+@@ -13,7 +13,8 @@
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+  */
+ 
+Index: gnome-settings-daemon/plugins/power/gsd-power-manager.c
+===================================================================
+--- gnome-settings-daemon.orig/plugins/power/gsd-power-manager.c
++++ gnome-settings-daemon/plugins/power/gsd-power-manager.c
+@@ -16,7 +16,8 @@
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+  */
+ 
+@@ -71,17 +72,31 @@
+ #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT          10 * 1000 /* ms */
+ #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG           30 * 1000 /* ms */
+ 
++#define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
++
+ #define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
+ #define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
+ #define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
+ 
+-/* Time between notifying the user about a critical action and the action itself in UPower. */
++/* Time between notifying the user about a critical action and executing it.
++ * This can be changed with the GSD_ACTION_DELAY constant. */
++#ifndef GSD_ACTION_DELAY
+ #define GSD_ACTION_DELAY 20
+-/* And the time before we stop the warning sound */
+-#define GSD_STOP_SOUND_DELAY GSD_ACTION_DELAY - 2
++#endif /* !GSD_ACTION_DELAY */
+ 
+ static const gchar introspection_xml[] =
+ "<node>"
++"  <interface name='org.gnome.SettingsDaemon.Power'>"
++"    <property name='Icon' type='s' access='read'/>"
++"    <property name='Tooltip' type='s' access='read'/>"
++"    <property name='Percentage' type='d' access='read'/>"
++"    <method name='GetPrimaryDevice'>"
++"      <arg name='device' type='(susdut)' direction='out' />"
++"    </method>"
++"    <method name='GetDevices'>"
++"      <arg name='devices' type='a(susdut)' direction='out' />"
++"    </method>"
++"  </interface>"
+ "  <interface name='org.gnome.SettingsDaemon.Power.Screen'>"
+ "    <property name='Brightness' type='i' access='readwrite'/>"
+ "    <method name='StepUp'>"
+@@ -130,6 +145,14 @@ struct GsdPowerManagerPrivate
+         GSettings               *settings_screensaver;
+         GSettings               *settings_xrandr;
+ 
++        gboolean                 use_time_primary;
++        guint                    action_percentage;
++        guint                    action_time;
++        guint                    critical_percentage;
++        guint                    critical_time;
++        guint                    low_percentage;
++        guint                    low_time;
++
+         /* Screensaver */
+         GsdScreenSaver          *screensaver_proxy;
+         gboolean                 screensaver_active;
+@@ -138,12 +161,15 @@ struct GsdPowerManagerPrivate
+         gboolean                 lid_is_present;
+         gboolean                 lid_is_closed;
+         UpClient                *up_client;
++        gchar                   *previous_summary;
++        GIcon                   *previous_icon;
+         GPtrArray               *devices_array;
+         UpDevice                *device_composite;
+         GnomeRRScreen           *rr_screen;
+         NotifyNotification      *notification_ups_discharging;
+         NotifyNotification      *notification_low;
+         NotifyNotification      *notification_sleep_warning;
++        NotifyNotification      *notification_logout_warning;
+         GsdPowerActionType       sleep_action_type;
+         gboolean                 battery_is_low; /* laptop battery low, or UPS discharging */
+ 
+@@ -191,7 +217,11 @@ enum {
+ static void     gsd_power_manager_class_init  (GsdPowerManagerClass *klass);
+ static void     gsd_power_manager_init        (GsdPowerManager      *power_manager);
+ 
+-static void      engine_device_warning_changed_cb (UpDevice *device, GParamSpec *pspec, GsdPowerManager *manager);
++static void      engine_device_changed_cb (UpClient *client, UpDevice *device, GsdPowerManager *manager);
++static void      engine_update_composite_device (GsdPowerManager *manager);
++static GIcon    *engine_get_icon (GsdPowerManager *manager);
++static gchar    *engine_get_summary (GsdPowerManager *manager);
++static gdouble   engine_get_percentage (GsdPowerManager *manager);
+ static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
+ static void      uninhibit_lid_switch (GsdPowerManager *manager);
+ static void      stop_inhibit_lid_switch_timer (GsdPowerManager *manager);
+@@ -222,24 +252,738 @@ notify_close_if_showing (NotifyNotificat
+         g_clear_object (notification);
+ }
+ 
++typedef enum {
++        WARNING_NONE            = 0,
++        WARNING_DISCHARGING     = 1,
++        WARNING_LOW             = 2,
++        WARNING_CRITICAL        = 3,
++        WARNING_ACTION          = 4
++} GsdPowerManagerWarning;
++
++static GVariant *
++engine_get_icon_property_variant (GsdPowerManager  *manager)
++{
++        GIcon *icon;
++        GVariant *retval;
++
++        icon = engine_get_icon (manager);
++        if (icon != NULL) {
++                char *str;
++                str = g_icon_to_string (icon);
++                g_object_unref (icon);
++                retval = g_variant_new_string (str);
++                g_free (str);
++        } else {
++                retval = g_variant_new_string ("");
++        }
++        return retval;
++}
++
++static GVariant *
++engine_get_tooltip_property_variant (GsdPowerManager  *manager)
++{
++        char *tooltip;
++        GVariant *retval;
++
++        tooltip = engine_get_summary (manager);
++        retval = g_variant_new_string (tooltip != NULL ? tooltip : "");
++        g_free (tooltip);
++
++        return retval;
++}
++
+ static void
+-engine_device_add (GsdPowerManager *manager, UpDevice *device)
++engine_emit_changed (GsdPowerManager *manager,
++                     gboolean         icon_changed,
++                     gboolean         state_changed)
++{
++        GVariantBuilder props_builder;
++        GVariant *props_changed = NULL;
++        GError *error = NULL;
++
++        /* not yet connected to the bus */
++        if (manager->priv->connection == NULL)
++                return;
++
++        g_variant_builder_init (&props_builder, G_VARIANT_TYPE ("a{sv}"));
++
++        if (icon_changed)
++                g_variant_builder_add (&props_builder, "{sv}", "Icon",
++                                       engine_get_icon_property_variant (manager));
++        if (state_changed)
++                g_variant_builder_add (&props_builder, "{sv}", "Tooltip",
++                                       engine_get_tooltip_property_variant (manager));
++        g_variant_builder_add (&props_builder, "{sv}", "Percentage",
++                               g_variant_new_double (engine_get_percentage (manager)));
++
++        props_changed = g_variant_new ("(s@a{sv}@as)", GSD_POWER_DBUS_INTERFACE,
++                                       g_variant_builder_end (&props_builder),
++                                       g_variant_new_strv (NULL, 0));
++        g_variant_ref_sink (props_changed);
++
++        if (!g_dbus_connection_emit_signal (manager->priv->connection,
++                                            NULL,
++                                            GSD_POWER_DBUS_PATH,
++                                            "org.freedesktop.DBus.Properties",
++                                            "PropertiesChanged",
++                                            props_changed,
++                                            &error))
++                goto out;
++
++ out:
++        if (error) {
++                g_warning ("%s", error->message);
++                g_clear_error (&error);
++        }
++        if (props_changed)
++                g_variant_unref (props_changed);
++}
++
++static GsdPowerManagerWarning
++engine_get_warning_csr (GsdPowerManager *manager, UpDevice *device)
++{
++        gdouble percentage;
++
++        /* get device properties */
++        g_object_get (device, "percentage", &percentage, NULL);
++
++        if (percentage < 26.0f)
++                return WARNING_LOW;
++        else if (percentage < 13.0f)
++                return WARNING_CRITICAL;
++        return WARNING_NONE;
++}
++
++static GsdPowerManagerWarning
++engine_get_warning_percentage (GsdPowerManager *manager, UpDevice *device)
++{
++        gdouble percentage;
++
++        /* get device properties */
++        g_object_get (device, "percentage", &percentage, NULL);
++
++        if (percentage <= manager->priv->action_percentage)
++                return WARNING_ACTION;
++        if (percentage <= manager->priv->critical_percentage)
++                return WARNING_CRITICAL;
++        if (percentage <= manager->priv->low_percentage)
++                return WARNING_LOW;
++        return WARNING_NONE;
++}
++
++static GsdPowerManagerWarning
++engine_get_warning_time (GsdPowerManager *manager, UpDevice *device)
++{
++        UpDeviceKind kind;
++        gint64 time_to_empty;
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "time-to-empty", &time_to_empty,
++                      NULL);
++
++        /* this is probably an error condition */
++        if (time_to_empty == 0) {
++                g_debug ("time zero, falling back to percentage for %s",
++                         up_device_kind_to_string (kind));
++                return engine_get_warning_percentage (manager, device);
++        }
++
++        if (time_to_empty <= manager->priv->action_time)
++                return WARNING_ACTION;
++        if (time_to_empty <= manager->priv->critical_time)
++                return WARNING_CRITICAL;
++        if (time_to_empty <= manager->priv->low_time)
++                return WARNING_LOW;
++        return WARNING_NONE;
++}
++
++/**
++ * This gets the possible engine state for the device according to the
++ * policy, which could be per-percent, or per-time.
++ **/
++static GsdPowerManagerWarning
++engine_get_warning (GsdPowerManager *manager, UpDevice *device)
++{
++        UpDeviceKind kind;
++        UpDeviceState state;
++        GsdPowerManagerWarning warning_type;
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "state", &state,
++                      NULL);
++
++        /* default to no engine */
++        warning_type = WARNING_NONE;
++
++        /* if the device in question is on ac, don't give a warning */
++        if (state == UP_DEVICE_STATE_CHARGING)
++                goto out;
++
++        if (kind == UP_DEVICE_KIND_MOUSE ||
++            kind == UP_DEVICE_KIND_KEYBOARD) {
++
++                warning_type = engine_get_warning_csr (manager, device);
++
++        } else if (kind == UP_DEVICE_KIND_UPS ||
++                   kind == UP_DEVICE_KIND_MEDIA_PLAYER ||
++                   kind == UP_DEVICE_KIND_TABLET ||
++                   kind == UP_DEVICE_KIND_COMPUTER ||
++                   kind == UP_DEVICE_KIND_PDA) {
++
++                warning_type = engine_get_warning_percentage (manager, device);
++
++        } else if (kind == UP_DEVICE_KIND_PHONE) {
++
++                warning_type = engine_get_warning_percentage (manager, device);
++
++        } else if (kind == UP_DEVICE_KIND_BATTERY) {
++                /* only use the time when it is accurate, and settings is not disabled */
++                if (manager->priv->use_time_primary)
++                        warning_type = engine_get_warning_time (manager, device);
++                else
++                        warning_type = engine_get_warning_percentage (manager, device);
++        }
++
++        /* If we have no important engines, we should test for discharging */
++        if (warning_type == WARNING_NONE) {
++                if (state == UP_DEVICE_STATE_DISCHARGING)
++                        warning_type = WARNING_DISCHARGING;
++        }
++
++ out:
++        return warning_type;
++}
++
++static gchar *
++engine_get_summary (GsdPowerManager *manager)
++{
++        guint i;
++        GPtrArray *array;
++        UpDevice *device;
++        UpDeviceState state;
++        GString *tooltip = NULL;
++        gchar *part;
++        gboolean is_present;
++
++
++        /* need to get AC state */
++        tooltip = g_string_new ("");
++
++        /* do we have specific device types? */
++        array = manager->priv->devices_array;
++        for (i=0;i<array->len;i++) {
++                device = g_ptr_array_index (array, i);
++                g_object_get (device,
++                              "is-present", &is_present,
++                              "state", &state,
++                              NULL);
++                if (!is_present)
++                        continue;
++                if (state == UP_DEVICE_STATE_EMPTY)
++                        continue;
++                part = gpm_upower_get_device_summary (device);
++                if (part != NULL)
++                        g_string_append_printf (tooltip, "%s\n", part);
++                g_free (part);
++        }
++
++        /* remove the last \n */
++        g_string_truncate (tooltip, tooltip->len-1);
++
++        g_debug ("tooltip: %s", tooltip->str);
++
++        return g_string_free (tooltip, FALSE);
++}
++
++static gdouble
++engine_get_percentage (GsdPowerManager *manager)
++{
++        gboolean is_present;
++        gdouble percentage;
++
++        g_object_get (manager->priv->device_composite,
++                      "percentage", &percentage,
++                      "is-present", &is_present,
++                      NULL);
++
++        if (is_present)
++                return percentage;
++        else
++                return -1;
++}
++
++static GIcon *
++engine_get_icon_priv (GsdPowerManager *manager,
++                      UpDeviceKind device_kind,
++                      GsdPowerManagerWarning warning,
++                      gboolean use_state)
+ {
++        guint i;
++        GPtrArray *array;
++        UpDevice *device;
++        GsdPowerManagerWarning warning_temp;
+         UpDeviceKind kind;
++        UpDeviceState state;
++        gboolean is_present;
+ 
+-        /* Batteries and UPSes are already handled through
+-         * the composite battery */
+-        g_object_get (device, "kind", &kind, NULL);
+-        if (kind == UP_DEVICE_KIND_BATTERY ||
+-            kind == UP_DEVICE_KIND_UPS ||
+-            kind == UP_DEVICE_KIND_LINE_POWER)
++        /* do we have specific device types? */
++        array = manager->priv->devices_array;
++        for (i=0;i<array->len;i++) {
++                device = g_ptr_array_index (array, i);
++
++                /* get device properties */
++                g_object_get (device,
++                              "kind", &kind,
++                              "state", &state,
++                              "is-present", &is_present,
++                              NULL);
++
++                /* if battery then use composite device to cope with multiple batteries */
++                if (kind == UP_DEVICE_KIND_BATTERY)
++                        device = manager->priv->device_composite;
++
++                warning_temp = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(device),
++                                                                  "engine-warning-old"));
++                if (kind == device_kind && is_present) {
++                        if (warning != WARNING_NONE) {
++                                if (warning_temp == warning)
++                                        return gpm_upower_get_device_icon (device, TRUE);
++                                continue;
++                        }
++                        if (use_state) {
++                                if (state == UP_DEVICE_STATE_CHARGING ||
++                                    state == UP_DEVICE_STATE_DISCHARGING)
++                                        return gpm_upower_get_device_icon (device, TRUE);
++                                continue;
++                        }
++                        return gpm_upower_get_device_icon (device, TRUE);
++                }
++        }
++        return NULL;
++}
++
++static GIcon *
++engine_get_icon (GsdPowerManager *manager)
++{
++        GIcon *icon = NULL;
++
++
++        /* we try CRITICAL: BATTERY, UPS */
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_BATTERY, WARNING_CRITICAL, FALSE);
++        if (icon != NULL)
++                return icon;
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_UPS, WARNING_CRITICAL, FALSE);
++        if (icon != NULL)
++                return icon;
++
++        /* we try CRITICAL: BATTERY, UPS */
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_BATTERY, WARNING_LOW, FALSE);
++        if (icon != NULL)
++                return icon;
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_UPS, WARNING_LOW, FALSE);
++        if (icon != NULL)
++                return icon;
++
++        /* we try (DIS)CHARGING: BATTERY, UPS */
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_BATTERY, WARNING_NONE, TRUE);
++        if (icon != NULL)
++                return icon;
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_UPS, WARNING_NONE, TRUE);
++        if (icon != NULL)
++                return icon;
++
++        /* we try PRESENT: BATTERY, UPS */
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_BATTERY, WARNING_NONE, FALSE);
++        if (icon != NULL)
++                return icon;
++        icon = engine_get_icon_priv (manager, UP_DEVICE_KIND_UPS, WARNING_NONE, FALSE);
++        if (icon != NULL)
++                return icon;
++
++        /* do not show an icon */
++        return NULL;
++}
++
++static gboolean
++engine_recalculate_state_icon (GsdPowerManager *manager)
++{
++        GIcon *icon;
++
++        /* show a different icon if we are disconnected */
++        icon = engine_get_icon (manager);
++
++        if (g_icon_equal (icon, manager->priv->previous_icon)) {
++                g_clear_object (&icon);
++                return FALSE;
++        }
++
++        g_clear_object (&manager->priv->previous_icon);
++        manager->priv->previous_icon = icon;
++
++        g_debug ("Icon changed");
++
++        return TRUE;
++}
++
++static gboolean
++engine_recalculate_state_summary (GsdPowerManager *manager)
++{
++        char *summary;
++
++        summary = engine_get_summary (manager);
++
++        if (g_strcmp0 (manager->priv->previous_summary, summary) == 0) {
++                g_free (summary);
++                return FALSE;
++        }
++
++        g_free (manager->priv->previous_summary);
++        manager->priv->previous_summary = summary;
++
++        g_debug ("Summary changed");
++
++        return TRUE;
++}
++
++static void
++engine_recalculate_state (GsdPowerManager *manager)
++{
++        gboolean icon_changed = FALSE;
++        gboolean state_changed = FALSE;
++
++        icon_changed = engine_recalculate_state_icon (manager);
++        state_changed = engine_recalculate_state_summary (manager);
++
++        /* only emit if the icon or summary has changed */
++        if (icon_changed || state_changed)
++                engine_emit_changed (manager, icon_changed, state_changed);
++}
++
++static void
++engine_update_composite_device (GsdPowerManager *manager)
++{
++        guint i;
++        gdouble percentage = 0.0;
++        gdouble energy_total = 0.0;
++        gdouble energy_full_total = 0.0;
++        gdouble energy_rate_total = 0.0;
++        gint64 time_to_empty_total = 0;
++        gint64 time_to_full_total = 0;
++        guint battery_devices = 0;
++        gboolean is_charging = FALSE;
++        gboolean is_discharging = FALSE;
++        gboolean is_fully_charged = TRUE;
++        GPtrArray *array;
++        UpDevice *device;
++        UpDeviceState state;
++
++        /* update the composite device */
++        array = manager->priv->devices_array;
++        for (i=0;i<array->len;i++) {
++                UpDeviceKind kind;
++                gdouble energy = 0.0;
++                gdouble energy_full = 0.0;
++                gdouble energy_rate = 0.0;
++                gint64 time_to_empty = 0;
++                gint64 time_to_full = 0;
++
++                device = g_ptr_array_index (array, i);
++                g_object_get (device,
++                              "kind", &kind,
++                              "state", &state,
++                              "energy", &energy,
++                              "energy-full", &energy_full,
++                              "energy-rate", &energy_rate,
++                              "time-to-empty", &time_to_empty,
++                              "time-to-full", &time_to_full,
++                              NULL);
++                if (kind != UP_DEVICE_KIND_BATTERY)
++                        continue;
++
++                /* one of these will be charging or discharging */
++                if (state == UP_DEVICE_STATE_CHARGING)
++                        is_charging = TRUE;
++                else if (state == UP_DEVICE_STATE_DISCHARGING)
++                        is_discharging = TRUE;
++                else if (state != UP_DEVICE_STATE_FULLY_CHARGED)
++                        is_fully_charged = FALSE;
++
++                /* sum up composite */
++                energy_total += energy;
++                energy_full_total += energy_full;
++                energy_rate_total += energy_rate;
++                time_to_empty_total += time_to_empty;
++                time_to_full_total += time_to_full;
++                battery_devices++;
++        }
++
++        if (battery_devices == 0) {
++                state = UP_DEVICE_STATE_UNKNOWN;
++                goto out;
++        }
++
++        /* use percentage weighted for each battery capacity */
++        if (energy_full_total > 0.0)
++                percentage = 100.0 * energy_total / energy_full_total;
++
++        /* set composite state */
++        if (is_discharging)
++                state = UP_DEVICE_STATE_DISCHARGING;
++        else if (is_charging)
++                state = UP_DEVICE_STATE_CHARGING;
++        else if (is_fully_charged)
++                state = UP_DEVICE_STATE_FULLY_CHARGED;
++        else
++                state = UP_DEVICE_STATE_UNKNOWN;
++
++        if (battery_devices == 1)
++                goto out;
++
++        /* calculate a quick and dirty time remaining value */
++        if (energy_rate_total > 0) {
++                if (state == UP_DEVICE_STATE_DISCHARGING)
++                        time_to_empty_total = 3600 * (energy_total / energy_rate_total);
++                else if (state == UP_DEVICE_STATE_CHARGING)
++                        time_to_full_total = 3600 * ((energy_full_total - energy_total) / energy_rate_total);
++        }
++
++ out:
++        g_debug ("printing composite device");
++        g_object_set (manager->priv->device_composite,
++                      "energy", energy_total,
++                      "energy-full", energy_full_total,
++                      "energy-rate", energy_rate_total,
++                      "time-to-empty", time_to_empty_total,
++                      "time-to-full", time_to_full_total,
++                      "percentage", percentage,
++                      "state", state,
++                      "is-present", (battery_devices > 0),
++                      NULL);
++
++        /* force update of icon */
++        if (engine_recalculate_state_icon (manager))
++                engine_emit_changed (manager, TRUE, FALSE);
++}
++
++typedef struct {
++        GsdPowerManager *manager;
++        UpDevice        *device;
++} GsdPowerManagerRecallData;
++
++static void
++device_perhaps_recall_response_cb (GtkDialog *dialog,
++                                   gint response_id,
++                                   GsdPowerManagerRecallData *recall_data)
++{
++        GdkScreen *screen;
++        GtkWidget *dialog_error;
++        GError *error = NULL;
++        gboolean ret;
++        gchar *website = NULL;
++
++        /* don't show this again */
++        if (response_id == GTK_RESPONSE_CANCEL) {
++                g_settings_set_boolean (recall_data->manager->priv->settings,
++                                        "notify-perhaps-recall",
++                                        FALSE);
++                goto out;
++        }
++
++        /* visit recall website */
++        if (response_id == GTK_RESPONSE_OK) {
++
++                g_object_get (recall_data->device,
++                              "recall-url", &website,
++                              NULL);
++
++                screen = gdk_screen_get_default();
++                ret = gtk_show_uri (screen,
++                                    website,
++                                    gtk_get_current_event_time (),
++                                    &error);
++                if (!ret) {
++                        dialog_error = gtk_message_dialog_new (NULL,
++                                                               GTK_DIALOG_MODAL,
++                                                               GTK_MESSAGE_INFO,
++                                                               GTK_BUTTONS_OK,
++                                                               "Failed to show url %s",
++                                                               error->message);
++                        gtk_dialog_run (GTK_DIALOG (dialog_error));
++                        g_error_free (error);
++                }
++        }
++out:
++        gtk_widget_destroy (GTK_WIDGET (dialog));
++        g_object_unref (recall_data->device);
++        g_object_unref (recall_data->manager);
++        g_free (recall_data);
++        g_free (website);
++        return;
++}
++
++static gboolean
++device_perhaps_recall_delay_cb (gpointer user_data)
++{
++        gchar *vendor;
++        const gchar *title = NULL;
++        GString *message = NULL;
++        GtkWidget *dialog;
++        GsdPowerManagerRecallData *recall_data = (GsdPowerManagerRecallData *) user_data;
++
++        g_object_get (recall_data->device,
++                      "recall-vendor", &vendor,
++                      NULL);
++
++        /* TRANSLATORS: the battery may be recalled by its vendor */
++        title = _("Battery may be recalled");
++        message = g_string_new ("");
++        g_string_append_printf (message,
++                                _("A battery in your computer may have been "
++                                  "recalled by %s and you may be at risk."), vendor);
++        g_string_append (message, "\n\n");
++        g_string_append (message, _("For more information visit the battery recall website."));
++        dialog = gtk_message_dialog_new_with_markup (NULL,
++                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
++                                                     GTK_MESSAGE_INFO,
++                                                     GTK_BUTTONS_CLOSE,
++                                                     "<span size='larger'><b>%s</b></span>",
++                                                     title);
++        gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
++                                                    "%s", message->str);
++
++        /* TRANSLATORS: button text, visit the manufacturers recall website */
++        gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"),
++                               GTK_RESPONSE_OK);
++
++        /* TRANSLATORS: button text, do not show this bubble again */
++        gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"),
++                               GTK_RESPONSE_CANCEL);
++
++        gtk_widget_show (dialog);
++        g_signal_connect (dialog, "response",
++                          G_CALLBACK (device_perhaps_recall_response_cb),
++                          recall_data);
++
++        g_string_free (message, TRUE);
++        g_free (vendor);
++        return FALSE;
++}
++
++static void
++device_perhaps_recall (GsdPowerManager *manager, UpDevice *device)
++{
++        gboolean ret;
++        guint timer_id;
++        GsdPowerManagerRecallData *recall_data;
++
++        /* don't show when running under GDM */
++        if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
++                g_debug ("running under gdm, so no notification");
+                 return;
+-        g_ptr_array_add (manager->priv->devices_array, g_object_ref (device));
++        }
+ 
+-        g_signal_connect (device, "notify::warning-level",
+-                          G_CALLBACK (engine_device_warning_changed_cb), manager);
++        /* already shown, and dismissed */
++        ret = g_settings_get_boolean (manager->priv->settings,
++                                      "notify-perhaps-recall");
++        if (!ret) {
++                g_debug ("settings prevents recall notification");
++                return;
++        }
+ 
+-        engine_device_warning_changed_cb (device, NULL, manager);
++        recall_data = g_new0 (GsdPowerManagerRecallData, 1);
++        recall_data->manager = g_object_ref (manager);
++        recall_data->device = g_object_ref (device);
++
++        /* delay by a few seconds so the session can load */
++        timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_RECALL_DELAY,
++                                          device_perhaps_recall_delay_cb,
++                                          recall_data);
++        g_source_set_name_by_id (timer_id, "[GsdPowerManager] perhaps-recall");
++}
++
++static void
++engine_device_add (GsdPowerManager *manager, UpDevice *device)
++{
++        gboolean recall_notice;
++        GsdPowerManagerWarning warning;
++        UpDeviceState state;
++        UpDeviceKind kind;
++
++        /* assign warning */
++        warning = engine_get_warning (manager, device);
++        g_object_set_data (G_OBJECT(device),
++                           "engine-warning-old",
++                           GUINT_TO_POINTER(warning));
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "state", &state,
++                      "recall-notice", &recall_notice,
++                      NULL);
++
++        /* add old state for transitions */
++        g_debug ("adding %s with state %s",
++                 up_device_get_object_path (device), up_device_state_to_string (state));
++        g_object_set_data (G_OBJECT(device),
++                           "engine-state-old",
++                           GUINT_TO_POINTER(state));
++
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++                g_debug ("updating because we added a device");
++                engine_update_composite_device (manager);
++
++                /* reset those values for the composite device */
++                g_object_set_data (G_OBJECT(manager->priv->device_composite),
++                                   "engine-warning-old",
++                                   GUINT_TO_POINTER(WARNING_NONE));
++                g_object_set_data (G_OBJECT(manager->priv->device_composite),
++                                   "engine-state-old",
++                                   GUINT_TO_POINTER(UP_DEVICE_STATE_UNKNOWN));
++
++                engine_device_changed_cb (NULL, manager->priv->device_composite, manager);
++        }
++
++        /* the device is recalled */
++        if (recall_notice)
++                device_perhaps_recall (manager, device);
++}
++
++static gboolean
++engine_check_recall (GsdPowerManager *manager, UpDevice *device)
++{
++        UpDeviceKind kind;
++        gboolean recall_notice = FALSE;
++        gchar *recall_vendor = NULL;
++        gchar *recall_url = NULL;
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      "recall-notice", &recall_notice,
++                      "recall-vendor", &recall_vendor,
++                      "recall-url", &recall_url,
++                      NULL);
++
++        /* not battery */
++        if (kind != UP_DEVICE_KIND_BATTERY)
++                goto out;
++
++        /* no recall data */
++        if (!recall_notice)
++                goto out;
++
++        /* emit signal for manager */
++        g_debug ("** EMIT: perhaps-recall");
++        g_debug ("%s-%s", recall_vendor, recall_url);
++out:
++        g_free (recall_vendor);
++        g_free (recall_url);
++        return recall_notice;
+ }
+ 
+ static gboolean
+@@ -248,6 +992,18 @@ engine_coldplug (GsdPowerManager *manage
+         guint i;
+         GPtrArray *array = NULL;
+         UpDevice *device;
++        gboolean ret;
++        GError *error = NULL;
++
++        /* get devices from UPower */
++        ret = up_client_enumerate_devices_sync (manager->priv->up_client, NULL, &error);
++        if (!ret) {
++                g_warning ("failed to get device list: %s", error->message);
++                g_error_free (error);
++                return FALSE;
++        }
++
++        engine_recalculate_state (manager);
+ 
+         /* add to database */
+         array = up_client_get_devices (manager->priv->up_client);
+@@ -255,6 +1011,7 @@ engine_coldplug (GsdPowerManager *manage
+         for (i = 0 ; array != NULL && i < array->len ; i++) {
+                 device = g_ptr_array_index (array, i);
+                 engine_device_add (manager, device);
++                engine_check_recall (manager, device);
+         }
+ 
+         g_clear_pointer (&array, g_ptr_array_unref);
+@@ -266,22 +1023,22 @@ 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);
++
++        engine_recalculate_state (manager);
+ }
+ 
+ static void
+-engine_device_removed_cb (UpClient *client, const char *object_path, GsdPowerManager *manager)
++engine_device_removed_cb (UpClient *client, UpDevice *device, GsdPowerManager *manager)
+ {
+-        guint i;
+-
+-        for (i = 0; i < manager->priv->devices_array->len; i++) {
+-                UpDevice *device = g_ptr_array_index (manager->priv->devices_array, i);
+-
+-                if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) {
+-                        g_ptr_array_remove_index (manager->priv->devices_array, i);
+-                        break;
+-                }
+-        }
++        gboolean ret;
++        ret = g_ptr_array_remove (manager->priv->devices_array, device);
++        if (!ret)
++                return;
++        engine_recalculate_state (manager);
+ }
+ 
+ static void
+@@ -290,15 +1047,35 @@ on_notification_closed (NotifyNotificati
+     g_object_unref (notification);
+ }
+ 
++static const gchar *
++get_first_themed_icon_name (GIcon *icon)
++{
++        const gchar* const *icon_names;
++        const gchar *icon_name = NULL;
++
++        /* no icon */
++        if (icon == NULL)
++                goto out;
++
++        /* just use the first icon */
++        icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
++        if (icon_names != NULL)
++                icon_name = icon_names[0];
++out:
++        return icon_name;
++}
++
+ static void
+ create_notification (const char *summary,
+                      const char *body,
+-                     const char *icon_name,
++                     GIcon      *icon,
+                      NotifyNotification **weak_pointer_location)
+ {
+         NotifyNotification *notification;
+ 
+-        notification = notify_notification_new (summary, body, icon_name);
++        notification = notify_notification_new (summary,
++                                                body,
++                                                icon ? get_first_themed_icon_name (icon) : NULL);
+         *weak_pointer_location = notification;
+         g_object_add_weak_pointer (G_OBJECT (notification),
+                                    (gpointer *) weak_pointer_location);
+@@ -312,17 +1089,23 @@ engine_ups_discharging (GsdPowerManager
+         const gchar *title;
+         gchar *remaining_text = NULL;
+         gdouble percentage;
+-        char *icon_name;
++        GIcon *icon = NULL;
+         gint64 time_to_empty;
+         GString *message;
++        UpDeviceKind kind;
+ 
+         /* get device properties */
+         g_object_get (device,
++                      "kind", &kind,
+                       "percentage", &percentage,
+                       "time-to-empty", &time_to_empty,
+-                      "icon-name", &icon_name,
+                       NULL);
+ 
++        if (kind != UP_DEVICE_KIND_UPS)
++                return;
++
++        main_battery_or_ups_low_changed (manager, TRUE);
++
+         /* only show text if there is a valid time */
+         if (time_to_empty > 0)
+                 remaining_text = gpm_get_timestring (time_to_empty);
+@@ -336,16 +1119,18 @@ engine_ups_discharging (GsdPowerManager
+                 g_string_append_printf (message, _("%s of UPS backup power remaining"),
+                                         remaining_text);
+         } else {
+-                g_string_append (message, _("Unknown amount of UPS backup power remaining"));
++                g_string_append (message, gpm_device_to_localised_string (device));
+         }
+         g_string_append_printf (message, " (%.0f%%)", percentage);
+ 
++        icon = gpm_upower_get_device_icon (device, TRUE);
++
+         /* close any existing notification of this class */
+         notify_close_if_showing (&manager->priv->notification_ups_discharging);
+ 
+         /* create a new notification */
+         create_notification (title, message->str,
+-                             icon_name,
++                             icon,
+                              &manager->priv->notification_ups_discharging);
+         notify_notification_set_timeout (manager->priv->notification_ups_discharging,
+                                          GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG);
+@@ -359,35 +1144,105 @@ engine_ups_discharging (GsdPowerManager
+         notify_notification_show (manager->priv->notification_ups_discharging, NULL);
+ 
+         g_string_free (message, TRUE);
+-        g_free (icon_name);
++        if (icon != NULL)
++                g_object_unref (icon);
+         g_free (remaining_text);
+ }
+ 
+ static GsdPowerActionType
+-manager_critical_action_get (GsdPowerManager *manager)
++manager_critical_action_get (GsdPowerManager *manager,
++                             gboolean         is_ups)
+ {
+         GsdPowerActionType policy;
+-        char *action;
++        GVariant *result = NULL;
++
++        policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
++
++        if (policy == GSD_POWER_ACTION_SUSPEND) {
++                if (is_ups == FALSE) {
++                        result = g_dbus_proxy_call_sync (manager->priv->logind_proxy,
++                                                         "CanSuspend",
++                                                         NULL,
++                                                         G_DBUS_CALL_FLAGS_NONE,
++                                                         -1, NULL, NULL);
++                }
++        } else if (policy == GSD_POWER_ACTION_HIBERNATE) {
++                result = g_dbus_proxy_call_sync (manager->priv->logind_proxy,
++                                                 "CanHibernate",
++                                                 NULL,
++                                                 G_DBUS_CALL_FLAGS_NONE,
++                                                 -1, NULL, NULL);
++        } else {
++                /* Other actions need no check */
++                return policy;
++        }
++
++        if (result) {
++                const char *s;
+ 
+-        action = up_client_get_critical_action (manager->priv->up_client);
+-        /* We don't make the difference between HybridSleep and Hibernate */
+-        if (g_strcmp0 (action, "PowerOff") == 0)
++                g_variant_get (result, "(s)", &s);
++                if (g_strcmp0 (s, "yes") != 0)
++                        policy = GSD_POWER_ACTION_SHUTDOWN;
++                g_variant_unref (result);
++        } else {
+                 policy = GSD_POWER_ACTION_SHUTDOWN;
+-        else
+-                policy = GSD_POWER_ACTION_HIBERNATE;
+-        g_free (action);
++        }
++
+         return policy;
+ }
+ 
+ static gboolean
+-manager_critical_action_stop_sound_cb (GsdPowerManager *manager)
++manager_critical_action_do (GsdPowerManager *manager,
++                            gboolean         is_ups)
+ {
++        GsdPowerActionType action_type;
++
+         /* stop playing the alert as it's too late to do anything now */
+         play_loop_stop (&manager->priv->critical_alert_timeout_id);
+ 
++        action_type = manager_critical_action_get (manager, is_ups);
++        do_power_action_type (manager, action_type);
++
++        return FALSE;
++}
++
++static gboolean
++manager_critical_action_do_cb (GsdPowerManager *manager)
++{
++        manager_critical_action_do (manager, FALSE);
++        return FALSE;
++}
++
++static gboolean
++manager_critical_ups_action_do_cb (GsdPowerManager *manager)
++{
++        manager_critical_action_do (manager, TRUE);
+         return FALSE;
+ }
+ 
++static gboolean
++engine_just_laptop_battery (GsdPowerManager *manager)
++{
++        UpDevice *device;
++        UpDeviceKind kind;
++        GPtrArray *array;
++        gboolean ret = TRUE;
++        guint i;
++
++        /* find if there are any other device types that mean we have to
++         * be more specific in our wording */
++        array = manager->priv->devices_array;
++        for (i=0; i<array->len; i++) {
++                device = g_ptr_array_index (array, i);
++                g_object_get (device, "kind", &kind, NULL);
++                if (kind != UP_DEVICE_KIND_BATTERY) {
++                        ret = FALSE;
++                        break;
++                }
++        }
++        return ret;
++}
++
+ static void
+ engine_charge_low (GsdPowerManager *manager, UpDevice *device)
+ {
+@@ -397,7 +1252,7 @@ engine_charge_low (GsdPowerManager *mana
+         gchar *tmp;
+         gchar *remaining_text;
+         gdouble percentage;
+-        char *icon_name;
++        GIcon *icon = NULL;
+         gint64 time_to_empty;
+         UpDeviceKind kind;
+ 
+@@ -406,13 +1261,20 @@ engine_charge_low (GsdPowerManager *mana
+                       "kind", &kind,
+                       "percentage", &percentage,
+                       "time-to-empty", &time_to_empty,
+-                      "icon-name", &icon_name,
+                       NULL);
+ 
++        /* check to see if the batteries have not noticed we are on AC */
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++                if (!up_client_get_on_battery (manager->priv->up_client)) {
++                        g_warning ("ignoring low message as we are not on battery power");
++                        goto out;
++                }
++        }
++
+         if (kind == UP_DEVICE_KIND_BATTERY) {
+ 
+                 /* if the user has no other batteries, drop the "Laptop" wording */
+-                ret = (manager->priv->devices_array->len > 0);
++                ret = engine_just_laptop_battery (manager);
+                 if (ret) {
+                         /* TRANSLATORS: laptop battery low, and we only have one battery */
+                         title = _("Battery low");
+@@ -428,6 +1290,8 @@ engine_charge_low (GsdPowerManager *mana
+                 message = g_strdup_printf (_("Approximately %s remaining (%.0f%%)"), remaining_text, percentage);
+                 g_free (remaining_text);
+ 
++                main_battery_or_ups_low_changed (manager, TRUE);
++
+         } else if (kind == UP_DEVICE_KIND_UPS) {
+                 /* TRANSLATORS: UPS is starting to get a little low */
+                 title = _("UPS low");
+@@ -489,12 +1353,15 @@ engine_charge_low (GsdPowerManager *mana
+                 message = g_strdup_printf (_("Attached computer is low in power (%.0f%%)"), percentage);
+         }
+ 
++        /* get correct icon */
++        icon = gpm_upower_get_device_icon (device, TRUE);
++
+         /* close any existing notification of this class */
+         notify_close_if_showing (&manager->priv->notification_low);
+ 
+         /* create a new notification */
+         create_notification (title, message,
+-                             icon_name,
++                             icon,
+                              &manager->priv->notification_low);
+         notify_notification_set_timeout (manager->priv->notification_low,
+                                          GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG);
+@@ -512,7 +1379,9 @@ engine_charge_low (GsdPowerManager *mana
+                          /* TRANSLATORS: this is the sound description */
+                          CA_PROP_EVENT_DESCRIPTION, _("Battery is low"), NULL);
+ 
+-        g_free (icon_name);
++out:
++        if (icon != NULL)
++                g_object_unref (icon);
+         g_free (message);
+ }
+ 
+@@ -523,7 +1392,7 @@ engine_charge_critical (GsdPowerManager
+         gboolean ret;
+         gchar *message = NULL;
+         gdouble percentage;
+-        char *icon_name;
++        GIcon *icon = NULL;
+         gint64 time_to_empty;
+         GsdPowerActionType policy;
+         UpDeviceKind kind;
+@@ -533,13 +1402,20 @@ engine_charge_critical (GsdPowerManager
+                       "kind", &kind,
+                       "percentage", &percentage,
+                       "time-to-empty", &time_to_empty,
+-                      "icon-name", &icon_name,
+                       NULL);
+ 
++        /* check to see if the batteries have not noticed we are on AC */
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++                if (!up_client_get_on_battery (manager->priv->up_client)) {
++                        g_warning ("ignoring critically low message as we are not on battery power");
++                        goto out;
++                }
++        }
++
+         if (kind == UP_DEVICE_KIND_BATTERY) {
+ 
+                 /* if the user has no other batteries, drop the "Laptop" wording */
+-                ret = (manager->priv->devices_array->len > 0);
++                ret = engine_just_laptop_battery (manager);
+                 if (ret) {
+                         /* TRANSLATORS: laptop battery critically low, and only have one kind of battery */
+                         title = _("Battery critically low");
+@@ -549,10 +1425,18 @@ engine_charge_critical (GsdPowerManager
+                 }
+ 
+                 /* we have to do different warnings depending on the policy */
+-                policy = manager_critical_action_get (manager);
++                policy = manager_critical_action_get (manager, FALSE);
+ 
+                 /* use different text for different actions */
+-                if (policy == GSD_POWER_ACTION_HIBERNATE) {
++                if (policy == GSD_POWER_ACTION_NOTHING) {
++                        /* TRANSLATORS: tell the use to insert the plug, as we're not going to do anything */
++                        message = g_strdup (_("Plug in your AC adapter to avoid losing data."));
++
++                } else if (policy == GSD_POWER_ACTION_SUSPEND) {
++                        /* TRANSLATORS: give the user a ultimatum */
++                        message = g_strdup_printf (_("Computer will suspend very soon unless it is plugged in."));
++
++                } else if (policy == GSD_POWER_ACTION_HIBERNATE) {
+                         /* TRANSLATORS: give the user a ultimatum */
+                         message = g_strdup_printf (_("Computer will hibernate very soon unless it is plugged in."));
+ 
+@@ -561,6 +1445,8 @@ engine_charge_critical (GsdPowerManager
+                         message = g_strdup_printf (_("Computer will shutdown very soon unless it is plugged in."));
+                 }
+ 
++                main_battery_or_ups_low_changed (manager, TRUE);
++
+         } else if (kind == UP_DEVICE_KIND_UPS) {
+                 gchar *remaining_text;
+                 gchar *tmp;
+@@ -640,12 +1526,15 @@ engine_charge_critical (GsdPowerManager
+                                            percentage);
+         }
+ 
++        /* get correct icon */
++        icon = gpm_upower_get_device_icon (device, TRUE);
++
+         /* close any existing notification of this class */
+         notify_close_if_showing (&manager->priv->notification_low);
+ 
+         /* create a new notification */
+         create_notification (title, message,
+-                             icon_name,
++                             icon,
+                              &manager->priv->notification_low);
+         notify_notification_set_timeout (manager->priv->notification_low,
+                                          NOTIFY_EXPIRES_NEVER);
+@@ -671,8 +1560,9 @@ engine_charge_critical (GsdPowerManager
+                                  CA_PROP_EVENT_DESCRIPTION, _("Battery is critically low"), NULL);
+                 break;
+         }
+-
+-        g_free (icon_name);
++out:
++        if (icon != NULL)
++                g_object_unref (icon);
+         g_free (message);
+ }
+ 
+@@ -681,7 +1571,7 @@ engine_charge_action (GsdPowerManager *m
+ {
+         const gchar *title = NULL;
+         gchar *message = NULL;
+-        char *icon_name;
++        GIcon *icon = NULL;
+         GsdPowerActionType policy;
+         guint timer_id;
+         UpDeviceKind kind;
+@@ -689,19 +1579,39 @@ engine_charge_action (GsdPowerManager *m
+         /* get device properties */
+         g_object_get (device,
+                       "kind", &kind,
+-                      "icon-name", &icon_name,
+                       NULL);
+ 
++        /* check to see if the batteries have not noticed we are on AC */
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++                if (!up_client_get_on_battery (manager->priv->up_client)) {
++                        g_warning ("ignoring critically low message as we are not on battery power");
++                        goto out;
++                }
++        }
++
+         if (kind == UP_DEVICE_KIND_BATTERY) {
+ 
+                 /* TRANSLATORS: laptop battery is really, really, low */
+                 title = _("Laptop battery critically low");
+ 
+                 /* we have to do different warnings depending on the policy */
+-                policy = manager_critical_action_get (manager);
++                policy = manager_critical_action_get (manager, FALSE);
+ 
+                 /* use different text for different actions */
+-                if (policy == GSD_POWER_ACTION_HIBERNATE) {
++                if (policy == GSD_POWER_ACTION_NOTHING) {
++                        /* TRANSLATORS: computer will shutdown without saving data */
++                        message = g_strdup (_("The battery is below the critical level and "
++                                              "this computer will <b>power-off</b> when the "
++                                              "battery becomes completely empty."));
++
++                } else if (policy == GSD_POWER_ACTION_SUSPEND) {
++                        /* TRANSLATORS: computer will suspend */
++                        message = g_strdup (_("The battery is below the critical level and "
++                                              "this computer is about to suspend.\n"
++                                              "<b>NOTE:</b> A small amount of power is required "
++                                              "to keep your computer in a suspended state."));
++
++                } else if (policy == GSD_POWER_ACTION_HIBERNATE) {
+                         /* TRANSLATORS: computer will hibernate */
+                         message = g_strdup (_("The battery is below the critical level and "
+                                               "this computer is about to hibernate."));
+@@ -713,8 +1623,8 @@ engine_charge_action (GsdPowerManager *m
+                 }
+ 
+                 /* wait 20 seconds for user-panic */
+-                timer_id = g_timeout_add_seconds (GSD_STOP_SOUND_DELAY,
+-                                                  (GSourceFunc) manager_critical_action_stop_sound_cb,
++                timer_id = g_timeout_add_seconds (GSD_ACTION_DELAY,
++                                                  (GSourceFunc) manager_critical_action_do_cb,
+                                                   manager);
+                 g_source_set_name_by_id (timer_id, "[GsdPowerManager] battery critical-action");
+ 
+@@ -723,10 +1633,16 @@ engine_charge_action (GsdPowerManager *m
+                 title = _("UPS critically low");
+ 
+                 /* we have to do different warnings depending on the policy */
+-                policy = manager_critical_action_get (manager);
++                policy = manager_critical_action_get (manager, TRUE);
+ 
+                 /* use different text for different actions */
+-                if (policy == GSD_POWER_ACTION_HIBERNATE) {
++                if (policy == GSD_POWER_ACTION_NOTHING) {
++                        /* TRANSLATORS: computer will shutdown without saving data */
++                        message = g_strdup (_("UPS is below the critical level and "
++                                              "this computer will <b>power-off</b> when the "
++                                              "UPS becomes completely empty."));
++
++                } else if (policy == GSD_POWER_ACTION_HIBERNATE) {
+                         /* TRANSLATORS: computer will hibernate */
+                         message = g_strdup (_("UPS is below the critical level and "
+                                               "this computer is about to hibernate."));
+@@ -738,8 +1654,8 @@ engine_charge_action (GsdPowerManager *m
+                 }
+ 
+                 /* wait 20 seconds for user-panic */
+-                timer_id = g_timeout_add_seconds (GSD_STOP_SOUND_DELAY,
+-                                                  (GSourceFunc) manager_critical_action_stop_sound_cb,
++                timer_id = g_timeout_add_seconds (GSD_ACTION_DELAY,
++                                                  (GSourceFunc) manager_critical_ups_action_do_cb,
+                                                   manager);
+                 g_source_set_name_by_id (timer_id, "[GsdPowerManager] ups critical-action");
+         }
+@@ -748,12 +1664,15 @@ engine_charge_action (GsdPowerManager *m
+         if (title == NULL)
+                 return;
+ 
++        /* get correct icon */
++        icon = gpm_upower_get_device_icon (device, TRUE);
++
+         /* close any existing notification of this class */
+         notify_close_if_showing (&manager->priv->notification_low);
+ 
+         /* create a new notification */
+         create_notification (title, message,
+-                             icon_name,
++                             icon,
+                              &manager->priv->notification_low);
+         notify_notification_set_timeout (manager->priv->notification_low,
+                                          NOTIFY_EXPIRES_NEVER);
+@@ -769,40 +1688,77 @@ engine_charge_action (GsdPowerManager *m
+                          CA_PROP_EVENT_ID, "battery-caution",
+                          /* TRANSLATORS: this is the sound description */
+                          CA_PROP_EVENT_DESCRIPTION, _("Battery is critically low"), NULL);
+-
+-        g_free (icon_name);
++out:
++        if (icon != NULL)
++                g_object_unref (icon);
+         g_free (message);
+ }
+ 
+ static void
+-engine_device_warning_changed_cb (UpDevice *device, GParamSpec *pspec, GsdPowerManager *manager)
++engine_device_changed_cb (UpClient *client, UpDevice *device, GsdPowerManager *manager)
+ {
+-        UpDeviceLevel warning;
++        UpDeviceKind kind;
++        UpDeviceState state;
++        UpDeviceState state_old;
++        GsdPowerManagerWarning warning_old;
++        GsdPowerManagerWarning warning;
++
++        /* get device properties */
++        g_object_get (device,
++                      "kind", &kind,
++                      NULL);
++
++        /* if battery then use composite device to cope with multiple batteries */
++        if (kind == UP_DEVICE_KIND_BATTERY) {
++                g_debug ("updating because %s changed", up_device_get_object_path (device));
++                engine_update_composite_device (manager);
++                device = manager->priv->device_composite;
++        }
++
++        /* get device properties (may be composite) */
++        g_object_get (device,
++                      "state", &state,
++                      NULL);
+ 
+-        g_object_get (device, "warning-level", &warning, NULL);
++        g_debug ("%s state is now %s", up_device_get_object_path (device), up_device_state_to_string (state));
+ 
+-        if (warning == UP_DEVICE_LEVEL_DISCHARGING) {
+-                g_debug ("** EMIT: discharging");
+-                engine_ups_discharging (manager, device);
+-        } else if (warning == UP_DEVICE_LEVEL_LOW) {
+-                g_debug ("** EMIT: charge-low");
+-                engine_charge_low (manager, device);
+-        } else if (warning == UP_DEVICE_LEVEL_CRITICAL) {
+-                g_debug ("** EMIT: charge-critical");
+-                engine_charge_critical (manager, device);
+-        } else if (warning == UP_DEVICE_LEVEL_ACTION) {
+-                g_debug ("** EMIT: charge-action");
+-                engine_charge_action (manager, device);
+-        } else if (warning == UP_DEVICE_LEVEL_NONE) {
+-                /* FIXME: this only handles one notification
+-                 * for the whole system, instead of one per device */
+-                g_debug ("fully charged or charging, hiding notifications if any");
+-                play_loop_stop (&manager->priv->critical_alert_timeout_id);
+-                notify_close_if_showing (&manager->priv->notification_low);
+-                notify_close_if_showing (&manager->priv->notification_ups_discharging);
++        /* see if any interesting state changes have happened */
++        state_old = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(device), "engine-state-old"));
++        if (state_old != state) {
++                if (state == UP_DEVICE_STATE_DISCHARGING) {
++                        g_debug ("discharging");
++                        engine_ups_discharging (manager, device);
++                } else if (state == UP_DEVICE_STATE_FULLY_CHARGED ||
++                           state == UP_DEVICE_STATE_CHARGING) {
++                        g_debug ("fully charged or charging, hiding notifications if any");
++                        notify_close_if_showing (&manager->priv->notification_low);
++                        notify_close_if_showing (&manager->priv->notification_ups_discharging);
++                        main_battery_or_ups_low_changed (manager, FALSE);
++                }
++
++                /* save new state */
++                g_object_set_data (G_OBJECT(device), "engine-state-old", GUINT_TO_POINTER(state));
++        }
++
++        /* check the warning state has not changed */
++        warning_old = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(device), "engine-warning-old"));
++        warning = engine_get_warning (manager, device);
++        if (warning != warning_old) {
++                if (warning == WARNING_LOW) {
++                        g_debug ("** EMIT: charge-low");
++                        engine_charge_low (manager, device);
++                } else if (warning == WARNING_CRITICAL) {
++                        g_debug ("** EMIT: charge-critical");
++                        engine_charge_critical (manager, device);
++                } else if (warning == WARNING_ACTION) {
++                        g_debug ("charge-action");
++                        engine_charge_action (manager, device);
++                }
++                /* save new state */
++                g_object_set_data (G_OBJECT(device), "engine-warning-old", GUINT_TO_POINTER(warning));
+         }
+ 
+-        main_battery_or_ups_low_changed (manager, (warning != UP_DEVICE_LEVEL_NONE));
++        engine_recalculate_state (manager);
+ }
+ 
+ static void
+@@ -1210,10 +2166,17 @@ do_lid_closed_action (GsdPowerManager *m
+ }
+ 
+ static void
+-lid_state_changed_cb (UpClient *client, GParamSpec *pspec, GsdPowerManager *manager)
++up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
+ {
+         gboolean tmp;
+ 
++        if (!up_client_get_on_battery (client)) {
++            /* if we are playing a critical charge sound loop on AC, stop it */
++            play_loop_stop (&manager->priv->critical_alert_timeout_id);
++            notify_close_if_showing (&manager->priv->notification_low);
++            main_battery_or_ups_low_changed (manager, FALSE);
++        }
++
+         if (!manager->priv->lid_is_present)
+                 return;
+ 
+@@ -1264,13 +2227,17 @@ backlight_iface_emit_changed (GsdPowerMa
+                               gint32           value)
+ {
+         GVariant *params;
++        gchar *string;
+ 
+         /* not yet connected to the bus */
+         if (manager->priv->connection == NULL)
+                 return;
+ 
+-        params = g_variant_new_parsed ("(%s, [{'Brightness', <%i>}], @as [])", interface_name,
+-                                       value);
++        string = g_strdup_printf ("('%s', [{'Brightness', %%v}], @as [])", interface_name);
++        params = g_variant_new_parsed (string,
++                                       g_variant_new_int32 (value));
++        g_free (string);
++
+         g_dbus_connection_emit_signal (manager->priv->connection,
+                                        NULL,
+                                        GSD_POWER_DBUS_PATH,
+@@ -1628,12 +2595,9 @@ idle_configure (GsdPowerManager *manager
+         if (timeout_sleep != 0) {
+                 g_debug ("setting up sleep callback %is", timeout_sleep);
+ 
+-                if (action_type != GSD_POWER_ACTION_NOTHING) {
+-                        manager->priv->idle_sleep_id = gnome_idle_monitor_add_idle_watch (manager->priv->idle_monitor,
+-                                                                                          timeout_sleep * 1000,
+-                                                                                          idle_triggered_idle_cb, manager, NULL);
+-                }
+-
++                manager->priv->idle_sleep_id = gnome_idle_monitor_add_idle_watch (manager->priv->idle_monitor,
++                                                                                  timeout_sleep * 1000,
++                                                                                  idle_triggered_idle_cb, manager, NULL);
+                 if (action_type == GSD_POWER_ACTION_LOGOUT ||
+                     action_type == GSD_POWER_ACTION_SUSPEND ||
+                     action_type == GSD_POWER_ACTION_HIBERNATE) {
+@@ -1696,7 +2660,7 @@ idle_configure (GsdPowerManager *manager
+ 
+ static void
+ main_battery_or_ups_low_changed (GsdPowerManager *manager,
+-                                 gboolean         is_low)
++                          gboolean         is_low)
+ {
+         if (is_low == manager->priv->battery_is_low)
+                 return;
+@@ -1824,12 +2788,6 @@ handle_screensaver_active (GsdPowerManag
+ }
+ 
+ static void
+-handle_wake_up_screen (GsdPowerManager *manager)
+-{
+-        set_temporary_unidle_on_ac (manager, TRUE);
+-}
+-
+-static void
+ screensaver_signal_cb (GDBusProxy *proxy,
+                        const gchar *sender_name,
+                        const gchar *signal_name,
+@@ -1838,8 +2796,6 @@ screensaver_signal_cb (GDBusProxy *proxy
+ {
+         if (g_strcmp0 (signal_name, "ActiveChanged") == 0)
+                 handle_screensaver_active (GSD_POWER_MANAGER (user_data), parameters);
+-        else if (g_strcmp0 (signal_name, "WakeUpScreen") == 0)
+-                handle_wake_up_screen (GSD_POWER_MANAGER (user_data));
+ }
+ 
+ static void
+@@ -1898,7 +2854,7 @@ power_keyboard_proxy_ready_cb (GObject
+ 
+         /* set brightness to max if not currently set so is something
+          * sensible */
+-        if (manager->priv->kbd_brightness_now <= 0) {
++        if (manager->priv->kbd_brightness_now < 0) {
+                 gboolean ret;
+                 ret = upower_kbd_set_brightness (manager,
+                                                  manager->priv->kbd_brightness_max,
+@@ -1956,17 +2912,9 @@ show_sleep_warning (GsdPowerManager *man
+         notify_notification_set_app_name (manager->priv->notification_sleep_warning, _("Power"));
+ 
+         notify_notification_show (manager->priv->notification_sleep_warning, NULL);
+-}
+-
+-static void
+-idle_set_mode_no_temp (GsdPowerManager  *manager,
+-                       GsdPowerIdleMode  mode)
+-{
+-        if (manager->priv->temporary_unidle_on_ac_id != 0 &&
+-            manager->priv->previous_idle_mode == mode)
+-                return;
+ 
+-        idle_set_mode (manager, mode);
++        if (manager->priv->sleep_action_type == GSD_POWER_ACTION_LOGOUT)
++                set_temporary_unidle_on_ac (manager, TRUE);
+ }
+ 
+ static void
+@@ -1984,11 +2932,11 @@ idle_triggered_idle_cb (GnomeIdleMonitor
+                 g_debug ("idletime watch: %s (%i)", id_name, watch_id);
+ 
+         if (watch_id == manager->priv->idle_dim_id) {
+-                idle_set_mode_no_temp (manager, GSD_POWER_IDLE_MODE_DIM);
++                idle_set_mode (manager, GSD_POWER_IDLE_MODE_DIM);
+         } else if (watch_id == manager->priv->idle_blank_id) {
+-                idle_set_mode_no_temp (manager, GSD_POWER_IDLE_MODE_BLANK);
++                idle_set_mode (manager, GSD_POWER_IDLE_MODE_BLANK);
+         } else if (watch_id == manager->priv->idle_sleep_id) {
+-                idle_set_mode_no_temp (manager, GSD_POWER_IDLE_MODE_SLEEP);
++                idle_set_mode (manager, GSD_POWER_IDLE_MODE_SLEEP);
+         } else if (watch_id == manager->priv->idle_sleep_warning_id) {
+                 show_sleep_warning (manager);
+         }
+@@ -2016,6 +2964,10 @@ engine_settings_key_changed_cb (GSetting
+                                 const gchar *key,
+                                 GsdPowerManager *manager)
+ {
++        if (g_strcmp0 (key, "use-time-for-policy") == 0) {
++                manager->priv->use_time_primary = g_settings_get_boolean (settings, key);
++                return;
++        }
+         if (g_str_has_prefix (key, "sleep-inactive") ||
+             g_str_equal (key, "idle-delay") ||
+             g_str_equal (key, "idle-dim")) {
+@@ -2219,6 +3171,12 @@ handle_suspend_actions (GsdPowerManager
+ static void
+ handle_resume_actions (GsdPowerManager *manager)
+ {
++        /* close existing notifications on resume, the system power
++         * state is probably different now */
++        notify_close_if_showing (&manager->priv->notification_low);
++        notify_close_if_showing (&manager->priv->notification_ups_discharging);
++        main_battery_or_ups_low_changed (manager, FALSE);
++
+         /* ensure we turn the panel back on after resume */
+         backlight_enable (manager);
+ 
+@@ -2256,19 +3214,10 @@ on_rr_screen_acquired (GObject      *obj
+                        gpointer      user_data)
+ {
+         GsdPowerManager *manager = user_data;
+-        GError *error = NULL;
+ 
+         gnome_settings_profile_start (NULL);
+ 
+-        manager->priv->rr_screen = gnome_rr_screen_new_finish (result, &error);
+-
+-        if (error) {
+-                g_warning ("Could not create GnomeRRScreen: %s\n", error->message);
+-                g_error_free (error);
+-                gnome_settings_profile_end (NULL);
+-
+-                return;
+-        }
++        manager->priv->rr_screen = gnome_rr_screen_new_finish (result, NULL);
+ 
+         /* set up the screens */
+         if (manager->priv->lid_is_present) {
+@@ -2311,8 +3260,10 @@ on_rr_screen_acquired (GObject      *obj
+                           G_CALLBACK (engine_device_added_cb), manager);
+         g_signal_connect (manager->priv->up_client, "device-removed",
+                           G_CALLBACK (engine_device_removed_cb), manager);
+-        g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed",
+-                                G_CALLBACK (lid_state_changed_cb), manager);
++        g_signal_connect (manager->priv->up_client, "device-changed",
++                          G_CALLBACK (engine_device_changed_cb), manager);
++        g_signal_connect_after (manager->priv->up_client, "changed",
++                                G_CALLBACK (up_client_changed_cb), manager);
+         g_signal_connect (manager->priv->up_client, "notify::on-battery",
+                           G_CALLBACK (up_client_on_battery_cb), manager);
+ 
+@@ -2342,9 +3293,34 @@ on_rr_screen_acquired (GObject      *obj
+         manager->priv->devices_array = g_ptr_array_new_with_free_func (g_object_unref);
+ 
+         /* create a fake virtual composite battery */
+-        manager->priv->device_composite = up_client_get_display_device (manager->priv->up_client);
+-        g_signal_connect (manager->priv->device_composite, "notify::warning-level",
+-                          G_CALLBACK (engine_device_warning_changed_cb), manager);
++        manager->priv->device_composite = up_device_new ();
++        g_object_set (manager->priv->device_composite,
++                      "kind", UP_DEVICE_KIND_BATTERY,
++                      "is-rechargeable", TRUE,
++                      "native-path", "dummy:composite_battery",
++                      "power-supply", TRUE,
++                      NULL);
++        engine_update_composite_device (manager);
++
++        /* get percentage policy */
++        manager->priv->low_percentage = g_settings_get_int (manager->priv->settings,
++                                                            "percentage-low");
++        manager->priv->critical_percentage = g_settings_get_int (manager->priv->settings,
++                                                                 "percentage-critical");
++        manager->priv->action_percentage = g_settings_get_int (manager->priv->settings,
++                                                               "percentage-action");
++
++        /* get time policy */
++        manager->priv->low_time = g_settings_get_int (manager->priv->settings,
++                                                      "time-low");
++        manager->priv->critical_time = g_settings_get_int (manager->priv->settings,
++                                                           "time-critical");
++        manager->priv->action_time = g_settings_get_int (manager->priv->settings,
++                                                         "time-action");
++
++        /* we can disable this if the time remaining is inaccurate or just plain wrong */
++        manager->priv->use_time_primary = g_settings_get_boolean (manager->priv->settings,
++                                                                  "use-time-for-policy");
+ 
+         /* create IDLETIME watcher */
+         manager->priv->idle_monitor = gnome_idle_monitor_new ();
+@@ -2358,15 +3334,6 @@ on_rr_screen_acquired (GObject      *obj
+         /* don't blank inside a VM */
+         manager->priv->is_virtual_machine = gsd_power_is_hardware_a_vm ();
+ 
+-        /* queue a signal in case the proxy from gnome-shell was created before we got here
+-           (likely, considering that to get here we need a reply from gnome-shell)
+-        */
+-        if (manager->priv->backlight_available)
+-                backlight_iface_emit_changed (manager, GSD_POWER_DBUS_INTERFACE_SCREEN,
+-                                              backlight_get_percentage (manager->priv->rr_screen, NULL));
+-        else
+-                backlight_iface_emit_changed (manager, GSD_POWER_DBUS_INTERFACE_SCREEN, -1);
+-
+         gnome_settings_profile_end (NULL);
+ }
+ 
+@@ -2463,6 +3430,9 @@ gsd_power_manager_stop (GsdPowerManager
+         g_ptr_array_unref (manager->priv->devices_array);
+         manager->priv->devices_array = NULL;
+         g_clear_object (&manager->priv->device_composite);
++        g_clear_object (&manager->priv->previous_icon);
++
++        g_clear_pointer (&manager->priv->previous_summary, g_free);
+ 
+         g_clear_object (&manager->priv->session_presence_proxy);
+         g_clear_object (&manager->priv->screensaver_proxy);
+@@ -2577,6 +3547,114 @@ out:
+         }
+ }
+ 
++static GVariant *
++device_to_variant_blob (UpDevice *device)
++{
++        const gchar *object_path;
++        gchar *device_icon;
++        gdouble percentage;
++        GIcon *icon;
++        guint64 time_empty, time_full;
++        guint64 time_state = 0;
++        GVariant *value;
++        UpDeviceKind kind;
++        UpDeviceState state;
++        gboolean is_present;
++
++        g_object_get (device,
++                      "is-present", &is_present,
++                      "kind", &kind,
++                      "percentage", &percentage,
++                      "state", &state,
++                      "time-to-empty", &time_empty,
++                      "time-to-full", &time_full,
++                      NULL);
++
++        if (!is_present)
++                return NULL;
++
++        icon = gpm_upower_get_device_icon (device, TRUE);
++        device_icon = g_icon_to_string (icon);
++
++        /* only return time for these simple states */
++        if (state == UP_DEVICE_STATE_DISCHARGING)
++                time_state = time_empty;
++        else if (state == UP_DEVICE_STATE_CHARGING)
++                time_state = time_full;
++
++        /* get an object path, even for the composite device */
++        object_path = up_device_get_object_path (device);
++        if (object_path == NULL)
++                object_path = GSD_DBUS_PATH;
++
++        /* format complex object */
++        value = g_variant_new ("(susdut)",
++                               object_path,
++                               kind,
++                               device_icon,
++                               percentage,
++                               state,
++                               time_state);
++        g_free (device_icon);
++        g_object_unref (icon);
++        return value;
++}
++
++static void
++handle_method_call_main (GsdPowerManager *manager,
++                         const gchar *method_name,
++                         GVariant *parameters,
++                         GDBusMethodInvocation *invocation)
++{
++        GPtrArray *array;
++        guint i;
++        GVariantBuilder *builder;
++        GVariant *tuple = NULL;
++        GVariant *value = NULL;
++
++        /* return object */
++        if (g_strcmp0 (method_name, "GetPrimaryDevice") == 0) {
++                value = device_to_variant_blob (manager->priv->device_composite);
++                if (value) {
++                        tuple = g_variant_new_tuple (&value, 1);
++                        g_dbus_method_invocation_return_value (invocation, tuple);
++                } else {
++                        g_dbus_method_invocation_return_error_literal (invocation,
++                                                                       GSD_POWER_MANAGER_ERROR,
++                                                                       GSD_POWER_MANAGER_ERROR_FAILED,
++                                                                       "Main battery device not available");
++                }
++                return;
++        }
++
++        /* return array */
++        if (g_strcmp0 (method_name, "GetDevices") == 0) {
++                UpDevice *device;
++
++                /* create builder */
++                builder = g_variant_builder_new (G_VARIANT_TYPE("a(susdut)"));
++
++                /* add each tuple to the array */
++                array = manager->priv->devices_array;
++                for (i=0; i<array->len; i++) {
++                        device = g_ptr_array_index (array, i);