Merge lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Tim Lunn]

Merge 3.12 from debian

[lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346]

648. By Tim Lunn on 2014-09-30

Drop gcc_not_in_unity.patch, this is no longer needed since all panels now
set NoDisplay=true in their desktop files

[Martin Pitt (pitti)]

LGTM, thanks! gnome-control-center-shared-data didn't change, so this is safe for unity-control-center.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-20 03:43:40 +0000
+++ debian/changelog	2014-09-30 05:25:02 +0000
@@ -1,3 +1,150 @@
+gnome-control-center (1:3.12.1-5ubuntu1) utopic; urgency=medium
+
+  * New Upstream Release (LP: #1372346)
+  * Merge with Debian, remaining changes:
+    + debian/patches:
+      - revert_git_new_bluetooth_panel.patch,
+        revert_new_bluetooth.patch,
+        revert-bluetooth-BlueZ5-interface.patch:
+         Revert bluetooth back to Bluez4
+      - 52_region_language.patch
+        Adapt region panel to use Ubuntu style regions and UTF-8
+      - 56_use_ubuntu_info_branding.patch,
+        ubuntu-gnome-version.patch
+         Use Ubuntu GNOME branding
+      - 64_restore_terminal_keyboard_shortcut.patch
+         Bring back terminal shortcut
+      - 92_ubuntu_system_proxy.patch
+         Add system proxy support
+      - 99_add_lock-on-suspend.patch
+         Add option to lock on suspend
+      - revert_git_dont_hide_zoom.patch
+         Bring back zoom settings
+      - revert_git_drop_library.patch,
+        ubuntu_external_panels.patch
+         Reimplement support for external panels
+    + debian/control.in:
+      - Relax build-deps on upower and gnome-bluetooth
+      - Drop Recommends for packages not in main
+      - Various other Ubuntu specific changes
+    + debian/libgnome-control-center1.symbols: 
+      - Add new symbols from external panel patch
+    + debian/gnome-control-center-data.install:
+      - don't install the pkla yet
+    + Split out shared data that is used by unity-control-center
+    + Add a wrapper to run unity-control-center in Unity
+    + Install apport hook
+    + Revert to 3.10 power panel, until we have new upower 
+
+ -- Tim Lunn <[e-mail]>  Thu, 18 Sep 2014 09:31:20 +1000
+
+gnome-control-center (1:3.12.1-5) unstable; urgency=medium
+
+  [ Jordi Mallach ]
+  * Add cracklib-runtime to Recommends, it's needed for password changing.
+
+  [ Laurent Bigonville ]
+  * Add debian/patches/07_polkit_wheel_sudo_group.patch: The "wheel" group is
+    not existing on debian, check if the user is member of the "sudo" group
+    instead (Closes: #760722)
+
+  [ Andreas Henriksson ]
+  * Update debian/gnome-control-center.pkla with what is currently listed
+    in upstreams panels/common/gnome-control-center.rules since we don't yet
+    have/depend-on policykit-1 >= 0.106 which means the rules file is still
+    unused. This fixes automatic time/timezone, etc.
+
+ -- Laurent Bigonville <[e-mail]>  Sun, 07 Sep 2014 12:31:59 +0200
+
+gnome-control-center (1:3.12.1-4) unstable; urgency=medium
+
+  [ Laurent Bigonville ]
+  * debian/control.in: Recommends realmd package
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    + Drop duplicate libgnome-bluetooth-dev build dependency.
+
+  [ Andreas Henriksson ]
+  * Bump dependency on gsettings-desktop-schemas to >= 3.9.91
+    - build-dependency already set to this version.
+    - needed for newly added datetime schema
+    (Closes: #752569)
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 14 Jul 2014 23:49:42 +0200
+
+gnome-control-center (1:3.12.1-3) experimental; urgency=medium
+
+  * debian/control.in:
+    Add recommends to libnss-myhostname (Closes: #705319)
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 27 Apr 2014 18:20:29 +0200
+
+gnome-control-center (1:3.12.1-2) experimental; urgency=medium
+
+  [ Josselin Mouette ]
+  * Remove Suggests on screensavers.
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 27 Apr 2014 10:14:45 +0200
+
+gnome-control-center (1:3.12.1-1) experimental; urgency=medium
+
+  [ Laurent Bigonville]
+  * New upstream release.
+    - Add libkrb5-dev to the build-dependencies
+    - Re-add libgnome-bluetooth-dev build-dependency
+  * debian/control.in: Bump Standards-Version to 3.9.5 (no further changes)
+
+  [ Sjoerd Simons ]
+  * Re-add gnome-bluetooth support
+
+ -- Sjoerd Simons <[e-mail]>  Sat, 26 Apr 2014 18:41:34 +0200
+
+gnome-control-center (1:3.12.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 24 Mar 2014 19:58:34 +0100
+
+gnome-control-center (1:3.11.91-1) experimental; urgency=medium
+
+  [ Jordi Mallach ]
+  * Bumb Build-Depends for libgnome-bluetooth-dev to >= 3.9.3.
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - Bump libgnome-desktop-3-dev to >= 3.11.3
+    - Bump libgtk-3-dev to >= 3.11.1
+    - Bump libupower-glib-dev to >= 0.99.0
+    - Add libgrilo-0.2-dev (>= 0.2.6)
+    - Drop libsocialweb-client-dev
+  * Drop debian/patches/background-Fix-compilation-with-libsocialweb.patch
+    - socialweb integration dropped upstream.
+  * debian/rules: remove --with-libsocialweb configure flag
+  * Drop d/p/background-Fix-test-chooser-dialog-build-with-some-l.patch
+    - merged upstream.
+  * Have quilt refresh remaining patches
+  * Drop build-dependency on libgnome-bluetooth-dev [linux-any]
+    - Looks like we won't get bluez 5.x in unstable until some time
+      after hell freezes over, so just disable the bluetooth panel
+      for now to not let this hold us back.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 11 Mar 2014 23:44:49 +0100
+
+gnome-control-center (1:3.10.1-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/background-Fix-compilation-with-libsocialweb.patch
+    + Fix compilation with libsocialweb
+  * debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch
+    + Fix compilation with more strictl linkers
+  * debian/control: Recommend network-manager instead of depending
+    (Closes: #726395)
+
+ -- Sjoerd Simons <[e-mail]>  Fri, 01 Nov 2013 23:11:23 +0100
+
 gnome-control-center (1:3.8.6-0ubuntu5) utopic; urgency=medium
 
   * Actually do a no change rebuild against new libgtop
@@ -67,6 +214,153 @@
 
  -- Robert Ancell <[e-mail]>  Wed, 04 Dec 2013 11:03:26 +1300
 
+gnome-control-center (1:3.8.3-3) unstable; urgency=low
+
+  * Drop recommends on gnome-session, it doesn't seem to be needed anymore
+    and brings in all of gnome when installing network-manager-gnome which
+    is also used in non-gnome environments.
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 13 Oct 2013 18:04:36 +0200
+
+gnome-control-center (1:3.8.3-2) experimental; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    + Recommend gkbd-capplet, used by the Region & Language panel to
+      display the selected keyboard layout.
+    + Recommend ntp for the Date & Time panel.
+
+  [ Laurent Bigonville ]
+  * debian/control.in:
+    - Use canonical URL for Vcs-Svn field
+    - Drop duplicate Section to please lintian
+    - Also Suggests libcanberra-gtk3-module
+  * debian/rules:
+    - Use DEB_LDFLAGS_MAINT_APPEND instead of LDFLAGS so we are
+      sure we are not overrinding the hardening flags
+    - Pass -Wl,-z,defs to DEB_LDFLAGS_MAINT_APPEND so we can detect undefined
+      symbols during build
+  * gnome-control-center-data.maintscript: Remove /etc/xdg/menus/gnomecc.menu
+    and /etc/xdg/autostart/gnome-sound-applet.desktop on upgrade, the files
+    are no longer shipped (Closes: #712831)
+  * debian/control.in, debian/rules: Re-enable ibus support (Closes: #720585)
+
+  [ Jeremy Bicha ]
+  * Build-depend on gtk-doc-tools instead of docbook directly
+  * Don't build-depend on gnome-doc-utils
+
+ -- Laurent Bigonville <[e-mail]>  Sat, 24 Aug 2013 14:05:49 +0200
+
+gnome-control-center (1:3.8.3-1) experimental; urgency=low
+
+  [ Andreas Henriksson ]
+  * Recommend both gnome-user-share and rygel | rygel-tracker
+    - Needs to be of recent version, but we don't have versioned recommends.
+    - This Makes Bluetooth Sharing, Personal File Sharing and Media Sharing
+      visible under the Sharing panel.
+      (Also, Remote Login will not show up until we ship a sshd.service
+       in Debian.)
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 08 Jun 2013 18:32:00 +0200
+
+gnome-control-center (1:3.8.2-1) experimental; urgency=low
+
+  [ Thomas Bechtold ]
+  * New upstream release 3.8.1.
+  * debian/control:
+    - Build-Depends on libgoa-1.0-dev (>= 3.8.1) according to
+      configure.ac.
+    - Bump Standards-Version to 3.9.4.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    + Bump minimum gnome-menus dependency to fix loading desktop
+      files from the shell. Thanks to Luca Bruno for pointing it
+      out.
+    + Recommend system-config-printer for the printers panel.
+  * New upstream release 3.8.2.
+    + Doesn't crash if the printing dbus service is missing.
+      Closes: #709451.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 25 May 2013 13:00:07 +0200
+
+gnome-control-center (1:3.8.0-2) experimental; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    + Remove obsolete libgconf2-dev build dependency.
+
+  [ Sjoerd Simons ]
+  * debian/control.in: Add libsmbclient-dev for the printer panel
+  * debian/control.in: Add libnm*-dev (>= 0.9.8) for the network panel
+  * debian/control.in: Add run-time depend on network-manager-gnome (>= 0.9.8)
+
+ -- Sjoerd Simons <[e-mail]>  Wed, 10 Apr 2013 09:22:02 +0100
+
+gnome-control-center (1:3.8.0-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * debian/gnome-control-center-data.install, gnome-control-center.install:
+    - Move the new polkit rules to gnome-control-center-data
+      like the existing rule
+  * debian/control.in:
+    - Add temporary breaks/replaces for the previous change
+  * Add gnome-control-center.pkla to allow admins to change the hostname
+    without needing policykit from experimental (Closes: #693071)
+
+  [ Thomas Bechtold ]
+  *  New upstream release
+
+ -- Thomas Bechtold <[e-mail]>  Wed, 27 Mar 2013 19:02:54 +0100
+
+gnome-control-center (1:3.7.92-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/patches/90_force_fallback.patch
+    + Dropped, no longer applicable
+  * debian/patches/revert_git_datetime_port.patch
+    + Follow upstream in the systemd datetime usage
+  * debian/control.in: Bump build-deps
+  * debian/control.in: Add run-time depend on colord
+  * debian/gnome-control-center.install: Don't install panel .so files, all
+    plugins are now static
+  * debian/gnome-control-center-data.install: Remove installation of fallback
+    files, no longer shipped with g-c-c
+
+  [ Jean Schurger ]
+  * debian/control.in: Dropped valac build-dependency (not longer needed).
+
+  [ Sjoerd Simons ]
+  * New upstream release (3.7.92)
+  * debian/gnome-control-center.install: Install policykit rules & search
+    provider
+  * debian/control.in: Depend on gnome-icon-theme >= 3.7
+
+ -- Sjoerd Simons <[e-mail]>  Sat, 23 Mar 2013 20:19:50 +0100
+
+gnome-control-center (1:3.6.3-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * debian/control.in: Bump libgnome-bluetooth-dev to >= 3.5.5
+  * debian/control.in: Bump libcheese-gtk-dev to >= 3.5.91
+
+  [ Jeremy Bicha ]
+  * New upstream version.
+  * debian/gnome-control-center.sgml, debian/gnome-control-center.install
+    debian/rules
+    - Ship improved man page from GNOME
+
+  [ Aron Xu ]
+  * debian/control.in debian/rules: disable ibus integration.
+    (Closes: #694301, #691656)
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 10 Feb 2013 13:17:20 +0100
+
 gnome-control-center (1:3.6.3-0ubuntu57) utopic; urgency=medium
 
   * debian/patches/ubuntu-gnome-version.patch: Merge build-time versioned
@@ -713,6 +1007,96 @@
 
  -- Sebastien Bacher <[e-mail]>  Wed, 21 Nov 2012 19:32:45 +0100
 
+gnome-control-center (1:3.6.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Andreas Henriksson ]
+  * Fix typo in gsettings-desktop-schemas-dev build dependency version
+    (3.3.91 should be 3.5.91). (Closes: #693027)
+
+  [ Simon McVittie ]
+  * Bump build-dependency to libgnome-desktop-3-dev (>= 3.5.91) as well,
+    otherwise it'll continue to FTBFS
+  * New upstream release
+  * Install org.gnome.controlcenter.user-accounts.policy PolicyKit rule,
+    which means that authenticating for
+    org.gnome.controlcenter.user-accounts.administration is sufficient
+    to administer accountsservice and (if later added to Debian) realmd
+  * Do not install gnome-control-center.rules for now; it won't work in Debian
+    since we don't have a wheel group. Patching it to use group sudo is
+    a possibility for a future upload.
+
+ -- Simon McVittie <[e-mail]>  Mon, 12 Nov 2012 17:14:50 +0000
+
+gnome-control-center (1:3.6.1-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Add missing epoch on libxi build-dependency.
+
+  [ Michael Biebl ]
+  * Rebuild with xz compression. Closes: #687279
+
+  [ Sjoerd Simons ]
+  * New upstream release (3.6.1)
+  * debian/control.in: Updated dependencies
+  * debian/patches/02_no_assert_on_null_streams.patch
+    + Removed, was supposed to be a temporary patch
+  * debian/patches/10_optional_wacom_support.patch
+    + Removed, fixed upstream
+  * debian/patches/90_force_fallback.patch: Refreshed
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 14 Oct 2012 21:42:26 +0200
+
+gnome-control-center (1:3.4.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <[e-mail]>  Wed, 30 May 2012 12:54:24 +0200
+
+gnome-control-center (1:3.4.2-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Sync with Ubuntu:
+    + debian/control.in: Update build-depends
+    + debian/patches/02_no_assert_on_null_streams.patch:
+      - Don't crash on null streams (bgo: #633728, LP: #741155)
+    + debian/patches/90_force_fallback.patch:
+      - Refreshed
+    + debian/patches/06_handle_passwd_with_ldap.patch:
+      - Refreshed
+    + debian/patches/revert_git_datetime_port.patch:
+      - Added, don't switch to systemd for datetime functionality just yet.
+  * Drop libgnome-control-center1 package, gnome-control-center no longer
+    builds a library.
+  * debian/patches/00git_handle_media_dialog_close.patch,
+    debian/patches/91_configure_cheese.patch,
+    debian/patches/08_dont_crash_on_null_territories.patch,
+    debian/patches/92_link_language_chooser_against_fontconfig.patch:
+    + All removed, fixed upstream
+  * debian/rules: Don't use -Wl,-z,defs as it cause the panel plugins to fail
+    to build
+  * debian/gnome-control-center-data.install: gnome-control-center no longer
+    ships a manual.
+
+  [ Michael Biebl ]
+  * Add Build-Depends on libwacom-dev and libxi-dev for the Wacom panel and
+    libgnome-bluetooth-dev for the Bluetooth panel.
+  * Mark libwacom-dev and libgnome-bluetooth-dev as linux-any.
+  * Update Build-Depends according to configure.ac.
+  * Add Breaks/Replaces: gnome-bluetooth (<< 3.4) as the Bluetooth panel moved
+    into gnome-control-center.
+  * debian/patches/10_optional_wacom_support.patch: Build the Wacom panel
+    conditionally to support plattforms where libwacom-dev is not available.
+  * Bump Standards-Version to 3.9.3.
+  * Add Breaks against libgnome-bluetooth8 since loading booth
+    libgnome-bluetooth8 and libgnome-bluetooth10 will lead to crashes when
+    using the Bluetooth panel. Eventually we should use versioned directories
+    for the gnome-bluetooth plugins but for now the Breaks will do.
+
+ -- Michael Biebl <[e-mail]>  Sat, 19 May 2012 23:57:55 +0200
+
 gnome-control-center (1:3.4.2-0ubuntu20) quantal-proposed; urgency=low
 
   * debian/patches/04_new_appearance_settings.patch
@@ -1382,6 +1766,14 @@
 
  -- Sebastien Bacher <[e-mail]>  Wed, 15 Feb 2012 23:16:31 +0100
 
+gnome-control-center (1:3.2.2-3) unstable; urgency=low
+
+  * debian/patches/92_link_language_chooser_against_fontconfig.patch: Link
+    language chooser panel against fontconfig. Patch cherry-picked from
+    upstream Git.
+
+ -- Michael Biebl <[e-mail]>  Thu, 29 Mar 2012 23:36:02 +0200
+
 gnome-control-center (1:3.2.2-2ubuntu10) precise; urgency=low
 
   * debian/patches/97_unity_power_ui.patch:
 
=== modified file 'debian/control'
--- debian/control	2014-05-06 09:05:08 +0000
+++ debian/control	2014-09-30 05:25:02 +0000
@@ -7,65 +7,62 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>
-Standards-Version: 3.9.4
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>, Sjoerd Simons <[e-mail]>
+Standards-Version: 3.9.5
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
+               dpkg-dev (>= 1.16.1~),
+               libaccountsservice-dev (>= 0.6.30),
                desktop-file-utils,
                dh-autoreconf,
-               gtk-doc-tools,
-               libgirepository1.0-dev (>= 0.9.7),
                gnome-common,
                gnome-pkg-tools (>= 0.10),
-               gnome-settings-daemon-dev (>= 3.8.4),
-               gsettings-desktop-schemas-dev (>= 3.7.2.2),
-               hardening-wrapper,
+               gnome-settings-daemon-dev (>= 3.7.3),
+               gsettings-desktop-schemas-dev (>= 3.9.91),
+               gtk-doc-tools,
                intltool (>= 0.37.1),
                libcanberra-gtk3-dev,
-               libcheese-gtk-dev (>= 2.91.91.1),
+               libcheese-gtk-dev (>= 3.5.91),
                libcolord-dev (>= 0.1.29),
                libcolord-gtk-dev (>= 0.1.24),
                libcups2-dev,
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libgdk-pixbuf2.0-dev (>= 2.23.0),
-               libglib2.0-dev (>= 2.35.1),
-               libgnome-bluetooth-dev (>= 3.3.4),
-               libgnome-desktop-3-dev (>= 3.7.5),
+               libgirepository1.0-dev,
+               libglib2.0-dev (>= 2.37.7),
+               libgnome-desktop-3-dev (>= 3.11.3),
                libgnome-menu-3-dev,
-               libgnomekbd-dev,
-               libgoa-1.0-dev (>= 3.10.0),
-               libaccountsservice-dev (>= 0.6.30),
-               libgstreamer-plugins-base0.10-dev,
-               libgtk-3-dev (>= 3.7.7),
+               libgnomekbd-dev (>= 2.91.91),
+               libgnome-bluetooth-dev (>= 3.3.4) [linux-any],
+               libibus-1.0-dev (>= 1.5.2),
+               libgoa-1.0-dev (>= 3.9.90),
+               libgrilo-0.2-dev (>= 0.2.6),
+               libgtk-3-dev (>= 3.11.1),
                libgtop2-dev,
-               libibus-1.0-dev (>= 1.5.0),
                libkrb5-dev,
                libnm-glib-dev (>= 0.9.8) [linux-any],
-               libnm-glib-vpn-dev (>= 0.9.8) [linux-any], 
-               libnm-gtk-dev (>= 0.9.7.995) [linux-any],
+               libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
+               libnm-gtk-dev (>= 0.9.8) [linux-any],
                libnm-util-dev (>= 0.9.8) [linux-any],
                libmm-glib-dev [linux-any],
                libnotify-dev (>= 0.7.3),
                libpolkit-gobject-1-dev (>= 0.103),
-               libpulse-dev (>= 1:2.0),
+               libpulse-dev,
                libpwquality-dev,
-               libsmbclient-dev,
-#               libsocialweb-client-dev,
-               libupower-glib-dev (>= 0.9.1),
-               libsystemd-login-dev,
-               libwacom-dev (>= 0.7),
+               libsmbclient-dev (>= 2:3.6.12),
+               libupower-glib-dev (>= 0.9.0),
+               libwacom-dev (>= 0.7) [linux-any],
+               libxi-dev (>= 2:1.2),
                libx11-dev,
                libxft-dev (>= 2.1.2),
-               libxkbfile-dev,
                libxklavier-dev (>= 5.1),
                libxml2-dev,
                locales,
                network-manager-dev (>= 0.9.8) [linux-any],
                shared-mime-info,
                ttf-ubuntu-font-family,
-               libwebkitgtk-3.0-dev,
                libgl1-mesa-dev,
                valac (>= 0.20.0),
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu
@@ -77,38 +74,40 @@
          ${shlibs:Depends},
          accountsservice,
          apg,
+         colord (>= 0.1.30),
          desktop-file-utils,
-         gkbd-capplet (>= 3.5.90),
          gnome-control-center-data (<< ${gnome:NextVersion}),
          gnome-control-center-data (>= ${source:Version}),
          gnome-desktop3-data,
-         gnome-icon-theme (>= 2.24),
-         gnome-icon-theme-symbolic,
-         gnome-menus (>= 2.12.0),
-         gnome-settings-daemon (>= 3.8.4),
-         gsettings-desktop-schemas (>= 3.5.91),
+         gnome-icon-theme (>= 3.7),
+         gnome-icon-theme-symbolic (>= 3.7),
+         gnome-menus (>= 3.7.90),
+         gnome-settings-daemon (>= 3.7.91),
+         gsettings-desktop-schemas (>= 3.9.91),
 Recommends: cups-pk-helper,
-            gnome-session-bin,
-            ubuntu-system-service,
+            gnome-control-center-shared-data,
+#            gnome-session-bin,
+            gnome-user-share,
+            gkbd-capplet,
             ibus (>= 1.5.0),
             iso-codes,
+            libcanberra-pulse,
             mousetweaks,
+            ntp,
             policykit-1-gnome,
-            libcanberra-pulse,
             system-config-printer-gnome,
-            gnome-control-center-shared-data
-Replaces: gnome-bluetooth (<< 3.4.0)
+            cracklib-runtime,
+            ubuntu-system-service,
 Breaks: gnome-power-manager (<< 3.0),
         gnome-session (<< 3.0),
         libglib2.0-0 (<< 2.28.6-2),
-        gnome-bluetooth (<< 3.4.0),
-        compiz (<< 1:0.9.8+bzr330),
-        metacity (<< 1:2.34.2),
-        unity (<< 6.2-0ubuntu2~),
+        gnome-bluetooth (<< 3.4),
+Replaces: gnome-bluetooth (<< 3.4.0)
 Suggests: gnome-screensaver | xscreensaver,
           gnome-user-guide | ubuntu-docs,
           gstreamer0.10-pulseaudio,
           libcanberra-gtk-module,
+          libcanberra-gtk3-module,
           x11-xserver-utils
 Description: utilities to configure the GNOME desktop
  This package contains configuration applets for the GNOME desktop,
@@ -138,11 +137,13 @@
           gdm3 (<< 3.0),
           gnome-media-common (<< 2.91),
           gnome-power-manager (<< 3.2),
-          gnome-settings-daemon (<< 3.0)
+          gnome-settings-daemon (<< 3.0),
+          gnome-control-center (<< 1:3.7.92-2~)
 Breaks: gdm (<< 3.0),
         gdm3 (<< 3.0),
         gnome-power-manager (<< 3.2),
-        gnome-settings-daemon (<< 3.0)
+        gnome-settings-daemon (<< 3.0),
+        gnome-control-center (<< 1:3.7.92-2~)
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-05-06 01:47:50 +0000
+++ debian/control.in	2014-09-30 05:25:02 +0000
@@ -4,64 +4,61 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
+               dpkg-dev (>= 1.16.1~),
+               libaccountsservice-dev (>= 0.6.30),
                desktop-file-utils,
                dh-autoreconf,
-               gtk-doc-tools,
-               libgirepository1.0-dev (>= 0.9.7),
                gnome-common,
                gnome-pkg-tools (>= 0.10),
-               gnome-settings-daemon-dev (>= 3.8.4),
-               gsettings-desktop-schemas-dev (>= 3.7.2.2),
-               hardening-wrapper,
+               gnome-settings-daemon-dev (>= 3.7.3),
+               gsettings-desktop-schemas-dev (>= 3.9.91),
+               gtk-doc-tools,
                intltool (>= 0.37.1),
                libcanberra-gtk3-dev,
-               libcheese-gtk-dev (>= 2.91.91.1),
+               libcheese-gtk-dev (>= 3.5.91),
                libcolord-dev (>= 0.1.29),
                libcolord-gtk-dev (>= 0.1.24),
                libcups2-dev,
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libgdk-pixbuf2.0-dev (>= 2.23.0),
-               libglib2.0-dev (>= 2.35.1),
-               libgnome-bluetooth-dev (>= 3.3.4),
-               libgnome-desktop-3-dev (>= 3.7.5),
+               libgirepository1.0-dev,
+               libglib2.0-dev (>= 2.37.7),
+               libgnome-desktop-3-dev (>= 3.11.3),
                libgnome-menu-3-dev,
-               libgnomekbd-dev,
-               libgoa-1.0-dev (>= 3.10.0),
-               libaccountsservice-dev (>= 0.6.30),
-               libgstreamer-plugins-base0.10-dev,
-               libgtk-3-dev (>= 3.7.7),
+               libgnomekbd-dev (>= 2.91.91),
+               libgnome-bluetooth-dev (>= 3.3.4) [linux-any],
+               libibus-1.0-dev (>= 1.5.2),
+               libgoa-1.0-dev (>= 3.9.90),
+               libgrilo-0.2-dev (>= 0.2.6),
+               libgtk-3-dev (>= 3.11.1),
                libgtop2-dev,
-               libibus-1.0-dev (>= 1.5.0),
                libkrb5-dev,
                libnm-glib-dev (>= 0.9.8) [linux-any],
-               libnm-glib-vpn-dev (>= 0.9.8) [linux-any], 
-               libnm-gtk-dev (>= 0.9.7.995) [linux-any],
+               libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
+               libnm-gtk-dev (>= 0.9.8) [linux-any],
                libnm-util-dev (>= 0.9.8) [linux-any],
                libmm-glib-dev [linux-any],
                libnotify-dev (>= 0.7.3),
                libpolkit-gobject-1-dev (>= 0.103),
-               libpulse-dev (>= 1:2.0),
+               libpulse-dev,
                libpwquality-dev,
-               libsmbclient-dev,
-#               libsocialweb-client-dev,
-               libupower-glib-dev (>= 0.9.1),
-               libsystemd-login-dev,
-               libwacom-dev (>= 0.7),
+               libsmbclient-dev (>= 2:3.6.12),
+               libupower-glib-dev (>= 0.9.0),
+               libwacom-dev (>= 0.7) [linux-any],
+               libxi-dev (>= 2:1.2),
                libx11-dev,
                libxft-dev (>= 2.1.2),
-               libxkbfile-dev,
                libxklavier-dev (>= 5.1),
                libxml2-dev,
                locales,
                network-manager-dev (>= 0.9.8) [linux-any],
                shared-mime-info,
                ttf-ubuntu-font-family,
-               libwebkitgtk-3.0-dev,
                libgl1-mesa-dev,
                valac (>= 0.20.0),
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu
@@ -73,38 +70,40 @@
          ${shlibs:Depends},
          accountsservice,
          apg,
+         colord (>= 0.1.30),
          desktop-file-utils,
-         gkbd-capplet (>= 3.5.90),
          gnome-control-center-data (<< ${gnome:NextVersion}),
          gnome-control-center-data (>= ${source:Version}),
          gnome-desktop3-data,
-         gnome-icon-theme (>= 2.24),
-         gnome-icon-theme-symbolic,
-         gnome-menus (>= 2.12.0),
-         gnome-settings-daemon (>= 3.8.4),
-         gsettings-desktop-schemas (>= 3.5.91),
+         gnome-icon-theme (>= 3.7),
+         gnome-icon-theme-symbolic (>= 3.7),
+         gnome-menus (>= 3.7.90),
+         gnome-settings-daemon (>= 3.7.91),
+         gsettings-desktop-schemas (>= 3.9.91),
 Recommends: cups-pk-helper,
-            gnome-session-bin,
-            ubuntu-system-service,
+            gnome-control-center-shared-data,
+#            gnome-session-bin,
+            gnome-user-share,
+            gkbd-capplet,
             ibus (>= 1.5.0),
             iso-codes,
+            libcanberra-pulse,
             mousetweaks,
+            ntp,
             policykit-1-gnome,
-            libcanberra-pulse,
             system-config-printer-gnome,
-            gnome-control-center-shared-data
-Replaces: gnome-bluetooth (<< 3.4.0)
+            cracklib-runtime,
+            ubuntu-system-service,
 Breaks: gnome-power-manager (<< 3.0),
         gnome-session (<< 3.0),
         libglib2.0-0 (<< 2.28.6-2),
-        gnome-bluetooth (<< 3.4.0),
-        compiz (<< 1:0.9.8+bzr330),
-        metacity (<< 1:2.34.2),
-        unity (<< 6.2-0ubuntu2~),
+        gnome-bluetooth (<< 3.4),
+Replaces: gnome-bluetooth (<< 3.4.0)
 Suggests: gnome-screensaver | xscreensaver,
           gnome-user-guide | ubuntu-docs,
           gstreamer0.10-pulseaudio,
           libcanberra-gtk-module,
+          libcanberra-gtk3-module,
           x11-xserver-utils
 Description: utilities to configure the GNOME desktop
  This package contains configuration applets for the GNOME desktop,
@@ -134,11 +133,13 @@
           gdm3 (<< 3.0),
           gnome-media-common (<< 2.91),
           gnome-power-manager (<< 3.2),
-          gnome-settings-daemon (<< 3.0)
+          gnome-settings-daemon (<< 3.0),
+          gnome-control-center (<< 1:3.7.92-2~)
 Breaks: gdm (<< 3.0),
         gdm3 (<< 3.0),
         gnome-power-manager (<< 3.2),
-        gnome-settings-daemon (<< 3.0)
+        gnome-settings-daemon (<< 3.0),
+        gnome-control-center (<< 1:3.7.92-2~)
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
=== added file 'debian/gnome-control-center-data.maintscript'
--- debian/gnome-control-center-data.maintscript	1970-01-01 00:00:00 +0000
+++ debian/gnome-control-center-data.maintscript	2014-09-30 05:25:02 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/xdg/menus/gnomecc.menu 1:3.8.3-2~
+rm_conffile /etc/xdg/autostart/gnome-sound-applet.desktop 1:3.8.3-2~
 
=== added file 'debian/gnome-control-center-data.postinst'
--- debian/gnome-control-center-data.postinst	1970-01-01 00:00:00 +0000
+++ debian/gnome-control-center-data.postinst	2014-09-30 05:25:02 +0000
@@ -0,0 +1,8 @@
+#! /bin/sh
+set -e
+
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "1:2.26"; then
+    rm -f /etc/xdg/autostart/gnome-at-session.desktop
+fi
+
+#DEBHELPER#
 
=== modified file 'debian/gnome-control-center.install'
--- debian/gnome-control-center.install	2014-02-12 00:19:03 +0000
+++ debian/gnome-control-center.install	2014-09-30 05:25:02 +0000
@@ -1,3 +1,8 @@
-usr/bin/gnome-control-center
+usr/bin
 usr/share/applications
 usr/share/man
+usr/lib/gnome-control-center
+usr/share/bash-completion
+usr/share/dbus-1
+usr/share/gnome-shell
+
 
=== modified file 'debian/gnome-control-center.pkla'
--- debian/gnome-control-center.pkla	2013-04-10 20:04:02 +0000
+++ debian/gnome-control-center.pkla	2014-09-30 05:25:02 +0000
@@ -1,4 +1,4 @@
-[Allow admins to set the hostname without prompting]
+[Allow admins to set the hostname,locale,keyboard,date/time without prompting]
 Identity=unix-group:admin;unix-group:sudo
-Action=org.freedesktop.hostname1.set-static-hostname;org.freedesktop.hostname1.set-hostname
+Action=org.freedesktop.locale1.set-locale;org.freedesktop.locale1.set-keyboard;org.freedesktop.hostname1.set-static-hostname;org.freedesktop.hostname1.set-hostname;org.gnome.controlcenter.datetime.configure
 ResultActive=yes
 
=== added file 'debian/gnome-control-center.postinst'
--- debian/gnome-control-center.postinst	1970-01-01 00:00:00 +0000
+++ debian/gnome-control-center.postinst	2014-09-30 05:25:02 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+rm -f /etc/gnome-vfs-2.0/modules/theme-method.conf
+rm -f /etc/gnome-vfs-2.0/modules/font-method.conf
+
+#DEBHELPER#
 
=== added file 'debian/gnome-control-center.postrm'
--- debian/gnome-control-center.postrm	1970-01-01 00:00:00 +0000
+++ debian/gnome-control-center.postrm	2014-09-30 05:25:02 +0000
@@ -0,0 +1,12 @@
+#! /bin/sh
+set -e
+
+case "$1" in
+purge)
+	rm -f /etc/gnome-settings-daemon/xrandr/monitors.xml || true
+	;;
+*)
+	;;
+esac
+
+#DEBHELPER#
 
=== added file 'debian/patches/01_menu_category.patch'
--- debian/patches/01_menu_category.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_menu_category.patch	2014-09-30 05:25:02 +0000
@@ -0,0 +1,13 @@
+diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
+index a7160bd..b8c543f 100644
+--- a/shell/gnome-control-center.desktop.in.in
++++ b/shell/gnome-control-center.desktop.in.in
+@@ -5,7 +5,7 @@ Exec=gnome-control-center --overview
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;System;
++Categories=GNOME;GTK;Settings;
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
 
=== removed file 'debian/patches/02_new_goa.patch'
--- debian/patches/02_new_goa.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/02_new_goa.patch	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-Index: gnome-control-center-3.8.6/panels/online-accounts/cc-online-accounts-panel.c
-===================================================================
---- gnome-control-center-3.8.6.orig/panels/online-accounts/cc-online-accounts-panel.c	2013-12-12 14:00:10.759923318 +1300
-+++ gnome-control-center-3.8.6/panels/online-accounts/cc-online-accounts-panel.c	2013-12-12 14:00:10.755923318 +1300
-@@ -617,8 +617,11 @@
- /* ---------------------------------------------------------------------------------------------------- */
- 
- static void
--add_account (CcGoaPanel *panel)
-+get_all_providers_cb (GObject      *source,
-+                      GAsyncResult *res,
-+                      gpointer      user_data)
- {
-+  CcGoaPanel *panel = CC_GOA_PANEL (user_data);
-   GtkWindow *parent;
-   GtkWidget *dialog;
-   gint response;
-@@ -629,12 +632,14 @@
- 
-   providers = NULL;
- 
-+  if (!goa_provider_get_all_finish (&providers, res, NULL))
-+    goto out;
-+
-   parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel))));
- 
-   dialog = goa_panel_add_account_dialog_new (panel->client);
-   gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
- 
--  providers = goa_provider_get_all ();
-   for (l = providers; l != NULL; l = l->next)
-     {
-       GoaProvider *provider;
-@@ -697,6 +703,12 @@
-   g_list_free (providers);
- }
- 
-+static void
-+add_account (CcGoaPanel *panel)
-+{
-+  goa_provider_get_all (get_all_providers_cb, panel);
-+}
-+
- /* ---------------------------------------------------------------------------------------------------- */
- 
- static void
 
=== added file 'debian/patches/06_handle_passwd_with_ldap.patch'
--- debian/patches/06_handle_passwd_with_ldap.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06_handle_passwd_with_ldap.patch	2014-09-30 05:25:02 +0000
@@ -0,0 +1,19 @@
+Description: Handle the case where passwd re-asks for the current password when it was entered incorrectly (when using LDAP)
+ Based on a patch from Ryan Tandy
+Author: Chris Coulson <[e-mail]>
+Bug-Ubuntu: https:/launchpad.net/bugs/607357
+Forwarded: no
+
+Index: gnome-control-center-3.3.91/panels/user-accounts/run-passwd.c
+===================================================================
+--- gnome-control-center-3.3.91.orig/panels/user-accounts/run-passwd.c	2011-08-25 17:09:31.000000000 +0200
++++ gnome-control-center-3.3.91/panels/user-accounts/run-passwd.c	2012-03-06 17:52:14.335082975 +0100
+@@ -408,7 +408,7 @@
+ 
+                         if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) {
+ 
+-                                if (strstr (str->str, "assword: ") != NULL) {
++                                if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "incorrect") == NULL) {
+                                         /* Authentication successful */
+ 
+                                         passwd_handler->backend_state = PASSWD_STATE_NEW;
 
=== added file 'debian/patches/07_polkit_wheel_sudo_group.patch'
--- debian/patches/07_polkit_wheel_sudo_group.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/07_polkit_wheel_sudo_group.patch	2014-09-30 05:25:02 +0000
@@ -0,0 +1,16 @@
+Description: The "wheel" group is not existing on debian, check the "sudo" one instead
+Author: Laurent Bigonville <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760722
+Forwarded: not-needed
+
+--- a/panels/common/gnome-control-center.rules
++++ b/panels/common/gnome-control-center.rules
+@@ -6,7 +6,7 @@ polkit.addRule(function(action, subject)
+ 	     action.id == "org.gnome.controlcenter.datetime.configure") &&
+ 	    subject.local &&
+ 	    subject.active &&
+-	    subject.isInGroup ("wheel")) {
++	    subject.isInGroup ("sudo")) {
+ 		    return polkit.Result.YES;
+ 	    }
+ });
 
=== modified file 'debian/patches/52_region_language.patch'
--- debian/patches/52_region_language.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/52_region_language.patch	2014-09-30 05:25:02 +0000
@@ -140,7 +140,7 @@
  	g_debug ("Trying to select lang '%s' in treeview", lang);
  	model = gtk_tree_view_get_model (treeview);
  	found = FALSE;
-@@ -513,6 +574,7 @@
+@@ -518,6 +579,7 @@
  	return lang;
  }
  
@@ -148,7 +148,7 @@
  static void
  add_other_users_language (GHashTable *ht)
  {
-@@ -573,6 +635,7 @@
+@@ -578,6 +640,7 @@
  
          g_object_unref (proxy);
  }
@@ -156,7 +156,7 @@
  
  static void
  insert_language (GHashTable *ht,
-@@ -596,10 +659,10 @@
+@@ -601,10 +664,10 @@
  
          g_debug ("We have translations for %s", lang);
  
@@ -169,7 +169,7 @@
  
          label_own_lang = gnome_get_language_from_locale (key, key);
          label_current_lang = gnome_get_language_from_locale (key, NULL);
-@@ -625,9 +688,18 @@
+@@ -630,9 +693,18 @@
  cc_common_language_get_initial_languages (void)
  {
          GHashTable *ht;
@@ -188,7 +188,7 @@
          insert_language (ht, "en_US");
          insert_language (ht, "en_GB");
          insert_language (ht, "de_DE");
-@@ -637,7 +709,7 @@
+@@ -642,7 +714,7 @@
          insert_language (ht, "ja_JP");
          insert_language (ht, "ru_RU");
          insert_language (ht, "ar_EG");
@@ -197,7 +197,7 @@
          return ht;
  }
  
-@@ -651,10 +723,10 @@
+@@ -656,10 +728,10 @@
          ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
  
          /* Add the languages used by other users on the system */
@@ -210,7 +210,7 @@
          if (g_hash_table_lookup (ht, name) == NULL) {
                  language = gnome_get_language_from_locale (name, NULL);
                  g_hash_table_insert (ht, name, language);
-@@ -703,6 +775,28 @@
+@@ -708,6 +780,28 @@
          return ht;
  }
  
@@ -239,7 +239,7 @@
  static void
  foreach_user_lang_cb (gpointer key,
                        gpointer value,
-@@ -734,7 +828,7 @@
+@@ -739,7 +833,7 @@
          user_langs = cc_common_language_get_initial_languages ();
  
          /* Add the current locale first */
@@ -248,7 +248,7 @@
          display = g_hash_table_lookup (user_langs, name);
          if (!display) {
                  insert_language (user_langs, name);
-@@ -750,8 +844,8 @@
+@@ -755,8 +849,8 @@
          g_hash_table_foreach (user_langs, (GHFunc) foreach_user_lang_cb, store);
  
          /* And now the "Other…" selection */
@@ -287,8 +287,8 @@
   * Copyright (C) 2013 Red Hat, Inc
   *
   * This program is free software; you can redistribute it and/or modify
-@@ -79,7 +78,9 @@
-                                 egg_list_box_refilter (EGG_LIST_BOX (priv->language_list));
+@@ -335,7 +334,9 @@
+                                 gtk_list_box_invalidate_filter (GTK_LIST_BOX (priv->language_list));
                          }
                  } else {
 +
@@ -299,7 +299,7 @@
          g_list_free (children);
 --- a/panels/region/cc-format-chooser.c
 +++ b/panels/region/cc-format-chooser.c
-@@ -170,7 +170,9 @@
+@@ -168,7 +168,9 @@
  
                  } else {
                          /* mark as unselected */
@@ -311,7 +311,7 @@
          g_list_free (children);
 --- a/panels/region/cc-input-chooser.c
 +++ b/panels/region/cc-input-chooser.c
-@@ -909,7 +909,7 @@
+@@ -891,7 +891,7 @@
            lang_code != NULL &&
            country_code != NULL)
          {
@@ -320,7 +320,7 @@
  
            info = g_hash_table_lookup (priv->locales, locale);
            if (info)
-@@ -1034,7 +1034,7 @@
+@@ -1016,7 +1016,7 @@
        if (!gnome_parse_locale (*locale, &lang_code, &country_code, NULL, NULL))
          continue;
  
@@ -331,7 +331,7 @@
            g_free (simple_locale);
 --- a/panels/region/cc-region-panel.c
 +++ b/panels/region/cc-region-panel.c
-@@ -404,14 +404,55 @@
+@@ -424,6 +424,47 @@
  }
  
  static void
@@ -379,17 +379,15 @@
  update_region (CcRegionPanel *self,
                 const gchar   *region)
  {
--	CcRegionPanelPrivate *priv = self->priv;
-+        CcRegionPanelPrivate *priv = self->priv;
- 
-         if (g_strcmp0 (region, priv->region) == 0)
-                 return;
--
-+        set_formats_locale(region);
-         g_settings_set_string (priv->locale_settings, KEY_REGION, region);
-         maybe_notify (self, LC_TIME, region);
- }
-@@ -545,7 +586,7 @@
+@@ -434,6 +475,7 @@
+         } else {
+                 if (g_strcmp0 (region, priv->region) == 0)
+                         return;
++                set_formats_locale(region);
+                 g_settings_set_string (priv->locale_settings, KEY_REGION, region);
+                 if (priv->login_auto_apply)
+                         set_system_region (self, region);
+@@ -595,7 +637,7 @@
          CcRegionPanelPrivate *priv = self->priv;
  
          g_free (priv->region);
@@ -398,20 +396,21 @@
          update_region_label (self);
  }
  
-@@ -576,14 +617,16 @@
+@@ -628,15 +670,17 @@
+ update_language_from_user (CcRegionPanel *self)
  {
  	CcRegionPanelPrivate *priv = self->priv;
-         const gchar *language;
--
+-        const gchar *language;
++        const gchar *language, *locale;
+ 
 -        if (act_user_is_loaded (priv->user))
-+        const gchar *locale;
 +        if (act_user_is_loaded (priv->user)){
                  language = act_user_get_language (priv->user);
 +                cc_common_language_get_locale (language, &locale);
 +        }
          else
--                language = "en_US.utf-8";
-+                locale = "en_US.UTF-8";
+-                language = setlocale (LC_MESSAGES, NULL);
++                locale = setlocale (LC_MESSAGES, NULL);
  
          g_free (priv->language);
 -        priv->language = g_strdup (language);
@@ -419,7 +418,7 @@
          update_language_label (self);
  }
  
-@@ -1428,6 +1471,16 @@
+@@ -1484,6 +1528,16 @@
          update_buttons (self);
  }
  
@@ -436,7 +435,7 @@
  static void
  on_localed_properties_changed (GDBusProxy     *proxy,
                                 GVariant       *changed_properties,
-@@ -1442,34 +1495,49 @@
+@@ -1498,34 +1552,50 @@
                  const gchar **strv;
                  gsize len;
                  gint i;
@@ -468,11 +467,12 @@
 +                g_free (strv);
 +
                  if (!lang) {
--                        lang = "";
+-                        lang = setlocale (LC_MESSAGES, NULL);
 +                        lang = g_strdup ("en_US.UTF-8");
                  }
 -                if (!messages) {
 -                        messages = lang;
++
 +                if (!language) {
 +                        if (messages)
 +                                language = g_strdup (messages);
@@ -496,7 +496,7 @@
  
                  update_language_label (self);
          }
-@@ -1539,29 +1607,28 @@
+@@ -1595,29 +1665,28 @@
  	CcRegionPanelPrivate *priv = self->priv;
          GVariantBuilder *b;
          gchar *s;
@@ -542,7 +542,7 @@
                             g_variant_new ("(asb)", b, TRUE),
 --- a/panels/user-accounts/um-user-panel.c
 +++ b/panels/user-accounts/um-user-panel.c
-@@ -697,8 +697,9 @@
+@@ -701,8 +701,9 @@
          cc_common_language_add_user_languages (model);
  
          lang = g_strdup (act_user_get_language (user));
@@ -553,7 +553,7 @@
          if (cc_common_language_get_iter_for_language (model, lang, &iter))
            um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
          g_free (lang);
-@@ -824,8 +825,9 @@
+@@ -828,8 +829,9 @@
          }
          else {
                  lang = g_strdup (act_user_get_language (user));
@@ -564,7 +564,7 @@
                  }
          }
          cc_common_language_get_iter_for_language (model, lang, &iter);
-@@ -845,6 +847,7 @@
+@@ -849,6 +851,7 @@
          GtkTreeModel *model;
          GtkTreeIter iter;
          gchar *lang;
@@ -572,7 +572,7 @@
          ActUser *user;
  
          if (!um_editable_combo_get_active_iter (combo, &iter))
-@@ -855,8 +858,10 @@
+@@ -859,8 +862,10 @@
          model = um_editable_combo_get_model (combo);
  
          gtk_tree_model_get (model, &iter, 0, &lang, -1);
 
=== modified file 'debian/patches/99_add_lock-on-suspend.patch'
--- debian/patches/99_add_lock-on-suspend.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/99_add_lock-on-suspend.patch	2014-09-30 05:25:02 +0000
@@ -12,11 +12,9 @@
  panels/privacy/privacy.ui         | 31 +++++++++++++++++++++++++++++++
  2 files changed, 36 insertions(+)
 
-diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
-index d92b9e4..fb1be4c 100644
 --- a/panels/privacy/cc-privacy-panel.c
 +++ b/panels/privacy/cc-privacy-panel.c
-@@ -299,6 +299,11 @@ add_screen_lock (CcPrivacyPanel *self)
+@@ -276,6 +276,11 @@
    g_settings_bind (self->priv->notification_settings, "show-in-lock-screen",
                     w, "active",
                     G_SETTINGS_BIND_DEFAULT);
@@ -28,11 +26,9 @@
  }
  
  static void
-diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
-index ec62b70..b5d43f4 100644
 --- a/panels/privacy/privacy.ui
 +++ b/panels/privacy/privacy.ui
-@@ -612,6 +612,37 @@
+@@ -653,6 +653,37 @@
                  <property name="height">1</property>
                </packing>
              </child>
@@ -70,6 +66,3 @@
            </object>
            <packing>
              <property name="expand">False</property>
--- 
-1.8.1.2
-
 
=== removed file 'debian/patches/gcc_not_in_unity.patch'
--- debian/patches/gcc_not_in_unity.patch	2014-05-06 00:21:13 +0000
+++ debian/patches/gcc_not_in_unity.patch	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
---- a/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
-+++ b/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
-@@ -6,7 +6,7 @@
- Terminal=false
- Type=Application
- Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- StartupNotify=true
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-bluetooth
---- a/panels/color/gnome-color-panel.desktop.in.in
-+++ b/panels/color/gnome-color-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=color
---- a/panels/display/gnome-display-panel.desktop.in.in
-+++ b/panels/display/gnome-display-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=Screen resolution
---- a/panels/info/gnome-info-panel.desktop.in.in
-+++ b/panels/info/gnome-info-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=info
---- a/panels/keyboard/gnome-keyboard-panel.desktop.in.in
-+++ b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=keyboard
---- a/panels/mouse/gnome-mouse-panel.desktop.in.in
-+++ b/panels/mouse/gnome-mouse-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=mouse
---- a/panels/network/gnome-network-panel.desktop.in.in
-+++ b/panels/network/gnome-network-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=network
---- a/panels/power/gnome-power-panel.desktop.in.in
-+++ b/panels/power/gnome-power-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;HardwareSettings;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=power
---- a/panels/universal-access/gnome-universal-access-panel.desktop.in.in
-+++ b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=Universal Access
---- a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
-+++ b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=user-accounts
---- a/panels/wacom/gnome-wacom-panel.desktop.in.in
-+++ b/panels/wacom/gnome-wacom-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=wacom
---- a/shell/gnome-control-center.desktop.in.in
-+++ b/shell/gnome-control-center.desktop.in.in
-@@ -6,7 +6,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;System;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=shell
---- a/panels/region/gnome-region-panel.desktop.in.in
-+++ b/panels/region/gnome-region-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=region
---- a/panels/sound/data/gnome-sound-panel.desktop.in.in
-+++ b/panels/sound/data/gnome-sound-panel.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
- X-GNOME-Bugzilla-Component=sound
 
=== removed file 'debian/patches/git-background-lock-screen.patch'
--- debian/patches/git-background-lock-screen.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/git-background-lock-screen.patch	1970-01-01 00:00:00 +0000
@@ -1,862 +0,0 @@
-From 5e7afdf89c5722f494ecaac6179e2aed256d1976 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[e-mail]>
-Date: Mon, 19 Aug 2013 21:00:48 +0200
-Subject: [PATCH] background: Add support for lock screen background
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696166
----
- panels/background/background.ui         | 289 +++++++++++++++++++++++++-------
- panels/background/cc-background-panel.c | 208 ++++++++++++++++-------
- 2 files changed, 375 insertions(+), 122 deletions(-)
-
-diff --git a/panels/background/background.ui b/panels/background/background.ui
-index 77e9968..2b72502 100644
---- a/panels/background/background.ui
-+++ b/panels/background/background.ui
-@@ -4,115 +4,286 @@
-   <object class="GtkHBox" id="background-panel">
-     <property name="visible">True</property>
-     <property name="can_focus">False</property>
-+    <property name="margin_left">6</property>
-+    <property name="margin_right">6</property>
-+    <property name="margin_top">6</property>
-+    <property name="margin_bottom">6</property>
-     <property name="border_width">10</property>
-     <property name="spacing">12</property>
--    <property name="margin-left">6</property>
--    <property name="margin-right">6</property>
--    <property name="margin-top">6</property>
--    <property name="margin-bottom">6</property>
-     <child>
--      <object class="GtkVBox" id="vbox3">
-+      <object class="GtkBox" id="box1">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
--        <property name="spacing">6</property>
-+        <property name="margin_top">100</property>
-+        <property name="margin_bottom">100</property>
-         <child>
--          <object class="GtkAspectFrame" id="aspectframe1">
-+          <object class="GtkVBox" id="vbox3">
-             <property name="visible">True</property>
-             <property name="can_focus">False</property>
--            <property name="margin_left">12</property>
--            <property name="label_xalign">0</property>
--            <property name="shadow_type">none</property>
-             <child>
--              <object class="GtkButton" id="background-set-button">
--                <property name="use_action_appearance">False</property>
-+              <object class="GtkAspectFrame" id="aspectframe1">
-                 <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="valign">center</property>
-+                <property name="can_focus">False</property>
-+                <property name="margin_right">12</property>
-+                <property name="label_xalign">0</property>
-+                <property name="shadow_type">none</property>
-                 <child>
--                  <object class="GtkDrawingArea" id="background-desktop-drawingarea">
--                    <property name="width_request">417</property>
--                    <property name="height_request">250</property>
-+                  <object class="GtkButton" id="background-set-button">
-                     <property name="visible">True</property>
--                    <property name="can_focus">False</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">True</property>
-                     <property name="valign">center</property>
--                    <property name="margin_left">6</property>
--                    <property name="margin_right">6</property>
--                    <property name="margin_top">6</property>
--                    <property name="margin_bottom">6</property>
--                    <property name="hexpand">True</property>
--                    <property name="vexpand">True</property>
-+                    <child>
-+                      <object class="GtkBox" id="box2">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="orientation">vertical</property>
-+                        <child>
-+                          <object class="GtkDrawingArea" id="background-desktop-drawingarea">
-+                            <property name="width_request">310</property>
-+                            <property name="height_request">170</property>
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">False</property>
-+                            <property name="valign">center</property>
-+                            <property name="margin_left">6</property>
-+                            <property name="margin_right">6</property>
-+                            <property name="margin_top">6</property>
-+                            <property name="margin_bottom">6</property>
-+                            <property name="hexpand">True</property>
-+                            <property name="vexpand">True</property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">True</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkLabel" id="label1">
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">False</property>
-+                            <property name="label" translatable="yes">Background</property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">True</property>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                    </child>
-                   </object>
-                 </child>
-               </object>
-+              <packing>
-+                <property name="expand">True</property>
-+                <property name="fill">True</property>
-+                <property name="position">0</property>
-+              </packing>
-             </child>
--          </object>
--          <packing>
--            <property name="expand">True</property>
--            <property name="fill">True</property>
--            <property name="position">0</property>
--          </packing>
--        </child>
--        <child>
--          <object class="GtkHBox" id="bottom-hbox">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="spacing">12</property>
-             <child>
--              <object class="GtkHBox" id="hbox2">
-+              <object class="GtkHBox" id="bottom-hbox">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="halign">center</property>
--                <property name="spacing">2</property>
-+                <property name="spacing">12</property>
-                 <child>
--                  <object class="GtkImage" id="slide_image">
-+                  <object class="GtkHBox" id="hbox2">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
--                    <property name="icon_name">slideshow-symbolic</property>
-+                    <property name="halign">center</property>
-+                    <property name="margin_top">12</property>
-+                    <property name="spacing">2</property>
-+                    <child>
-+                      <object class="GtkImage" id="slide_image">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="icon_name">slideshow-symbolic</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkLabel" id="strut">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="label"> </property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkLabel" id="slide-label">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-                   </object>
-                   <packing>
--                    <property name="expand">False</property>
-+                    <property name="expand">True</property>
-                     <property name="fill">True</property>
-                     <property name="position">0</property>
-                   </packing>
-                 </child>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">True</property>
-+                <property name="position">2</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="position">0</property>
-+          </packing>
-+        </child>
-+        <child>
-+          <object class="GtkVBox" id="vbox1">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <child>
-+              <object class="GtkAspectFrame" id="aspectframe2">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="margin_left">12</property>
-+                <property name="label_xalign">0</property>
-+                <property name="shadow_type">none</property>
-                 <child>
--                  <object class="GtkLabel" id="strut">
-+                  <object class="GtkButton" id="background-lock-set-button">
-                     <property name="visible">True</property>
--                    <property name="can_focus">False</property>
--                    <property name="label"> </property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">True</property>
-+                    <property name="valign">center</property>
-+                    <child>
-+                      <object class="GtkBox" id="box3">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="orientation">vertical</property>
-+                        <child>
-+                          <object class="GtkDrawingArea" id="background-lock-drawingarea">
-+                            <property name="width_request">310</property>
-+                            <property name="height_request">170</property>
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">False</property>
-+                            <property name="valign">center</property>
-+                            <property name="margin_left">6</property>
-+                            <property name="margin_right">6</property>
-+                            <property name="margin_top">6</property>
-+                            <property name="margin_bottom">6</property>
-+                            <property name="hexpand">True</property>
-+                            <property name="vexpand">True</property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">True</property>
-+                            <property name="position">0</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkLabel" id="label2">
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">False</property>
-+                            <property name="label" translatable="yes">Lock Screen</property>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">True</property>
-+                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </object>
-+                    </child>
-                   </object>
--                  <packing>
--                    <property name="expand">False</property>
--                    <property name="fill">True</property>
--                    <property name="position">1</property>
--                  </packing>
-                 </child>
-+              </object>
-+              <packing>
-+                <property name="expand">True</property>
-+                <property name="fill">True</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkHBox" id="bottom-hbox1">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="spacing">12</property>
-                 <child>
--                  <object class="GtkLabel" id="slide-label">
-+                  <object class="GtkHBox" id="hbox1">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
--                    <property name="xalign">0</property>
--                    <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-+                    <property name="halign">center</property>
-+                    <property name="margin_top">12</property>
-+                    <property name="spacing">2</property>
-+                    <child>
-+                      <object class="GtkImage" id="slide_image1">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="icon_name">slideshow-symbolic</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkLabel" id="strut1">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="label"> </property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkLabel" id="slide-label1">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-                   </object>
-                   <packing>
--                    <property name="expand">False</property>
-+                    <property name="expand">True</property>
-                     <property name="fill">True</property>
--                    <property name="position">1</property>
-+                    <property name="position">0</property>
-                   </packing>
-                 </child>
-               </object>
-               <packing>
--                <property name="expand">True</property>
-+                <property name="expand">False</property>
-                 <property name="fill">True</property>
--                <property name="position">0</property>
-+                <property name="position">2</property>
-               </packing>
-             </child>
-           </object>
-           <packing>
-             <property name="expand">False</property>
-             <property name="fill">True</property>
--            <property name="position">2</property>
-+            <property name="position">1</property>
-           </packing>
-         </child>
-       </object>
-diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
-index 14fa244..8de6e23 100644
---- a/panels/background/cc-background-panel.c
-+++ b/panels/background/cc-background-panel.c
-@@ -38,6 +38,7 @@
- #include "bg-pictures-source.h"
- 
- #define WP_PATH_ID "org.gnome.desktop.background"
-+#define WP_LOCK_PATH_ID "org.gnome.desktop.screensaver"
- #define WP_URI_KEY "picture-uri"
- #define WP_OPTIONS_KEY "picture-options"
- #define WP_SHADING_KEY "color-shading-type"
-@@ -55,10 +56,12 @@ struct _CcBackgroundPanelPrivate
-   GDBusConnection *connection;
- 
-   GSettings *settings;
-+  GSettings *lock_settings;
- 
-   GnomeDesktopThumbnailFactory *thumb_factory;
- 
-   CcBackgroundItem *current_background;
-+  CcBackgroundItem *current_lock_background;
- 
-   GCancellable *copy_cancellable;
-   GCancellable *capture_cancellable;
-@@ -71,6 +74,8 @@ struct _CcBackgroundPanelPrivate
- };
- 
- #define WID(y) (GtkWidget *) gtk_builder_get_object (priv->builder, y)
-+#define CURRENT_BG (settings == priv->settings ? priv->current_background : priv->current_lock_background)
-+#define SAVE_PATH (settings == priv->settings ? "last-edited.xml" : "last-edited-lock.xml")
- 
- static const char *
- cc_background_panel_get_help_uri (CcPanel *panel)
-@@ -89,6 +94,7 @@ cc_background_panel_dispose (GObject *object)
-   priv->spinner = NULL;
- 
-   g_clear_object (&priv->settings);
-+  g_clear_object (&priv->lock_settings);
- 
-   if (priv->copy_cancellable)
-     {
-@@ -131,6 +137,7 @@ cc_background_panel_finalize (GObject *object)
-   CcBackgroundPanelPrivate *priv = CC_BACKGROUND_PANEL (object)->priv;
- 
-   g_clear_object (&priv->current_background);
-+  g_clear_object (&priv->current_lock_background);
- 
-   G_OBJECT_CLASS (cc_background_panel_parent_class)->finalize (object);
- }
-@@ -151,59 +158,77 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
- 
- static void
- update_preview (CcBackgroundPanelPrivate *priv,
-+                GSettings                *settings,
-                 CcBackgroundItem         *item)
- {
-   gboolean changes_with_time;
-+  CcBackgroundItem *current_background;
-+
-+  current_background = CURRENT_BG;
- 
--  if (item && priv->current_background)
-+  if (item && current_background)
-     {
--      g_object_unref (priv->current_background);
--      priv->current_background = cc_background_item_copy (item);
--      cc_background_item_load (priv->current_background, NULL);
-+      g_object_unref (current_background);
-+      current_background = cc_background_item_copy (item);
-+      if (settings == priv->settings)
-+        priv->current_background = current_background;
-+      else
-+        priv->current_lock_background = current_background;
-+      cc_background_item_load (current_background, NULL);
-     }
- 
-   changes_with_time = FALSE;
- 
--  if (priv->current_background)
-+  if (current_background)
-     {
--      changes_with_time = cc_background_item_changes_with_time (priv->current_background);
-+      changes_with_time = cc_background_item_changes_with_time (current_background);
-     }
- 
--  gtk_widget_set_visible (WID ("slide_image"), changes_with_time);
--  gtk_widget_set_visible (WID ("slide-label"), changes_with_time);
-+  if (settings == priv->settings)
-+    {
-+      gtk_widget_set_visible (WID ("slide_image"), changes_with_time);
-+      gtk_widget_set_visible (WID ("slide-label"), changes_with_time);
-+
-+      gtk_widget_queue_draw (WID ("background-desktop-drawingarea"));
-+    }
-+  else
-+    {
-+      gtk_widget_set_visible (WID ("slide_image1"), changes_with_time);
-+      gtk_widget_set_visible (WID ("slide-label1"), changes_with_time);
- 
--  gtk_widget_queue_draw (WID ("background-desktop-drawingarea"));
-+      gtk_widget_queue_draw (WID ("background-lock-drawingarea"));
-+    }
- }
- 
- static char *
--get_save_path (void)
-+get_save_path (const char *filename)
- {
-   return g_build_filename (g_get_user_config_dir (),
-                            "gnome-control-center",
-                            "backgrounds",
--                           "last-edited.xml",
-+                           filename,
-                            NULL);
- }
- 
- static void
--update_display_preview (CcBackgroundPanel *panel)
-+update_display_preview (CcBackgroundPanel *panel,
-+                        GtkWidget         *widget,
-+                        CcBackgroundItem  *current_background)
- {
-   CcBackgroundPanelPrivate *priv = panel->priv;
--  GtkWidget *widget;
-   GtkAllocation allocation;
--  const gint preview_width = 416;
--  const gint preview_height = 248;
-+  const gint preview_width = 309;
-+  const gint preview_height = 168;
-   GdkPixbuf *pixbuf;
-   GIcon *icon;
-   cairo_t *cr;
- 
--  widget = WID ("background-desktop-drawingarea");
-   gtk_widget_get_allocation (widget, &allocation);
- 
--  if (!priv->current_background)
-+  if (!current_background)
-     return;
- 
--  icon = cc_background_item_get_frame_thumbnail (priv->current_background,
-+  icon = cc_background_item_get_frame_thumbnail (current_background,
-                                                  priv->thumb_factory,
-                                                  preview_width,
-                                                  preview_height,
-@@ -218,11 +243,14 @@ update_display_preview (CcBackgroundPanel *panel)
-   g_object_unref (pixbuf);
- 
-   pixbuf = NULL;
--  if (panel->priv->display_screenshot != NULL)
--    pixbuf = gdk_pixbuf_scale_simple (panel->priv->display_screenshot,
--                                      preview_width,
--                                      preview_height,
--                                      GDK_INTERP_BILINEAR);
-+  if (current_background == priv->current_background &&
-+      panel->priv->display_screenshot != NULL)
-+    {
-+      pixbuf = gdk_pixbuf_scale_simple (panel->priv->display_screenshot,
-+                                        preview_width,
-+                                        preview_height,
-+                                        GDK_INTERP_BILINEAR);
-+    }
- 
-   if (pixbuf)
-     {
-@@ -271,6 +299,7 @@ on_screenshot_finished (GObject *source,
-              error->message);
-     g_error_free (error);
-     /* fallback? */
-+    priv = panel->priv;
-     goto out;
-   }
-   g_variant_unref (result);
-@@ -322,7 +351,7 @@ on_screenshot_finished (GObject *source,
-   cairo_surface_destroy (surface);
- 
-  out:
--  update_display_preview (panel);
-+  update_display_preview (panel, WID ("background-desktop-drawingarea"), priv->current_background);
- }
- 
- static gboolean
-@@ -407,6 +436,7 @@ on_preview_draw (GtkWidget         *widget,
-                  cairo_t           *cr,
-                  CcBackgroundPanel *panel)
- {
-+  CcBackgroundPanelPrivate *priv = panel->priv;
-   /* we have another shot in flight or an existing cache */
-   if (panel->priv->display_screenshot == NULL
-       && panel->priv->screenshot_path == NULL)
-@@ -414,13 +444,24 @@ on_preview_draw (GtkWidget         *widget,
-       get_screenshot_async (panel);
-     }
-   else
--    update_display_preview (panel);
-+    update_display_preview (panel, widget, priv->current_background);
-+
-+  return TRUE;
-+}
- 
-+static gboolean
-+on_lock_preview_draw (GtkWidget         *widget,
-+                      cairo_t           *cr,
-+                      CcBackgroundPanel *panel)
-+{
-+  CcBackgroundPanelPrivate *priv = panel->priv;
-+  update_display_preview (panel, widget, priv->current_lock_background);
-   return TRUE;
- }
- 
- static void
--reload_current_bg (CcBackgroundPanel *self)
-+reload_current_bg (CcBackgroundPanel *self,
-+                   GSettings         *settings)
- {
-   CcBackgroundPanelPrivate *priv;
-   CcBackgroundItem *saved, *configured;
-@@ -429,12 +470,12 @@ reload_current_bg (CcBackgroundPanel *self)
-   priv = self->priv;
- 
-   /* Load the saved configuration */
--  uri = get_save_path ();
-+  uri = get_save_path (SAVE_PATH);
-   saved = cc_background_xml_get_item (uri);
-   g_free (uri);
- 
-   /* initalise the current background information from settings */
--  uri = g_settings_get_string (priv->settings, WP_URI_KEY);
-+  uri = g_settings_get_string (settings, WP_URI_KEY);
-   if (uri && *uri == '\0')
-     {
-       g_free (uri);
-@@ -450,12 +491,12 @@ reload_current_bg (CcBackgroundPanel *self)
-   configured = cc_background_item_new (uri);
-   g_free (uri);
- 
--  pcolor = g_settings_get_string (priv->settings, WP_PCOLOR_KEY);
--  scolor = g_settings_get_string (priv->settings, WP_SCOLOR_KEY);
-+  pcolor = g_settings_get_string (settings, WP_PCOLOR_KEY);
-+  scolor = g_settings_get_string (settings, WP_SCOLOR_KEY);
-   g_object_set (G_OBJECT (configured),
-                 "name", _("Current background"),
--                "placement", g_settings_get_enum (priv->settings, WP_OPTIONS_KEY),
--                "shading", g_settings_get_enum (priv->settings, WP_SHADING_KEY),
-+                "placement", g_settings_get_enum (settings, WP_OPTIONS_KEY),
-+                "shading", g_settings_get_enum (settings, WP_SHADING_KEY),
-                 "primary-color", pcolor,
-                 "secondary-color", scolor,
-                 NULL);
-@@ -479,9 +520,17 @@ reload_current_bg (CcBackgroundPanel *self)
-   if (saved != NULL)
-     g_object_unref (saved);
- 
--  g_clear_object (&priv->current_background);
--  priv->current_background = configured;
--  cc_background_item_load (priv->current_background, NULL);
-+  if (settings == priv->settings)
-+    {
-+      g_clear_object (&priv->current_background);
-+      priv->current_background = configured;
-+    }
-+  else
-+    {
-+      g_clear_object (&priv->current_lock_background);
-+      priv->current_lock_background = configured;
-+    }
-+  cc_background_item_load (configured, NULL);
- }
- 
- static gboolean
-@@ -512,6 +561,8 @@ copy_finished_cb (GObject      *source_object,
-   CcBackgroundPanel *panel = (CcBackgroundPanel *) pointer;
-   CcBackgroundPanelPrivate *priv = panel->priv;
-   CcBackgroundItem *item;
-+  CcBackgroundItem *current_background;
-+  GSettings *settings;
- 
-   if (!g_file_copy_finish (G_FILE (source_object), result, &err))
-     {
-@@ -523,8 +574,10 @@ copy_finished_cb (GObject      *source_object,
-       g_error_free (err);
-     }
-   item = g_object_get_data (source_object, "item");
-+  settings = g_object_get_data (source_object, "settings");
-+  current_background = CURRENT_BG;
- 
--  g_settings_apply (priv->settings);
-+  g_settings_apply (settings);
- 
-   /* the panel may have been destroyed before the callback is run, so be sure
-    * to check the widgets are not NULL */
-@@ -535,19 +588,19 @@ copy_finished_cb (GObject      *source_object,
-       priv->spinner = NULL;
-     }
- 
--  if (priv->current_background)
--    cc_background_item_load (priv->current_background, NULL);
-+  if (current_background)
-+    cc_background_item_load (current_background, NULL);
- 
-   if (priv->builder)
-     {
-       char *filename;
- 
--      update_preview (priv, item);
-+      update_preview (priv, settings, item);
- 
-       /* Save the source XML if there is one */
--      filename = get_save_path ();
-+      filename = get_save_path (SAVE_PATH);
-       if (create_save_dir ())
--        cc_background_xml_save (priv->current_background, filename);
-+        cc_background_xml_save (current_background, filename);
-     }
- 
-   /* remove the reference taken when the copy was set up */
-@@ -556,6 +609,7 @@ copy_finished_cb (GObject      *source_object,
- 
- static void
- set_background (CcBackgroundPanel *panel,
-+                GSettings         *settings,
-                 CcBackgroundItem  *item)
- {
-   CcBackgroundPanelPrivate *priv = panel->priv;
-@@ -573,8 +627,8 @@ set_background (CcBackgroundPanel *panel,
- 
-   if ((flags & CC_BACKGROUND_ITEM_HAS_URI) && uri == NULL)
-     {
--      g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, G_DESKTOP_BACKGROUND_STYLE_NONE);
--      g_settings_set_string (priv->settings, WP_URI_KEY, "");
-+      g_settings_set_enum (settings, WP_OPTIONS_KEY, G_DESKTOP_BACKGROUND_STYLE_NONE);
-+      g_settings_set_string (settings, WP_URI_KEY, "");
-     }
-   else if (cc_background_item_get_source_url (item) != NULL &&
-            cc_background_item_get_needs_download (item))
-@@ -631,6 +685,7 @@ set_background (CcBackgroundPanel *panel,
-        * finished */
-       g_object_ref (panel);
-       g_object_set_data_full (G_OBJECT (source), "item", g_object_ref (item), g_object_unref);
-+      g_object_set_data (G_OBJECT (source), "settings", settings);
-       g_file_copy_async (source, dest, G_FILE_COPY_OVERWRITE,
-                          G_PRIORITY_DEFAULT, priv->copy_cancellable,
-                          NULL, NULL,
-@@ -639,7 +694,7 @@ set_background (CcBackgroundPanel *panel,
-       dest_uri = g_file_get_uri (dest);
-       g_object_unref (dest);
- 
--      g_settings_set_string (priv->settings, WP_URI_KEY, dest_uri);
-+      g_settings_set_string (settings, WP_URI_KEY, dest_uri);
-       g_object_set (G_OBJECT (item),
-                     "uri", dest_uri,
-                     "needs-download", FALSE,
-@@ -653,37 +708,37 @@ set_background (CcBackgroundPanel *panel,
-     }
-   else
-     {
--      g_settings_set_string (priv->settings, WP_URI_KEY, uri);
-+      g_settings_set_string (settings, WP_URI_KEY, uri);
-     }
- 
-   /* Also set the placement if we have a URI and the previous value was none */
-   if (flags & CC_BACKGROUND_ITEM_HAS_PLACEMENT)
-     {
--      g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
-+      g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
-     }
-   else if (uri != NULL)
-     {
--      style = g_settings_get_enum (priv->settings, WP_OPTIONS_KEY);
-+      style = g_settings_get_enum (settings, WP_OPTIONS_KEY);
-       if (style == G_DESKTOP_BACKGROUND_STYLE_NONE)
--        g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
-+        g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
-     }
- 
-   if (flags & CC_BACKGROUND_ITEM_HAS_SHADING)
--    g_settings_set_enum (priv->settings, WP_SHADING_KEY, cc_background_item_get_shading (item));
-+    g_settings_set_enum (settings, WP_SHADING_KEY, cc_background_item_get_shading (item));
- 
--  g_settings_set_string (priv->settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item));
--  g_settings_set_string (priv->settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item));
-+  g_settings_set_string (settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item));
-+  g_settings_set_string (settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item));
- 
-   /* update the preview information */
-   if (save_settings != FALSE)
-     {
-       /* Apply all changes */
--      g_settings_apply (priv->settings);
-+      g_settings_apply (settings);
- 
-       /* Save the source XML if there is one */
--      filename = get_save_path ();
-+      filename = get_save_path (SAVE_PATH);
-       if (create_save_dir ())
--        cc_background_xml_save (priv->current_background, filename);
-+        cc_background_xml_save (CURRENT_BG, filename);
-     }
- }
- 
-@@ -699,7 +754,7 @@ on_chooser_dialog_response (GtkDialog         *dialog,
-       item = cc_background_chooser_dialog_get_item (CC_BACKGROUND_CHOOSER_DIALOG (dialog));
-       if (item != NULL)
-         {
--          set_background (self, item);
-+          set_background (self, g_object_get_data (G_OBJECT (dialog), "settings"), item);
-           g_object_unref (item);
-         }
-     }
-@@ -708,13 +763,14 @@ on_chooser_dialog_response (GtkDialog         *dialog,
- }
- 
- static void
--on_background_button_clicked (GtkButton         *button,
--                              CcBackgroundPanel *self)
-+launch_chooser (CcBackgroundPanel *self,
-+                GSettings         *settings)
- {
-   CcBackgroundPanelPrivate *priv = self->priv;
-   GtkWidget *dialog;
- 
-   dialog = cc_background_chooser_dialog_new ();
-+  g_object_set_data (G_OBJECT (dialog), "settings", settings);
-   gtk_window_set_transient_for (GTK_WINDOW (dialog),
-                                 GTK_WINDOW (gtk_widget_get_toplevel (WID ("background-panel"))));
-   gtk_widget_show (dialog);
-@@ -724,12 +780,26 @@ on_background_button_clicked (GtkButton         *button,
- }
- 
- static void
-+on_background_button_clicked (GtkButton         *button,
-+                              CcBackgroundPanel *self)
-+{
-+  launch_chooser (self, self->priv->settings);
-+}
-+
-+static void
-+on_lock_button_clicked (GtkButton         *button,
-+                        CcBackgroundPanel *self)
-+{
-+  launch_chooser (self, self->priv->lock_settings);
-+}
-+
-+static void
- on_settings_changed (GSettings         *settings,
-                      gchar             *key,
-                      CcBackgroundPanel *self)
- {
--  reload_current_bg (self);
--  update_preview (self->priv, NULL);
-+  reload_current_bg (self, settings);
-+  update_preview (self->priv, settings, NULL);
- }
- 
- static void
-@@ -760,6 +830,9 @@ cc_background_panel_init (CcBackgroundPanel *self)
-   priv->settings = g_settings_new (WP_PATH_ID);
-   g_settings_delay (priv->settings);
- 
-+  priv->lock_settings = g_settings_new (WP_LOCK_PATH_ID);
-+  g_settings_delay (priv->lock_settings);
-+
-   /* add the top level widget */
-   widget = WID ("background-panel");
- 
-@@ -768,19 +841,28 @@ cc_background_panel_init (CcBackgroundPanel *self)
- 
-   /* setup preview area */
-   widget = WID ("background-desktop-drawingarea");
--  g_signal_connect (widget, "draw", G_CALLBACK (on_preview_draw),
--                    self);
-+  g_signal_connect (widget, "draw", G_CALLBACK (on_preview_draw), self);
-+  widget = WID ("background-lock-drawingarea");
-+  g_signal_connect (widget, "draw", G_CALLBACK (on_lock_preview_draw), self);
- 
-   priv->copy_cancellable = g_cancellable_new ();
-   priv->capture_cancellable = g_cancellable_new ();
- 
-   priv->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
- 
--  reload_current_bg (self);
--  update_preview (priv, NULL);
-+  /* Load the backgrounds */
-+  reload_current_bg (self, priv->settings);
-+  update_preview (priv, priv->settings, NULL);
-+  reload_current_bg (self, priv->lock_settings);
-+  update_preview (priv, priv->lock_settings, NULL);
- 
-+  /* Background settings */
-   g_signal_connect (priv->settings, "changed", G_CALLBACK (on_settings_changed), self);
-+  g_signal_connect (priv->lock_settings, "changed", G_CALLBACK (on_settings_changed), self);
- 
-+  /* Background buttons */
-   widget = WID ("background-set-button");
-   g_signal_connect (widget, "clicked", G_CALLBACK (on_background_button_clicked), self);
-+  widget = WID ("background-lock-set-button");
-+  g_signal_connect (widget, "clicked", G_CALLBACK (on_lock_button_clicked), self);
- }
--- 
-1.8.3.1
 
=== removed file 'debian/patches/git-background-remove-unused-widget.patch'
--- debian/patches/git-background-remove-unused-widget.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/git-background-remove-unused-widget.patch	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-From dd56de9653361d17a300aeb7872f152a7e2de356 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[e-mail]>
-Date: Mon, 19 Aug 2013 20:55:29 +0200
-Subject: [PATCH] background: Remove unused "lock" preview widgets
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696166
----
- panels/background/background.ui | 60 ++++++++++-------------------------------
- 1 file changed, 14 insertions(+), 46 deletions(-)
-
-diff --git a/panels/background/background.ui b/panels/background/background.ui
-index 651cf69..77e9968 100644
---- a/panels/background/background.ui
-+++ b/panels/background/background.ui
-@@ -30,48 +30,18 @@
-                 <property name="receives_default">True</property>
-                 <property name="valign">center</property>
-                 <child>
--                  <object class="GtkBox" id="box1">
-+                  <object class="GtkDrawingArea" id="background-desktop-drawingarea">
-+                    <property name="width_request">417</property>
-+                    <property name="height_request">250</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
-+                    <property name="valign">center</property>
-+                    <property name="margin_left">6</property>
-+                    <property name="margin_right">6</property>
-+                    <property name="margin_top">6</property>
-+                    <property name="margin_bottom">6</property>
-                     <property name="hexpand">True</property>
--                    <property name="spacing">18</property>
--                    <child>
--                      <object class="GtkDrawingArea" id="background-desktop-drawingarea">
--                        <property name="width_request">417</property>
--                        <property name="height_request">250</property>
--                        <property name="visible">True</property>
--                        <property name="can_focus">False</property>
--                        <property name="valign">center</property>
--                        <property name="margin_left">6</property>
--                        <property name="margin_right">6</property>
--                        <property name="margin_top">6</property>
--                        <property name="margin_bottom">6</property>
--                        <property name="hexpand">True</property>
--                        <property name="vexpand">True</property>
--                      </object>
--                      <packing>
--                        <property name="expand">True</property>
--                        <property name="fill">True</property>
--                        <property name="position">0</property>
--                      </packing>
--                    </child>
--                    <child>
--                      <object class="GtkDrawingArea" id="background-lock-drawingarea">
--                        <property name="can_focus">False</property>
--                        <property name="no_show_all">True</property>
--                        <property name="valign">center</property>
--                        <property name="margin_left">6</property>
--                        <property name="margin_right">6</property>
--                        <property name="margin_top">6</property>
--                        <property name="hexpand">True</property>
--                        <property name="vexpand">True</property>
--                      </object>
--                      <packing>
--                        <property name="expand">True</property>
--                        <property name="fill">True</property>
--                        <property name="position">1</property>
--                      </packing>
--                    </child>
-+                    <property name="vexpand">True</property>
-                   </object>
-                 </child>
-               </object>
-@@ -107,11 +77,10 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkLabel" id="slide-label">
-+                  <object class="GtkLabel" id="strut">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
--                    <property name="xalign">0</property>
--                    <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-+                    <property name="label"> </property>
-                   </object>
-                   <packing>
-                     <property name="expand">False</property>
-@@ -120,10 +89,11 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkLabel" id="strut">
-+                  <object class="GtkLabel" id="slide-label">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
--                    <property name="label"> </property>
-+                    <property name="xalign">0</property>
-+                    <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-                   </object>
-                   <packing>
-                     <property name="expand">False</property>
-@@ -200,8 +170,6 @@
-   <object class="GtkSizeGroup" id="sizegroup">
-     <property name="mode">vertical</property>
-     <widgets>
--      <widget name="sources-combobox"/>
--      <widget name="heading-hbox"/>
-       <widget name="slide-label"/>
-       <widget name="strut"/>
-     </widgets>
--- 
-1.8.3.1
 
=== removed file 'debian/patches/git-online-accounts-chat-providers.patch'
--- debian/patches/git-online-accounts-chat-providers.patch	2014-05-27 07:29:07 +0000
+++ debian/patches/git-online-accounts-chat-providers.patch	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-From 570611752e1bf1a0cf01f2581ec03525381066bd Mon Sep 17 00:00:00 2001
-From: Marco Barisione <[e-mail]>
-Date: Thu, 25 Jul 2013 13:08:58 +0100
-Subject: online-accounts: handle unbranded chat providers
-
-https://bugzilla.gnome.org/show_bug.cgi?id=706148
-
-Index: gnome-control-center-3.8.6/panels/online-accounts/cc-online-accounts-add-account-dialog.c
-===================================================================
---- gnome-control-center-3.8.6.orig/panels/online-accounts/cc-online-accounts-add-account-dialog.c
-+++ gnome-control-center-3.8.6/panels/online-accounts/cc-online-accounts-add-account-dialog.c
-@@ -41,6 +41,7 @@ struct _GoaPanelAddAccountDialogPrivate
-   EggListBox *branded_list_box;
-   EggListBox *contacts_list_box;
-   EggListBox *mail_list_box;
-+  EggListBox *chat_list_box;
-   EggListBox *ticketing_list_box;
-   GError *error;
-   GoaClient *client;
-@@ -48,6 +49,7 @@ struct _GoaPanelAddAccountDialogPrivate
-   GtkListStore *list_store;
-   GtkWidget *contacts_grid;
-   GtkWidget *mail_grid;
-+  GtkWidget *chat_grid;
-   GtkWidget *ticketing_grid;
-   GtkWidget *stack;
-   gboolean add_other;
-@@ -336,6 +338,12 @@ goa_panel_add_account_dialog_init (GoaPa
-                                       _("Contacts"));
- 
-   add_account_dialog_create_group_ui (add_account,
-+                                      &priv->chat_list_box,
-+                                      &priv->chat_grid,
-+                                      grid,
-+                                      _("Chat"));
-+
-+  add_account_dialog_create_group_ui (add_account,
-                                       &priv->ticketing_list_box,
-                                       &priv->ticketing_grid,
-                                       grid,
-@@ -414,6 +422,10 @@ goa_panel_add_account_dialog_add_provide
-       group_grid = priv->mail_grid;
-       list_box = priv->mail_list_box;
-       break;
-+    case GOA_PROVIDER_GROUP_CHAT:
-+      group_grid = priv->chat_grid;
-+      list_box = priv->chat_list_box;
-+      break;
-     case GOA_PROVIDER_GROUP_TICKETING:
-       group_grid = priv->ticketing_grid;
-       list_box = priv->ticketing_list_box;
 
=== removed file 'debian/patches/git_fix_libbackground_linking.patch'
--- debian/patches/git_fix_libbackground_linking.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/git_fix_libbackground_linking.patch	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-From acd7785692109a8ad2590e19302ce34170e610f2 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <[e-mail]>
-Date: Wed, 16 Oct 2013 10:01:36 +0000
-Subject: background: Fix test-chooser-dialog build with some linkers
-
-List missing libs for the libbackground-chooser.la convenience library.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=709302
----
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index f24f8b3..2766207 100644
---- a/panels/background/Makefile.am
-+++ b/panels/background/Makefile.am
-@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES =	\
- 	bg-colors-source.c		\
- 	bg-colors-source.h
- 
-+libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-+
- libbackground_la_SOURCES =		\
- 	cc-background-panel.c		\
- 	cc-background-panel.h
---
-cgit v0.9.2
 
=== removed file 'debian/patches/git_iconview_columns.patch'
--- debian/patches/git_iconview_columns.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/git_iconview_columns.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Description: git patch, updated for our layout
-diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
-index 4b05d8c..d7094ab 100644
---- a/shell/cc-shell-category-view.c
-+++ b/shell/cc-shell-category-view.c
-@@ -138,6 +138,7 @@ cc_shell_category_view_constructed (GObject *object)
-   gtk_icon_view_set_text_column (GTK_ICON_VIEW (iconview), COL_NAME);
-   gtk_icon_view_set_item_width (GTK_ICON_VIEW (iconview), 100);
-   cc_shell_item_view_update_cells (CC_SHELL_ITEM_VIEW (iconview));
-+  gtk_icon_view_set_columns (GTK_ICON_VIEW (iconview), 7);
- 
-   /* create the header if required */
-   if (priv->name)
---
-cgit v0.9.2
-
 
=== removed file 'debian/patches/git_rename_natural_scrolling.patch'
--- debian/patches/git_rename_natural_scrolling.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/git_rename_natural_scrolling.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-From 92148a4be791614eaf4582ea540cff82e27134de Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <[e-mail]>
-Date: Tue, 11 Jun 2013 12:58:28 +0000
-Subject: mouse: Rename "Content sticks to fingers"
-
-...to "Natural scrolling". The previous name was a little bit
-disgusting, and people didn't understand its purpose. Using the
-same name as OSX means that people will either know it, or be less
-afraid of testing it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=689128
----
-diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
-index cd77080..3735903 100644
---- a/panels/mouse/gnome-mouse-properties.ui
-+++ b/panels/mouse/gnome-mouse-properties.ui
-@@ -655,7 +655,7 @@
-                                 </child>
-                                 <child>
-                                   <object class="GtkCheckButton" id="natural_scroll_toggle">
--                                    <property name="label" translatable="yes">C_ontent sticks to fingers</property>
-+                                    <property name="label" translatable="yes" comments="Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. ">_Natural scrolling</property>
-                                     <property name="use_action_appearance">False</property>
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-
 
=== added file 'debian/patches/power-panel-3.10.patch'
--- debian/patches/power-panel-3.10.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/power-panel-3.10.patch	2014-09-30 05:25:02 +0000
@@ -0,0 +1,979 @@
+From b21275ac750465c36370834daf537b8a05adf4ad Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Thu, 18 Sep 2014 09:26:50 +1000
+Subject: [PATCH] Copy power panel from 3.10
+
+---
+ configure.ac                                 |   2 +-
+ panels/power/cc-power-panel.c                | 450 ++++++++++++++-------------
+ panels/power/cc-power-panel.h                |   3 +-
+ panels/power/gnome-power-panel.desktop.in.in |   1 -
+ panels/power/power.ui                        |  13 +-
+ 5 files changed, 254 insertions(+), 215 deletions(-)
+
+Index: gnome-control-center/configure.ac
+===================================================================
+--- gnome-control-center.orig/configure.ac
++++ gnome-control-center/configure.ac
+@@ -128,7 +128,7 @@ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMO
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0
+-                  upower-glib >= 0.99.0)
++                  upower-glib >= 0.9.0)
+ PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl
+ 		  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES
+@@ -140,7 +140,7 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_M
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
++PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.0
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+                   colord >= $COLORD_REQUIRED_VERSION
+Index: gnome-control-center/panels/power/cc-power-panel.c
+===================================================================
+--- gnome-control-center.orig/panels/power/cc-power-panel.c
++++ gnome-control-center/panels/power/cc-power-panel.c
+@@ -15,7 +15,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.
+  *
+  */
+ 
+@@ -25,6 +26,16 @@
+ #include <glib/gi18n.h>
+ #include <gnome-settings-daemon/gsd-enums.h>
+ 
++#ifdef HAVE_BLUETOOTH
++/* Handling is broken:
++ * https://bugzilla.gnome.org/show_bug.cgi?id=691730
++ * https://bugzilla.gnome.org/show_bug.cgi?id=691151
++ * #include <bluetooth-client.h> */
++#undef HAVE_BLUETOOTH
++#endif
++
++
++
+ #ifdef HAVE_NETWORK_MANAGER
+ #include <nm-client.h>
+ #endif
+@@ -59,7 +70,6 @@ struct _CcPowerPanelPrivate
+   GtkBuilder    *builder;
+   GtkWidget     *automatic_suspend_dialog;
+   UpClient      *up_client;
+-  GPtrArray     *devices;
+   GDBusProxy    *screen_proxy;
+   GDBusProxy    *kbd_proxy;
+   gboolean       has_batteries;
+@@ -93,9 +103,10 @@ struct _CcPowerPanelPrivate
+   GtkWidget     *critical_battery_row;
+   GtkWidget     *critical_battery_combo;
+ 
+-  GDBusProxy    *bt_rfkill;
+-  GDBusProxy    *bt_properties;
+-  GtkWidget     *bt_switch;
++#ifdef HAVE_BLUETOOTH
++  BluetoothClient *bt_client;
++  GtkWidget       *bt_switch;
++#endif
+ 
+ #ifdef HAVE_NETWORK_MANAGER
+   NMClient      *nm_client;
+@@ -131,14 +142,10 @@ cc_power_panel_dispose (GObject *object)
+   g_clear_object (&priv->builder);
+   g_clear_object (&priv->screen_proxy);
+   g_clear_object (&priv->kbd_proxy);
+-  if (priv->devices)
+-    {
+-      g_ptr_array_foreach (priv->devices, (GFunc) g_object_unref, NULL);
+-      g_clear_pointer (&priv->devices, g_ptr_array_unref);
+-    }
+   g_clear_object (&priv->up_client);
+-  g_clear_object (&priv->bt_rfkill);
+-  g_clear_object (&priv->bt_properties);
++#ifdef HAVE_BLUETOOTH
++  g_clear_object (&priv->bt_client);
++#endif
+ #ifdef HAVE_NETWORK_MANAGER
+   g_clear_object (&priv->nm_client);
+ #endif
+@@ -324,8 +331,8 @@ set_primary (CcPowerPanel *panel, UpDevi
+   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+   gtk_container_add (GTK_CONTAINER (row), box);
+ 
+-  gtk_widget_set_margin_start (box, 20);
+-  gtk_widget_set_margin_end (box, 20);
++  gtk_widget_set_margin_left (box, 20);
++  gtk_widget_set_margin_right (box, 20);
+   gtk_widget_set_margin_top (box, 6);
+   gtk_widget_set_margin_bottom (box, 6);
+ 
+@@ -380,7 +387,6 @@ add_battery (CcPowerPanel *panel, UpDevi
+   GtkWidget *widget;
+   gchar *s;
+   gchar *native_path;
+-  gchar *icon_name;
+   const gchar *name;
+ 
+   g_object_get (device,
+@@ -388,7 +394,6 @@ add_battery (CcPowerPanel *panel, UpDevi
+                 "state", &state,
+                 "percentage", &percentage,
+                 "native-path", &native_path,
+-                "icon-name", &icon_name,
+                 NULL);
+ 
+   if (native_path && strstr (native_path, "BAT0"))
+@@ -404,17 +409,18 @@ add_battery (CcPowerPanel *panel, UpDevi
+   label = gtk_label_new (name);
+   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+   gtk_size_group_add_widget (priv->battery_sizegroup, box2);
+-  gtk_widget_set_margin_start (label, 20);
+-  gtk_widget_set_margin_end (label, 20);
++  gtk_widget_set_margin_left (label, 20);
++  gtk_widget_set_margin_right (label, 20);
+   gtk_widget_set_margin_top (label, 6);
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE, 0);
+   gtk_box_pack_start (GTK_BOX (box), box2, FALSE, TRUE, 0);
+ 
+ #if 1
+-  if (icon_name != NULL && *icon_name != '\0')
++  if (state == UP_DEVICE_STATE_DISCHARGING ||
++      state == UP_DEVICE_STATE_CHARGING)
+     {
+-      widget = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
++      widget = gtk_image_new_from_icon_name ("battery-good-charging-symbolic", GTK_ICON_SIZE_BUTTON);
+       gtk_style_context_add_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_DIM_LABEL);
+       gtk_widget_set_halign (widget, GTK_ALIGN_END);
+       gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+@@ -423,8 +429,8 @@ add_battery (CcPowerPanel *panel, UpDevi
+ #endif
+ 
+   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+-  gtk_widget_set_margin_start (box2, 20);
+-  gtk_widget_set_margin_end (box2, 20);
++  gtk_widget_set_margin_left (box2, 20);
++  gtk_widget_set_margin_right (box2, 20);
+ 
+   s = g_strdup_printf ("%d%%", (int)percentage);
+   label = gtk_label_new (s);
+@@ -454,7 +460,6 @@ add_battery (CcPowerPanel *panel, UpDevi
+   gtk_widget_show_all (row);
+ 
+   g_free (native_path);
+-  g_free (icon_name);
+ 
+   gtk_widget_set_visible (priv->battery_section, TRUE);
+ }
+@@ -578,16 +583,16 @@ add_device (CcPowerPanel *panel, UpDevic
+   widget = gtk_label_new ("");
+   gtk_misc_set_alignment (GTK_MISC (widget), 0.0f, 0.5f);
+   gtk_label_set_markup (GTK_LABEL (widget), description->str);
+-  gtk_widget_set_margin_start (widget, 20);
+-  gtk_widget_set_margin_end (widget, 20);
++  gtk_widget_set_margin_left (widget, 20);
++  gtk_widget_set_margin_right (widget, 20);
+   gtk_widget_set_margin_top (widget, 6);
+   gtk_widget_set_margin_bottom (widget, 6);
+   gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
+   gtk_size_group_add_widget (priv->battery_sizegroup, widget);
+ 
+   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+-  gtk_widget_set_margin_start (box2, 20);
+-  gtk_widget_set_margin_end (box2, 20);
++  gtk_widget_set_margin_left (box2, 20);
++  gtk_widget_set_margin_right (box2, 20);
+   s = g_strdup_printf ("%d%%", (int)percentage);
+   widget = gtk_label_new (s);
+   g_free (s);
+@@ -622,12 +627,26 @@ up_client_changed (UpClient     *client,
+                    CcPowerPanel *self)
+ {
+   CcPowerPanelPrivate *priv = self->priv;
++  GPtrArray *devices;
+   GList *children, *l;
+   gint i;
+   UpDeviceKind kind;
++  UpDeviceState state;
+   guint n_batteries;
+   gboolean on_ups;
+   UpDevice *composite;
++  gdouble percentage = 0.0;
++  gdouble energy = 0.0;
++  gdouble energy_full = 0.0;
++  gdouble energy_rate = 0.0;
++  gdouble energy_total = 0.0;
++  gdouble energy_full_total = 0.0;
++  gdouble energy_rate_total = 0.0;
++  gint64 time_to_empty = 0;
++  gint64 time_to_full = 0;
++  gboolean is_charging = FALSE;
++  gboolean is_discharging = FALSE;
++  gboolean is_fully_charged = TRUE;
+   gchar *s;
+ 
+   children = gtk_container_get_children (GTK_CONTAINER (priv->battery_list));
+@@ -642,6 +661,8 @@ up_client_changed (UpClient     *client,
+   g_list_free (children);
+   gtk_widget_hide (priv->device_section);
+ 
++  devices = up_client_get_devices (client);
++
+ #ifdef TEST_FAKE_DEVICES
+   {
+     static gboolean fake_devices_added = FALSE;
+@@ -653,60 +674,68 @@ up_client_changed (UpClient     *client,
+         device = up_device_new ();
+         g_object_set (device,
+                       "kind", UP_DEVICE_KIND_MOUSE,
+-                      "native-path", "dummy:native-path1",
+-                      "model", "My mouse",
+                       "percentage", 71.0,
+                       "state", UP_DEVICE_STATE_DISCHARGING,
+                       "time-to-empty", 287,
+-                      "icon-name", "battery-full-symbolic",
+                       NULL);
+-        g_ptr_array_add (priv->devices, device);
++        g_ptr_array_add (devices, device);
+         device = up_device_new ();
+         g_object_set (device,
+                       "kind", UP_DEVICE_KIND_KEYBOARD,
+-                      "native-path", "dummy:native-path2",
+-                      "model", "My keyboard",
+-                      "percentage", 59.0,
++                      "percentage", 69.0,
+                       "state", UP_DEVICE_STATE_DISCHARGING,
+                       "time-to-empty", 250,
+-                      "icon-name", "battery-good-symbolic",
+                       NULL);
+-        g_ptr_array_add (priv->devices, device);
++        g_ptr_array_add (devices, device);
+         device = up_device_new ();
+         g_object_set (device,
+                       "kind", UP_DEVICE_KIND_BATTERY,
+-                      "native-path", "dummy:native-path3",
+-                      "model", "Battery from some factory",
+                       "percentage", 100.0,
+                       "state", UP_DEVICE_STATE_FULLY_CHARGED,
+                       "energy", 55.0,
+                       "energy-full", 55.0,
+                       "energy-rate", 15.0,
+                       "time-to-empty", 400,
+-                      "icon-name", "battery-full-charged-symbolic",
+                       NULL);
+-        g_ptr_array_add (priv->devices, device);
++        g_ptr_array_add (devices, device);
+       }
+   }
+ #endif
+ 
+   on_ups = FALSE;
+   n_batteries = 0;
+-  composite = up_client_get_display_device (priv->up_client);
+-  g_object_get (composite, "kind", &kind, NULL);
+-  if (kind == UP_DEVICE_KIND_UPS)
+-    {
+-      on_ups = TRUE;
+-    }
+-  else
++  composite = up_device_new ();
++  g_object_set (composite,
++                "kind", UP_DEVICE_KIND_BATTERY,
++                "is-rechargeable", TRUE,
++                "native-path", "dummy:composite_battery",
++                "power-supply", TRUE,
++                "is-present", TRUE,
++                NULL);
++  for (i = 0; devices != NULL && i < devices->len; i++)
+     {
+-      /* Count the batteries */
+-      for (i = 0; priv->devices != NULL && i < priv->devices->len; i++)
++      UpDevice *device = (UpDevice*) g_ptr_array_index (devices, i);
++      g_object_get (device,
++                    "kind", &kind,
++                    "state", &state,
++                    "energy", &energy,
++                    "energy-full", &energy_full,
++                    "energy-rate", &energy_rate,
++                    NULL);
++      if (kind == UP_DEVICE_KIND_UPS && state == UP_DEVICE_STATE_DISCHARGING)
++        on_ups = TRUE;
++      if (kind == UP_DEVICE_KIND_BATTERY)
+         {
+-          UpDevice *device = (UpDevice*) g_ptr_array_index (priv->devices, i);
+-          g_object_get (device, "kind", &kind, NULL);
+-          if (kind == UP_DEVICE_KIND_BATTERY)
+-            n_batteries++;
++          if (state == UP_DEVICE_STATE_CHARGING)
++            is_charging = TRUE;
++          if (state == UP_DEVICE_STATE_DISCHARGING)
++            is_discharging = TRUE;
++          if (state != UP_DEVICE_STATE_FULLY_CHARGED)
++            is_fully_charged = FALSE;
++          energy_total += energy;
++          energy_full_total += energy_full;
++          energy_rate_total += energy_rate;
++          n_batteries++;
+         }
+     }
+ 
+@@ -717,12 +746,42 @@ up_client_changed (UpClient     *client,
+   gtk_label_set_label (GTK_LABEL (priv->battery_heading), s);
+   g_free (s);
+ 
++  if (energy_full_total > 0.0)
++    percentage = 100.0 * energy_total / energy_full_total;
++
++  if (is_charging)
++    state = UP_DEVICE_STATE_CHARGING;
++  else if (is_discharging)
++    state = UP_DEVICE_STATE_DISCHARGING;
++  else if (is_fully_charged)
++    state = UP_DEVICE_STATE_FULLY_CHARGED;
++  else
++    state = UP_DEVICE_STATE_UNKNOWN;
++
++  if (energy_rate_total > 0)
++    {
++      if (state == UP_DEVICE_STATE_DISCHARGING)
++        time_to_empty = 3600 * (energy_total / energy_rate_total);
++      else if (state == UP_DEVICE_STATE_CHARGING)
++        time_to_full = 3600 * ((energy_full_total - energy_total) / energy_rate_total);
++    }
++
++  g_object_set (composite,
++                "energy", energy_total,
++                "energy-full", energy_full_total,
++                "energy-rate", energy_rate_total,
++                "time-to-empty", time_to_empty,
++                "time-to-full", time_to_full,
++                "percentage", percentage,
++                "state", state,
++                NULL);
++
+   if (!on_ups && n_batteries > 1)
+     set_primary (self, composite);
+ 
+-  for (i = 0; priv->devices != NULL && i < priv->devices->len; i++)
++  for (i = 0; devices != NULL && i < devices->len; i++)
+     {
+-      UpDevice *device = (UpDevice*) g_ptr_array_index (priv->devices, i);
++      UpDevice *device = (UpDevice*) g_ptr_array_index (devices, i);
+       g_object_get (device, "kind", &kind, NULL);
+       if (kind == UP_DEVICE_KIND_LINE_POWER)
+         {
+@@ -746,49 +805,11 @@ up_client_changed (UpClient     *client,
+         }
+     }
+ 
++  g_clear_pointer (&devices, g_ptr_array_unref);
+   g_object_unref (composite);
+ }
+ 
+ static void
+-up_client_device_removed (UpClient     *client,
+-                          const char   *object_path,
+-                          CcPowerPanel *self)
+-{
+-  CcPowerPanelPrivate *priv = self->priv;
+-  guint i;
+-
+-  if (priv->devices == NULL)
+-    return;
+-
+-  for (i = 0; i < priv->devices->len; i++)
+-    {
+-      UpDevice *device = g_ptr_array_index (priv->devices, i);
+-
+-      if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0)
+-        {
+-          g_object_unref (device);
+-          g_ptr_array_remove_index (priv->devices, i);
+-          break;
+-        }
+-    }
+-
+-  up_client_changed (self->priv->up_client, NULL, self);
+-}
+-
+-static void
+-up_client_device_added (UpClient     *client,
+-                        UpDevice     *device,
+-                        CcPowerPanel *self)
+-{
+-  CcPowerPanelPrivate *priv = self->priv;
+-
+-  g_ptr_array_add (priv->devices, g_object_ref (device));
+-  g_signal_connect (G_OBJECT (device), "notify",
+-                    G_CALLBACK (up_client_changed), self);
+-  up_client_changed (priv->up_client, NULL, self);
+-}
+-
+-static void
+ set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+ {
+   GError *error = NULL;
+@@ -1077,11 +1098,22 @@ static void
+ set_ac_battery_ui_mode (CcPowerPanel *self)
+ {
+   gboolean has_batteries = FALSE;
++  gboolean ret;
++  GError *error = NULL;
+   GPtrArray *devices;
+   guint i;
+   UpDevice *device;
+   UpDeviceKind kind;
+ 
++  /* this is sync, but it's cached in the daemon and so quick */
++  ret = up_client_enumerate_devices_sync (self->priv->up_client, NULL, &error);
++  if (!ret)
++    {
++      g_warning ("failed to get device list: %s", error->message);
++      g_error_free (error);
++      goto out;
++    }
++
+   devices = up_client_get_devices (self->priv->up_client);
+   g_debug ("got %d devices from upower\n", devices->len);
+ 
+@@ -1102,6 +1134,7 @@ set_ac_battery_ui_mode (CcPowerPanel *se
+   has_batteries = FALSE;
+ #endif
+ 
++out:
+   self->priv->has_batteries = has_batteries;
+ 
+   gtk_widget_set_visible (self->priv->critical_battery_row, has_batteries);
+@@ -1136,18 +1169,41 @@ update_header_func (GtkListBoxRow  *row,
+     }
+ }
+ 
++#ifdef HAVE_BLUETOOTH
+ static void
+-bt_set_powered (CcPowerPanel *self,
+-                gboolean      powered)
++bt_set_powered (BluetoothClient *client,
++                gboolean         powered)
+ {
+-  g_dbus_proxy_call (self->priv->bt_properties,
+-		     "Set",
+-		     g_variant_new_parsed ("('org.gnome.SettingsDaemon.Rfkill', 'BluetoothAirplaneMode', %v)",
+-					   g_variant_new_boolean (!powered)),
+-		     G_DBUS_CALL_FLAGS_NONE,
+-		     -1,
+-		     self->priv->cancellable,
+-		     NULL, NULL);
++  GVariant *ret;
++  const gchar *adapter_path;
++  GDBusConnection *bus;
++
++  bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
++
++  ret = g_dbus_connection_call_sync (bus,
++                                    "org.bluez",
++                                    "/",
++                                    "org.bluez.Manager",
++                                    "DefaultAdapter",
++                                    NULL,
++                                    NULL,
++                                    0,
++                                    G_MAXINT,
++                                    NULL, NULL);
++  g_variant_get (ret, "(&o)", &adapter_path);
++
++  g_dbus_connection_call (bus,
++                          "org.bluez",
++                          adapter_path,
++                          "org.freedesktop.Properties",
++                          "SetProperty",
++                          g_variant_new ("(sv)", "Powered", g_variant_new_boolean (powered)),
++                          NULL,
++                          0,
++                          G_MAXINT,
++                          NULL, NULL, NULL);
++
++  g_variant_unref (ret);
+ }
+ 
+ static void
+@@ -1161,26 +1217,25 @@ bt_switch_changed (GtkSwitch    *sw,
+ 
+   g_debug ("Setting bt power %s", powered ? "on" : "off");
+ 
+-  bt_set_powered (panel, powered);
++  bt_set_powered (panel->priv->bt_client, powered);
+ }
+ 
+ static void
+-bt_powered_state_changed (CcPowerPanel *panel)
++bt_powered_state_changed (GObject      *client,
++                          GParamSpec   *pspec,
++                          CcPowerPanel *panel)
+ {
+   CcPowerPanelPrivate *priv = panel->priv;
+   gboolean powered;
+-  GVariant *v;
+-
+-  v = g_dbus_proxy_get_cached_property (priv->bt_rfkill, "BluetoothAirplaneMode");
+-  powered = !g_variant_get_boolean (v);
+-  g_variant_unref (v);
+ 
++  g_object_get (client, "default-adapter-powered", &powered, NULL);
+   g_debug ("bt powered state changed to %s", powered ? "on" : "off");
+ 
+   g_signal_handlers_block_by_func (priv->bt_switch, bt_switch_changed, panel);
+   gtk_switch_set_active (GTK_SWITCH (priv->bt_switch), powered);
+   g_signal_handlers_unblock_by_func (priv->bt_switch, bt_switch_changed, panel);
+ }
++#endif
+ 
+ #ifdef HAVE_NETWORK_MANAGER
+ static gboolean
+@@ -1419,8 +1474,8 @@ add_brightness_row (CcPowerPanel  *self,
+   label = gtk_label_new (text);
+   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+   gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+-  gtk_widget_set_margin_start (label, 20);
+-  gtk_widget_set_margin_end (label, 20);
++  gtk_widget_set_margin_left (label, 20);
++  gtk_widget_set_margin_right (label, 20);
+   gtk_widget_set_margin_top (label, 6);
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
+@@ -1433,8 +1488,8 @@ add_brightness_row (CcPowerPanel  *self,
+   *brightness_scale = scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
+   gtk_label_set_mnemonic_widget (GTK_LABEL (label), scale);
+   gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
+-  gtk_widget_set_margin_start (scale, 20);
+-  gtk_widget_set_margin_end (scale, 20);
++  gtk_widget_set_margin_left (scale, 20);
++  gtk_widget_set_margin_right (scale, 20);
+   gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
+   gtk_size_group_add_widget (priv->level_sizegroup, scale);
+   g_signal_connect (scale, "value-changed",
+@@ -1465,8 +1520,8 @@ add_power_saving_section (CcPowerPanel *
+   g_free (s);
+   gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+   gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+-  gtk_widget_set_margin_start (widget, 56);
+-  gtk_widget_set_margin_end (widget, 56);
++  gtk_widget_set_margin_left (widget, 56);
++  gtk_widget_set_margin_right (widget, 56);
+   gtk_widget_set_margin_bottom (widget, 6);
+   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 0);
+   gtk_widget_show (widget);
+@@ -1481,8 +1536,8 @@ add_power_saving_section (CcPowerPanel *
+ 
+   box = gtk_frame_new (NULL);
+   gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
+-  gtk_widget_set_margin_start (box, 50);
+-  gtk_widget_set_margin_end (box, 50);
++  gtk_widget_set_margin_left (box, 50);
++  gtk_widget_set_margin_right (box, 50);
+   gtk_widget_set_margin_bottom (box, 24);
+   gtk_widget_show (box);
+   gtk_container_add (GTK_CONTAINER (box), widget);
+@@ -1507,8 +1562,8 @@ add_power_saving_section (CcPowerPanel *
+   label = gtk_label_new (_("_Dim screen when inactive"));
+   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+   gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+-  gtk_widget_set_margin_start (label, 20);
+-  gtk_widget_set_margin_end (label, 20);
++  gtk_widget_set_margin_left (label, 20);
++  gtk_widget_set_margin_right (label, 20);
+   gtk_widget_set_margin_top (label, 6);
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+@@ -1517,8 +1572,8 @@ add_power_saving_section (CcPowerPanel *
+   g_settings_bind (priv->gsd_settings, "idle-dim",
+                    sw, "active",
+                    G_SETTINGS_BIND_DEFAULT);
+-  gtk_widget_set_margin_start (sw, 20);
+-  gtk_widget_set_margin_end (sw, 20);
++  gtk_widget_set_margin_left (sw, 20);
++  gtk_widget_set_margin_right (sw, 20);
+   gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
+   gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
+   gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
+@@ -1532,8 +1587,8 @@ add_power_saving_section (CcPowerPanel *
+   label = gtk_label_new (_("_Blank screen"));
+   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+   gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+-  gtk_widget_set_margin_start (label, 20);
+-  gtk_widget_set_margin_end (label, 20);
++  gtk_widget_set_margin_left (label, 20);
++  gtk_widget_set_margin_right (label, 20);
+   gtk_widget_set_margin_top (label, 6);
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+@@ -1546,8 +1601,8 @@ add_power_saving_section (CcPowerPanel *
+   set_value_for_combo (GTK_COMBO_BOX (combo), value);
+   g_signal_connect (combo, "changed",
+                     G_CALLBACK (combo_idle_delay_changed_cb), self);
+-  gtk_widget_set_margin_start (combo, 20);
+-  gtk_widget_set_margin_end (combo, 20);
++  gtk_widget_set_margin_left (combo, 20);
++  gtk_widget_set_margin_right (combo, 20);
+   gtk_widget_set_valign (combo, GTK_ALIGN_CENTER);
+   gtk_box_pack_start (GTK_BOX (box), combo, FALSE, TRUE, 0);
+   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+@@ -1560,8 +1615,8 @@ add_power_saving_section (CcPowerPanel *
+   gtk_container_add (GTK_CONTAINER (row), box);
+ 
+   box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+-  gtk_widget_set_margin_start (box2, 20);
+-  gtk_widget_set_margin_end (box2, 20);
++  gtk_widget_set_margin_left (box2, 20);
++  gtk_widget_set_margin_right (box2, 20);
+   gtk_widget_set_margin_top (box2, 6);
+   gtk_widget_set_margin_bottom (box2, 6);
+   gtk_box_pack_start (GTK_BOX (box), box2, TRUE, TRUE, 0);
+@@ -1577,8 +1632,8 @@ add_power_saving_section (CcPowerPanel *
+   gtk_box_pack_start (GTK_BOX (box2), w, TRUE, TRUE, 0);
+ 
+   priv->wifi_switch = sw = gtk_switch_new ();
+-  gtk_widget_set_margin_start (sw, 20);
+-  gtk_widget_set_margin_end (sw, 20);
++  gtk_widget_set_margin_left (sw, 20);
++  gtk_widget_set_margin_right (sw, 20);
+   gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
+   gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
+   gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
+@@ -1590,8 +1645,8 @@ add_power_saving_section (CcPowerPanel *
+   gtk_container_add (GTK_CONTAINER (row), box);
+ 
+   box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+-  gtk_widget_set_margin_start (box2, 20);
+-  gtk_widget_set_margin_end (box2, 20);
++  gtk_widget_set_margin_left (box2, 20);
++  gtk_widget_set_margin_right (box2, 20);
+   gtk_widget_set_margin_top (box2, 6);
+   gtk_widget_set_margin_bottom (box2, 6);
+   gtk_box_pack_start (GTK_BOX (box), box2, TRUE, TRUE, 0);
+@@ -1607,8 +1662,8 @@ add_power_saving_section (CcPowerPanel *
+   gtk_box_pack_start (GTK_BOX (box2), w, TRUE, TRUE, 0);
+ 
+   priv->mobile_switch = sw = gtk_switch_new ();
+-  gtk_widget_set_margin_start (sw, 20);
+-  gtk_widget_set_margin_end (sw, 20);
++  gtk_widget_set_margin_left (sw, 20);
++  gtk_widget_set_margin_right (sw, 20);
+   gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
+   gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
+   gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
+@@ -1631,47 +1686,33 @@ add_power_saving_section (CcPowerPanel *
+                     G_CALLBACK (wifi_switch_changed), self);
+ #endif
+ 
+-  priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+-						   G_DBUS_PROXY_FLAGS_NONE,
+-						   NULL,
+-						   "org.gnome.SettingsDaemon.Rfkill",
+-						   "/org/gnome/SettingsDaemon/Rfkill",
+-						   "org.gnome.SettingsDaemon.Rfkill",
+-						   NULL, NULL);
+-  if (priv->bt_rfkill)
+-    {
+-      priv->bt_properties = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+-							   G_DBUS_PROXY_FLAGS_NONE,
+-							   NULL,
+-							   "org.gnome.SettingsDaemon.Rfkill",
+-							   "/org/gnome/SettingsDaemon/Rfkill",
+-							   "org.freedesktop.DBus.Properties",
+-							   NULL, NULL);
+-      row = gtk_list_box_row_new ();
+-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
+-      gtk_container_add (GTK_CONTAINER (row), box);
+-      label = gtk_label_new (_("_Bluetooth"));
+-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+-      gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+-      gtk_widget_set_margin_start (label, 20);
+-      gtk_widget_set_margin_end (label, 20);
+-      gtk_widget_set_margin_top (label, 6);
+-      gtk_widget_set_margin_bottom (label, 6);
+-      gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+-
+-      priv->bt_switch = sw = gtk_switch_new ();
+-      gtk_widget_set_margin_start (sw, 20);
+-      gtk_widget_set_margin_end (sw, 20);
+-      gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
+-      gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
+-      gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
+-      gtk_container_add (GTK_CONTAINER (widget), row);
+-      gtk_size_group_add_widget (priv->row_sizegroup, row);
+-      g_signal_connect_swapped (G_OBJECT (priv->bt_rfkill), "g-properties-changed",
+-				G_CALLBACK (bt_powered_state_changed), self);
+-      g_signal_connect (G_OBJECT (priv->bt_switch), "notify::active",
+-			G_CALLBACK (bt_switch_changed), self);
+-    }
++#ifdef HAVE_BLUETOOTH
++    priv->bt_client = bluetooth_client_new ();
++    row = gtk_list_box_row_new ();
++    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
++    gtk_container_add (GTK_CONTAINER (row), box);
++    label = gtk_label_new (_("_Bluetooth"));
++    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
++    gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
++    gtk_widget_set_margin_left (label, 20);
++    gtk_widget_set_margin_right (label, 20);
++    gtk_widget_set_margin_top (label, 6);
++    gtk_widget_set_margin_bottom (label, 6);
++    gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
++
++    priv->bt_switch = sw = gtk_switch_new ();
++    gtk_widget_set_margin_left (sw, 20);
++    gtk_widget_set_margin_right (sw, 20);
++    gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
++    gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
++    gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
++    gtk_container_add (GTK_CONTAINER (widget), row);
++    gtk_size_group_add_widget (priv->row_sizegroup, row);
++    g_signal_connect (G_OBJECT (priv->bt_client), "notify::default-adapter-powered",
++                      G_CALLBACK (bt_powered_state_changed), self);
++    g_signal_connect (G_OBJECT (priv->bt_switch), "notify::active",
++                      G_CALLBACK (bt_switch_changed), self);
++#endif
+ 
+   gtk_widget_show_all (widget);
+ }
+@@ -1837,8 +1878,8 @@ add_automatic_suspend_section (CcPowerPa
+   g_free (s);
+   gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+   gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+-  gtk_widget_set_margin_start (widget, 56);
+-  gtk_widget_set_margin_end (widget, 50);
++  gtk_widget_set_margin_left (widget, 56);
++  gtk_widget_set_margin_right (widget, 50);
+   gtk_widget_set_margin_bottom (widget, 6);
+   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 0);
+   gtk_widget_show (widget);
+@@ -1855,8 +1896,8 @@ add_automatic_suspend_section (CcPowerPa
+ 
+   box = gtk_frame_new (NULL);
+   gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
+-  gtk_widget_set_margin_start (box, 50);
+-  gtk_widget_set_margin_end (box, 50);
++  gtk_widget_set_margin_left (box, 50);
++  gtk_widget_set_margin_right (box, 50);
+   gtk_widget_set_margin_bottom (box, 24);
+   gtk_widget_show (box);
+   gtk_container_add (GTK_CONTAINER (box), widget);
+@@ -1868,8 +1909,8 @@ add_automatic_suspend_section (CcPowerPa
+   label = gtk_label_new (_("_Automatic suspend"));
+   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+   gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+-  gtk_widget_set_margin_start (label, 20);
+-  gtk_widget_set_margin_end (label, 20);
++  gtk_widget_set_margin_left (label, 20);
++  gtk_widget_set_margin_right (label, 20);
+   gtk_widget_set_margin_top (label, 6);
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+@@ -1879,8 +1920,8 @@ add_automatic_suspend_section (CcPowerPa
+   g_signal_connect (sw, "mnemonic-activate",
+                     G_CALLBACK (automatic_suspend_activate), self);
+   gtk_misc_set_alignment (GTK_MISC (sw), 1, 0.5);
+-  gtk_widget_set_margin_start (sw, 24);
+-  gtk_widget_set_margin_end (sw, 24);
++  gtk_widget_set_margin_left (sw, 24);
++  gtk_widget_set_margin_right (sw, 24);
+   gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
+   gtk_container_add (GTK_CONTAINER (widget), row);
+   gtk_size_group_add_widget (priv->row_sizegroup, row);
+@@ -1892,8 +1933,8 @@ add_automatic_suspend_section (CcPowerPa
+   label = gtk_label_new (_("When battery power is _critical"));
+   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+   gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+-  gtk_widget_set_margin_start (label, 20);
+-  gtk_widget_set_margin_end (label, 20);
++  gtk_widget_set_margin_left (label, 20);
++  gtk_widget_set_margin_right (label, 20);
+   gtk_widget_set_margin_top (label, 6);
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+@@ -1930,8 +1971,8 @@ add_automatic_suspend_section (CcPowerPa
+       cell = gtk_cell_renderer_text_new ();
+       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (sw), cell, TRUE);
+       gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (sw), cell, "text", 0);
+-      gtk_widget_set_margin_start (sw, 20);
+-      gtk_widget_set_margin_end (sw, 20);
++      gtk_widget_set_margin_left (sw, 20);
++      gtk_widget_set_margin_right (sw, 20);
+       gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
+ 
+       g_object_set_data (G_OBJECT (sw), "_gsettings_key", "critical-battery-action");
+@@ -1947,8 +1988,8 @@ add_automatic_suspend_section (CcPowerPa
+   else
+     {
+       label = gtk_label_new (_("Power Off"));
+-      gtk_widget_set_margin_start (label, 20);
+-      gtk_widget_set_margin_end (label, 20);
++      gtk_widget_set_margin_left (label, 20);
++      gtk_widget_set_margin_right (label, 20);
+       gtk_widget_set_margin_top (label, 6);
+       gtk_widget_set_margin_bottom (label, 6);
+       gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
+@@ -2030,8 +2071,8 @@ add_battery_section (CcPowerPanel *self)
+   vbox = WID (priv->builder, "vbox_power");
+ 
+   priv->battery_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+-  gtk_widget_set_margin_start (box, 50);
+-  gtk_widget_set_margin_end (box, 50);
++  gtk_widget_set_margin_left (box, 50);
++  gtk_widget_set_margin_right (box, 50);
+   gtk_widget_set_margin_bottom (box, 6);
+   gtk_widget_set_margin_bottom (box, 24);
+   gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
+@@ -2041,8 +2082,8 @@ add_battery_section (CcPowerPanel *self)
+   g_free (s);
+   gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+   gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+-  gtk_widget_set_margin_start (widget, 6);
+-  gtk_widget_set_margin_end (widget, 6);
++  gtk_widget_set_margin_left (widget, 6);
++  gtk_widget_set_margin_right (widget, 6);
+   gtk_widget_set_margin_bottom (widget, 6);
+   gtk_widget_set_margin_bottom (box, 24);
+   gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
+@@ -2077,8 +2118,8 @@ add_device_section (CcPowerPanel *self)
+   vbox = WID (priv->builder, "vbox_power");
+ 
+   priv->device_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+-  gtk_widget_set_margin_start (box, 50);
+-  gtk_widget_set_margin_end (box, 50);
++  gtk_widget_set_margin_left (box, 50);
++  gtk_widget_set_margin_right (box, 50);
+   gtk_widget_set_margin_top (box, 6);
+   gtk_widget_set_margin_bottom (box, 24);
+   gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
+@@ -2088,8 +2129,8 @@ add_device_section (CcPowerPanel *self)
+   g_free (s);
+   gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
+   gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+-  gtk_widget_set_margin_start (widget, 6);
+-  gtk_widget_set_margin_end (widget, 6);
++  gtk_widget_set_margin_left (widget, 6);
++  gtk_widget_set_margin_right (widget, 6);
+   gtk_widget_set_margin_bottom (widget, 6);
+   gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
+ 
+@@ -2137,7 +2178,6 @@ cc_power_panel_init (CcPowerPanel *self)
+   GError     *error;
+   GtkWidget  *widget;
+   GtkWidget  *box;
+-  guint       i;
+ 
+   priv = self->priv = POWER_PANEL_PRIVATE (self);
+   g_resources_register (cc_power_get_resource ());
+@@ -2201,15 +2241,9 @@ cc_power_panel_init (CcPowerPanel *self)
+   update_automatic_suspend_label (self);
+ 
+   /* populate batteries */
+-  g_signal_connect (priv->up_client, "device-added", G_CALLBACK (up_client_device_added), self);
+-  g_signal_connect (priv->up_client, "device-removed", G_CALLBACK (up_client_device_removed), self);
+-
+-  priv->devices = up_client_get_devices (priv->up_client);
+-  for (i = 0; priv->devices != NULL && i < priv->devices->len; i++) {
+-    UpDevice *device = g_ptr_array_index (priv->devices, i);
+-    g_signal_connect (G_OBJECT (device), "notify",
+-                      G_CALLBACK (up_client_changed), self);
+-  }
++  g_signal_connect (priv->up_client, "device-added", G_CALLBACK (up_client_changed), self);
++  g_signal_connect (priv->up_client, "device-changed", G_CALLBACK (up_client_changed), self);
++  g_signal_connect (priv->up_client, "device-removed", G_CALLBACK (up_client_changed), self);
+   up_client_changed (priv->up_client, NULL, self);
+ 
+   widget = WID (priv->builder, "vbox_power");
+Index: gnome-control-center/panels/power/cc-power-panel.h
+===================================================================
+--- gnome-control-center.orig/panels/power/cc-power-panel.h
++++ gnome-control-center/panels/power/cc-power-panel.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-control-center/panels/power/gnome-power-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/power/gnome-power-panel.desktop.in.in
++++ gnome-control-center/panels/power/gnome-power-panel.desktop.in.in
+@@ -5,7 +5,6 @@ Exec=gnome-control-center power
+ Icon=gnome-power-manager
+ Terminal=false
+ Type=Application
+-NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;HardwareSettings;
+ OnlyShowIn=GNOME;Unity;
+Index: gnome-control-center/panels/power/power.ui
+===================================================================
+--- gnome-control-center.orig/panels/power/power.ui
++++ gnome-control-center/panels/power/power.ui
+@@ -129,6 +129,7 @@
+     <child internal-child="vbox">
+       <object class="GtkBox" id="asdf">
+         <property name="can_focus">False</property>
++        <property name="resize_mode">immediate</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
+         <child internal-child="action_area">
+@@ -163,8 +164,8 @@
+           <object class="GtkGrid" id="grid1">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="margin_start">12</property>
+-            <property name="margin_end">6</property>
++            <property name="margin_left">12</property>
++            <property name="margin_right">6</property>
+             <property name="margin_top">12</property>
+             <property name="margin_bottom">12</property>
+             <property name="row_spacing">12</property>
+@@ -219,6 +220,8 @@
+               <object class="GtkComboBoxText" id="suspend_on_battery_delay_combo">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
++                <property name="margin_left">4</property>
++                <property name="margin_right">4</property>
+                 <property name="entry_text_column">0</property>
+                 <property name="id_column">1</property>
+                 <property name="model">liststore_time</property>
+@@ -234,7 +237,7 @@
+               <object class="GtkLabel" id="suspend_on_battery_delay_label">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="margin_start">20</property>
++                <property name="margin_left">20</property>
+                 <property name="xalign">1</property>
+                 <property name="label" translatable="yes">Delay</property>
+                 <property name="mnemonic_widget">suspend_on_battery_delay_combo</property>
+@@ -267,6 +270,8 @@
+               <object class="GtkComboBoxText" id="suspend_on_ac_delay_combo">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
++                <property name="margin_left">4</property>
++                <property name="margin_right">4</property>
+                 <property name="entry_text_column">0</property>
+                 <property name="id_column">1</property>
+                 <property name="model">liststore_time</property>
+@@ -294,7 +299,7 @@
+               <object class="GtkLabel" id="suspend_on_ac_delay_label">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="margin_start">20</property>
++                <property name="margin_left">20</property>
+                 <property name="xalign">1</property>
+                 <property name="label" translatable="yes">Delay</property>
+                 <property name="mnemonic_widget">suspend_on_ac_delay_combo</property>
 
=== added file 'debian/patches/revert-bluetooth-BlueZ5-interface.patch'
--- debian/patches/revert-bluetooth-BlueZ5-interface.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert-bluetooth-BlueZ5-interface.patch	2014-09-30 05:25:02 +0000
@@ -0,0 +1,34 @@
+From d15a9709f2782dc36b8d86905507a014922f01ed Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Wed, 23 Oct 2013 07:39:24 +1100
+Subject: [PATCH] Revert "Update adapter interface for BlueZ 5"
+
+This reverts commit ac43647ac01cb990555c7b4ff7b8bf5fb8b17b83.
+---
+ panels/bluetooth/cc-bluetooth-panel.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- a/panels/bluetooth/cc-bluetooth-panel.c
++++ b/panels/bluetooth/cc-bluetooth-panel.c
+@@ -43,9 +43,6 @@
+ 
+ #define WID(s) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, s))
+ 
+-#define BLUEZ_SERVICE	"org.bluez"
+-#define ADAPTER_IFACE	"org.bluez.Adapter1"
+-
+ #define KEYBOARD_PREFS		"keyboard"
+ #define MOUSE_PREFS		"mouse"
+ #define SOUND_PREFS		"sound"
+@@ -675,9 +672,9 @@
+ 	adapter_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+ 						       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+ 						       NULL,
+-						       BLUEZ_SERVICE,
++						       "org.bluez",
+ 						       adapter,
+-						       ADAPTER_IFACE,
++						       "org.bluez.Adapter",
+ 						       NULL,
+ 						       &error);
+ 	g_free (adapter);
 
=== modified file 'debian/patches/revert_git_dont_hide_zoom.patch'
--- debian/patches/revert_git_dont_hide_zoom.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/revert_git_dont_hide_zoom.patch	2014-09-30 05:25:02 +0000
@@ -7,19 +7,17 @@
 
 https://bugzilla.gnome.org/show_bug.cgi?id=682862
 ---
-Index: gnome-control-center-3.8.3/panels/universal-access/cc-ua-panel.c
-===================================================================
---- gnome-control-center-3.8.3.orig/panels/universal-access/cc-ua-panel.c	2013-06-11 20:04:34.087380775 -0400
-+++ gnome-control-center-3.8.3/panels/universal-access/cc-ua-panel.c	2013-06-11 20:04:34.083380775 -0400
-@@ -60,6 +60,7 @@
-   GSettings *mediakeys_settings;
+--- a/panels/universal-access/cc-ua-panel.c
++++ b/panels/universal-access/cc-ua-panel.c
+@@ -102,6 +102,7 @@
+   GSettings *application_settings;
  
    ZoomOptions *zoom_options;
 +  guint shell_watch_id;
- };
- 
- 
-@@ -94,6 +95,12 @@
+ 
+   GtkAdjustment *focus_adjustment;
+ 
+@@ -116,6 +117,12 @@
  {
    CcUaPanelPrivate *priv = CC_UA_PANEL (object)->priv;
  
@@ -29,11 +27,11 @@
 +      priv->shell_watch_id = 0;
 +    }
 +
-   if (priv->builder)
-     {
-       g_object_unref (priv->builder);
-@@ -300,6 +307,29 @@
- 	g_free (text);
+   g_clear_object (&priv->builder);
+   g_slist_free_full (priv->toplevels, (GDestroyNotify)gtk_widget_destroy);
+   priv->toplevels = NULL;
+@@ -177,6 +184,29 @@
+   return (factor > DPI_FACTOR_NORMAL);
  }
  
 +static void
@@ -43,8 +41,8 @@
 +{
 +  CcUaPanelPrivate *priv = self->priv;
 +
-+  gtk_widget_hide (WID (priv->builder, "zoom_label_box"));
-+  gtk_widget_hide (WID (priv->builder, "zoom_value_box"));
++  gtk_widget_hide (WID ("zoom_label_box"));
++  gtk_widget_hide (WID ("zoom_value_box"));
 +}
 +
 +static void
@@ -55,17 +53,17 @@
 +{
 +  CcUaPanelPrivate *priv = self->priv;
 +
-+  gtk_widget_show (WID (priv->builder, "zoom_label_box"));
-+  gtk_widget_show (WID (priv->builder, "zoom_value_box"));
++  gtk_widget_show (WID ("zoom_label_box"));
++  gtk_widget_show (WID ("zoom_value_box"));
 +}
 +
  static gboolean
  get_large_text_mapping (GValue   *value,
                          GVariant *variant,
-@@ -401,6 +431,13 @@
-                    WID (priv->builder, "seeing_toggle_keys_switch"), "active",
-                    G_SETTINGS_BIND_DEFAULT);
+@@ -445,6 +475,13 @@
+                                 NULL);
  
+   /* zoom */
 +  priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
 +					   "org.gnome.Shell",
 +					   G_BUS_NAME_WATCHER_FLAGS_NONE,
@@ -73,6 +71,6 @@
 +					   (GBusNameVanishedCallback) shell_vanished_cb,
 +					   self,
 +					   NULL);
-   g_signal_connect (WID (priv->builder, "seeing_zoom_preferences_button"),
-                     "clicked",
-                     G_CALLBACK (zoom_options_launch_cb), self);
+ 
+   g_settings_bind_with_mapping (priv->application_settings, "screen-magnifier-enabled",
+                                 WID ("value_zoom"),
 
=== modified file 'debian/patches/revert_git_drop_library.patch'
--- debian/patches/revert_git_drop_library.patch	2014-02-12 00:19:03 +0000
+++ debian/patches/revert_git_drop_library.patch	2014-09-30 05:25:02 +0000
@@ -29,7 +29,7 @@
  # Internationalization support
  
  IT_PROG_INTLTOOL([0.40.1])
-@@ -326,9 +335,12 @@
+@@ -334,9 +343,12 @@
  PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\""
  AC_SUBST(PANEL_CFLAGS)
  
@@ -40,10 +40,10 @@
 +PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
 +AC_SUBST(PANEL_LDFLAGS)
 +
- dnl ==============================================
- dnl libsocialweb
- dnl ==============================================
-@@ -426,6 +438,7 @@
+ dnl =======================================
+ dnl Update Mime Database
+ dnl =======================================
+@@ -416,6 +428,7 @@
  
  AC_CONFIG_FILES([
  Makefile
@@ -67,7 +67,7 @@
  	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_common $<
 --- a/shell/Makefile.am
 +++ b/shell/Makefile.am
-@@ -28,14 +28,8 @@
+@@ -29,14 +29,8 @@
  	cc-shell-category-view.h		\
  	cc-shell-item-view.c			\
  	cc-shell-item-view.h			\
@@ -84,7 +84,7 @@
  	hostname-helper.c			\
  	hostname-helper.h			\
  	cc-hostname-entry.c			\
-@@ -44,8 +38,43 @@
+@@ -45,8 +39,43 @@
  
  gnome_control_center_LDFLAGS = -export-dynamic
  
@@ -128,15 +128,14 @@
  	$(SHELL_LIBS)							\
  	$(CHEESE_LIBS)							\
  	$(top_builddir)/libgd/libgd.la					\
-@@ -99,6 +128,8 @@
+@@ -107,6 +136,7 @@
  
  EXTRA_DIST =					\
  	gnome-control-center.desktop.in.in	\
 +	libgnome-control-center.pc.in  		\
-+	$(servicefile_in_files)                 \
+ 	$(servicefile_in_files)                 \
  	$(completion_in_files)			\
  	list-panel.sh
- 
 --- /dev/null
 +++ b/shell/libgnome-control-center.pc.in
 @@ -0,0 +1,12 @@
@@ -155,7 +154,7 @@
 \ No newline at end of file
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -34,6 +34,12 @@
+@@ -35,6 +35,12 @@
  
  -include $(top_srcdir)/git.mk
  
 
=== added file 'debian/patches/revert_git_new_bluetooth_panel.patch'
--- debian/patches/revert_git_new_bluetooth_panel.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert_git_new_bluetooth_panel.patch	2014-09-30 05:25:02 +0000
@@ -0,0 +1,1607 @@
+From 258759f58d7e4095de9bd4623cc9b8680f37bc52 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Sun, 19 Jan 2014 09:29:54 +1100
+Subject: [PATCH] This reverts commit 07c354661102669d7ec8e7d1f00c2f70982ad226.
+
+Revert "bluetooth: Updated design"
+
+This reverts commit 28fecc01c46a7b082f9746744c938e499a522e4f.
+---
+ configure.ac                          |   2 +-
+ panels/bluetooth/bluetooth.ui         | 641 ++++++++++++++++++++++++++-
+ panels/bluetooth/cc-bluetooth-panel.c | 799 +++++++++++++++++++++++++++++-----
+ 3 files changed, 1317 insertions(+), 125 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,7 +206,7 @@
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+ 
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1,
++PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
+ 		  [have_bluetooth=yes], have_bluetooth=no)
+ if test "x$have_bluetooth" = xyes ; then
+ 	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+--- a/panels/bluetooth/bluetooth.ui
++++ b/panels/bluetooth/bluetooth.ui
+@@ -1,5 +1,4 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!-- Generated with glade 3.16.0 on Fri Nov 29 16:46:49 2013 -->
+ <interface>
+   <!-- interface-requires gtk+ 3.0 -->
+   <object class="GtkBox" id="box_power">
+@@ -7,18 +6,654 @@
+     <property name="can_focus">False</property>
+     <child>
+       <object class="GtkSwitch" id="switch_bluetooth">
+-        <property name="use_action_appearance">False</property>
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="valign">center</property>
++        <property name="use_action_appearance">False</property>
+       </object>
+       <packing>
+         <property name="expand">False</property>
+         <property name="fill">True</property>
+-        <property name="padding">4</property>
+         <property name="pack_type">end</property>
+         <property name="position">2</property>
++        <property name="padding">4</property>
+       </packing>
+     </child>
+   </object>
++      <object class="GtkGrid" id="grid">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="border_width">8</property>
++        <property name="margin-start">6</property>
++        <property name="margin-end">6</property>
++        <property name="margin-top">6</property>
++        <property name="margin-bottom">6</property>
++        <child>
++          <placeholder/>
++        </child>
++        <child>
++          <object class="GtkBox" id="vbox">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
++            <child>
++              <object class="GtkBox" id="box_devices">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
++                <child>
++                  <object class="GtkScrolledWindow" id="message_scrolledwindow">
++                    <property name="sensitive">False</property>
++                    <property name="can_focus">True</property>
++                    <property name="no_show_all">True</property>
++                    <property name="hscrollbar_policy">never</property>
++                    <property name="shadow_type">in</property>
++                    <property name="min_content_width">200</property>
++                    <property name="min_content_height">250</property>
++                    <child>
++                      <object class="GtkViewport" id="viewport2">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="shadow_type">none</property>
++                        <child>
++                          <object class="GtkLabel" id="message_label">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="xalign">0</property>
++                            <property name="yalign">0</property>
++                            <property name="xpad">12</property>
++                            <property name="ypad">12</property>
++                            <property name="label">Bluetooth is disabled by hardware switch</property>
++                            <property name="wrap">True</property>
++                          </object>
++                        </child>
++                      </object>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkToolbar" id="toolbar">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="toolbar_style">icons</property>
++                <property name="icon_size">1</property>
++                <style>
++                  <class name="inline-toolbar"/>
++                </style>
++                <child>
++                  <object class="GtkToolButton" id="button_setup">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="use_action_appearance">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="icon_name">list-add-symbolic</property>
++                    <property name="label" translatable="yes">Set Up New Device</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="homogeneous">True</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkToolButton" id="button_delete">
++                    <property name="visible">True</property>
++                    <property name="sensitive">False</property>
++                    <property name="can_focus">False</property>
++                    <property name="use_action_appearance">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="icon_name">list-remove-symbolic</property>
++                    <property name="label" translatable="yes">Remove Device</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="homogeneous">True</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="left_attach">0</property>
++            <property name="top_attach">1</property>
++            <property name="width">1</property>
++            <property name="height">1</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkNotebook" id="props_notebook">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="margin_start">6</property>
++            <property name="hexpand">True</property>
++            <property name="vexpand">True</property>
++            <property name="show_tabs">False</property>
++            <property name="show_border">False</property>
++            <child>
++              <object class="GtkScrolledWindow" id="scrolledwindow2">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="shadow_type">in</property>
++                <child>
++                  <object class="GtkViewport" id="viewport3">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="shadow_type">none</property>
++                    <child>
++                      <object class="GtkLabel" id="label8">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                      </object>
++                    </child>
++                  </object>
++                </child>
++              </object>
++            </child>
++            <child type="tab">
++              <object class="GtkLabel" id="label1">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label">empty</property>
++              </object>
++              <packing>
++                <property name="tab_fill">False</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkScrolledWindow" id="scrolledwindow1">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="hscrollbar_policy">never</property>
++                <property name="vscrollbar_policy">automatic</property>
++                <property name="shadow_type">in</property>
++                <child>
++                  <object class="GtkViewport" id="viewport1">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="shadow_type">none</property>
++                    <child>
++                      <object class="GtkBox" id="properties_vbox">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="margin_top">8</property>
++                        <property name="orientation">vertical</property>
++                        <child>
++                          <object class="GtkBox" id="box1">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="orientation">vertical</property>
++                            <property name="spacing">6</property>
++                            <child>
++                              <object class="GtkBox" id="box2">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="spacing">18</property>
++                                <property name="homogeneous">True</property>
++                                <child>
++                                  <object class="GtkLabel" id="connection_label">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">1</property>
++                                    <property name="label" translatable="yes">Connection</property>
++                                    <style>
++                                      <class name="dim-label"/>
++                                    </style>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkNotebook" id="connecting_notebook">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="show_tabs">False</property>
++                                    <property name="show_border">False</property>
++                                    <child>
++                                      <object class="GtkSwitch" id="switch_connection">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="halign">start</property>
++                                        <property name="use_action_appearance">False</property>
++                                      </object>
++                                    </child>
++                                    <child type="tab">
++                                      <object class="GtkLabel" id="label3">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="label" translatable="yes">page 1</property>
++                                      </object>
++                                      <packing>
++                                        <property name="tab_fill">False</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkSpinner" id="connecting_spinner">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="halign">start</property>
++                                      </object>
++                                      <packing>
++                                        <property name="position">1</property>
++                                      </packing>
++                                    </child>
++                                    <child type="tab">
++                                      <object class="GtkLabel" id="label9">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="label" translatable="yes">page 2</property>
++                                      </object>
++                                      <packing>
++                                        <property name="position">1</property>
++                                        <property name="tab_fill">False</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                    <child type="tab">
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkBox" id="box3">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="spacing">18</property>
++                                <property name="homogeneous">True</property>
++                                <child>
++                                  <object class="GtkLabel" id="label4">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">1</property>
++                                    <property name="label" translatable="yes">Paired</property>
++                                    <style>
++                                      <class name="dim-label"/>
++                                    </style>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkLabel" id="paired_label">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label">Yes</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkBox" id="box4">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="spacing">18</property>
++                                <property name="homogeneous">True</property>
++                                <child>
++                                  <object class="GtkLabel" id="label5">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">1</property>
++                                    <property name="label" translatable="yes">Type</property>
++                                    <style>
++                                      <class name="dim-label"/>
++                                    </style>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkLabel" id="type_label">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label">Keyboard</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkBox" id="box5">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="spacing">18</property>
++                                <property name="homogeneous">True</property>
++                                <child>
++                                  <object class="GtkLabel" id="label6">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">1</property>
++                                    <property name="label" translatable="yes">Address</property>
++                                    <style>
++                                      <class name="dim-label"/>
++                                    </style>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkLabel" id="address_label">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label">00:00:00:00:00</property>
++                                    <property name="selectable">True</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">3</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="additional_setup_box">
++                            <property name="can_focus">False</property>
++                            <property name="no_show_all">True</property>
++                            <property name="orientation">vertical</property>
++                            <property name="spacing">8</property>
++                            <child>
++                              <placeholder/>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">True</property>
++                            <property name="fill">True</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="vbox3">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="margin_end">6</property>
++                            <property name="margin_bottom">6</property>
++                            <property name="orientation">vertical</property>
++                            <property name="spacing">6</property>
++                            <child>
++                              <object class="GtkBox" id="mouse_box">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <child>
++                                  <placeholder/>
++                                </child>
++                                <child>
++                                 <object class="GtkLinkButton" id="mouse_link">
++                                   <property name="label" translatable="yes">Mouse &amp; Touchpad Settings</property>
++                                   <property name="visible">True</property>
++                                   <property name="can_focus">True</property>
++                                   <property name="receives_default">True</property>
++                                   <property name="has_tooltip">False</property>
++                                   <property name="use_action_appearance">False</property>
++                                   <property name="relief">none</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="pack_type">end</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkBox" id="sound_box">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <child>
++                                  <placeholder/>
++                                </child>
++                                <child>
++                                 <object class="GtkLinkButton" id="sound_link">
++                                   <property name="label" translatable="yes">Sound Settings</property>
++                                   <property name="visible">True</property>
++                                   <property name="can_focus">True</property>
++                                   <property name="receives_default">True</property>
++                                   <property name="has_tooltip">False</property>
++                                   <property name="use_action_appearance">False</property>
++                                   <property name="relief">none</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="pack_type">end</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkBox" id="keyboard_box">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <child>
++                                  <placeholder/>
++                                </child>
++                                <child>
++                                 <object class="GtkLinkButton" id="keyboard_link">
++                                   <property name="label" translatable="yes">Keyboard Settings</property>
++                                   <property name="visible">True</property>
++                                   <property name="can_focus">True</property>
++                                   <property name="receives_default">True</property>
++                                   <property name="has_tooltip">False</property>
++                                   <property name="use_action_appearance">False</property>
++                                   <property name="relief">none</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="pack_type">end</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkBox" id="send_box">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <child>
++                                  <placeholder/>
++                                </child>
++                                <child>
++                                  <object class="GtkButton" id="send_button">
++                                    <property name="label" translatable="yes">Send Files…</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">True</property>
++                                    <property name="use_action_appearance">False</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="pack_type">end</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">3</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="pack_type">end</property>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkLabel" id="label7">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                          </object>
++                          <packing>
++                            <property name="expand">True</property>
++                            <property name="fill">True</property>
++                            <property name="position">3</property>
++                          </packing>
++                        </child>
++                      </object>
++                    </child>
++                  </object>
++                </child>
++              </object>
++              <packing>
++                <property name="position">1</property>
++              </packing>
++            </child>
++            <child type="tab">
++              <object class="GtkLabel" id="label2">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label">properties</property>
++              </object>
++              <packing>
++                <property name="position">1</property>
++                <property name="tab_fill">False</property>
++              </packing>
++            </child>
++            <child>
++              <placeholder/>
++            </child>
++          </object>
++          <packing>
++            <property name="left_attach">1</property>
++            <property name="top_attach">1</property>
++            <property name="width">1</property>
++            <property name="height">1</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkBox" id="box_vis">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="margin_bottom">12</property>
++            <child>
++              <object class="GtkLabel" id="visible_label">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">1</property>
++                <property name="mnemonic-widget">switch_discoverable</property>
++                <property name="label">Visibility of “Bastien's computer”</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="padding">6</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkSwitch" id="switch_discoverable">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="use_action_appearance">False</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="left_attach">0</property>
++            <property name="top_attach">0</property>
++            <property name="width">1</property>
++            <property name="height">1</property>
++          </packing>
++        </child>
++      </object>
+ </interface>
+--- a/panels/bluetooth/cc-bluetooth-panel.c
++++ b/panels/bluetooth/cc-bluetooth-panel.c
+@@ -1,6 +1,9 @@
+ /*
+  *
+- *  Copyright (C) 2013  Bastien Nocera <[e-mail]>
++ *  BlueZ - Bluetooth protocol stack for Linux
++ *
++ *  Copyright (C) 2006-2010  Bastien Nocera <[e-mail]>
++ *
+  *
+  *  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
+@@ -24,11 +27,14 @@
+ 
+ #include <glib/gi18n-lib.h>
+ #include <shell/cc-shell.h>
+-#include <bluetooth-settings-widget.h>
+ 
+ #include "cc-bluetooth-panel.h"
+ #include "cc-bluetooth-resources.h"
+ 
++#include <bluetooth-client.h>
++#include <bluetooth-utils.h>
++#include <bluetooth-killswitch.h>
++#include <bluetooth-chooser.h>
+ 
+ CC_PANEL_REGISTER (CcBluetoothPanel, cc_bluetooth_panel)
+ 
+@@ -36,32 +42,44 @@
+ 
+ #define WID(s) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, s))
+ 
+-#define BLUETOOTH_DISABLED_PAGE      "disabled-page"
+-#define BLUETOOTH_HW_DISABLED_PAGE   "hw-disabled-page"
+-#define BLUETOOTH_NO_DEVICES_PAGE    "no-devices-page"
+-#define BLUETOOTH_WORKING_PAGE       "working-page"
++#define BLUEZ_SERVICE	"org.bluez"
++#define ADAPTER_IFACE	"org.bluez.Adapter1"
++
++#define KEYBOARD_PREFS		"keyboard"
++#define MOUSE_PREFS		"mouse"
++#define SOUND_PREFS		"sound"
++#define WIZARD			"bluetooth-wizard"
+ 
+ struct CcBluetoothPanelPrivate {
+ 	GtkBuilder          *builder;
+-	GtkWidget           *stack;
+-	GtkWidget           *widget;
+-	GCancellable        *cancellable;
+-
+-	/* Killswitch */
++	GtkWidget           *chooser;
++	char                *selected_bdaddr;
++	BluetoothClient     *client;
++	BluetoothKillswitch *killswitch;
++	gboolean             debug;
++	GHashTable          *connecting_devices;
+ 	GtkWidget           *kill_switch_header;
+-	GDBusProxy          *rfkill, *properties;
+-	gboolean             airplane_mode;
+-	gboolean             hardware_airplane_mode;
+-	gboolean             has_airplane_mode;
++	GCancellable        *cancellable;
+ };
+ 
+ static void cc_bluetooth_panel_finalize (GObject *object);
+ static void cc_bluetooth_panel_constructed (GObject *object);
+ 
++static void
++launch_command (const char *command)
++{
++	GError *error = NULL;
++
++	if (!g_spawn_command_line_async(command, &error)) {
++		g_warning ("Couldn't execute command '%s': %s\n", command, error->message);
++		g_error_free (error);
++	}
++}
++
+ static const char *
+ cc_bluetooth_panel_get_help_uri (CcPanel *panel)
+ {
+-	return "help:gnome-help/bluetooth";
++  return "help:gnome-help/bluetooth";
+ }
+ 
+ static void
+@@ -84,17 +102,148 @@
+ 	CcBluetoothPanel *self;
+ 
+ 	self = CC_BLUETOOTH_PANEL (object);
+-
+ 	g_cancellable_cancel (self->priv->cancellable);
+ 	g_clear_object (&self->priv->cancellable);
+ 
+-	g_clear_object (&self->priv->properties);
+-	g_clear_object (&self->priv->rfkill);
++	g_clear_object (&self->priv->builder);
++	g_clear_object (&self->priv->killswitch);
++	g_clear_object (&self->priv->client);
++
++	g_clear_pointer (&self->priv->connecting_devices, g_hash_table_destroy);
++	g_clear_pointer (&self->priv->selected_bdaddr, g_free);
+ 	g_clear_object (&self->priv->kill_switch_header);
+ 
+ 	G_OBJECT_CLASS (cc_bluetooth_panel_parent_class)->finalize (object);
+ }
+ 
++enum {
++	CONNECTING_NOTEBOOK_PAGE_SWITCH = 0,
++	CONNECTING_NOTEBOOK_PAGE_SPINNER = 1
++};
++
++static void
++set_connecting_page (CcBluetoothPanel *self,
++		     int               page)
++{
++	if (page == CONNECTING_NOTEBOOK_PAGE_SPINNER)
++		gtk_spinner_start (GTK_SPINNER (WID ("connecting_spinner")));
++	gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("connecting_notebook")), page);
++	if (page == CONNECTING_NOTEBOOK_PAGE_SWITCH)
++		gtk_spinner_start (GTK_SPINNER (WID ("connecting_spinner")));
++}
++
++static void
++remove_connecting (CcBluetoothPanel *self,
++		   const char       *bdaddr)
++{
++	g_hash_table_remove (self->priv->connecting_devices, bdaddr);
++}
++
++static void
++add_connecting (CcBluetoothPanel *self,
++		const char       *bdaddr)
++{
++	g_hash_table_insert (self->priv->connecting_devices,
++			     g_strdup (bdaddr),
++			     GINT_TO_POINTER (1));
++}
++
++static gboolean
++is_connecting (CcBluetoothPanel *self,
++	       const char       *bdaddr)
++{
++	return GPOINTER_TO_INT (g_hash_table_lookup (self->priv->connecting_devices,
++						     bdaddr));
++}
++
++typedef struct {
++	char             *bdaddr;
++	CcBluetoothPanel *self;
++} ConnectData;
++
++static void
++connect_done (GObject      *source_object,
++	      GAsyncResult *res,
++	      gpointer      user_data)
++{
++	CcBluetoothPanel *self;
++	char *bdaddr;
++	gboolean success;
++	GError *error = NULL;
++	ConnectData *data = (ConnectData *) user_data;
++
++	success = bluetooth_client_connect_service_finish (BLUETOOTH_CLIENT (source_object),
++							   res, &error);
++	if (!success && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++		goto out;
++
++	self = data->self;
++
++	/* Check whether the same device is now selected, and update the UI */
++	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
++	if (g_strcmp0 (bdaddr, data->bdaddr) == 0) {
++		GtkSwitch *button;
++
++		button = GTK_SWITCH (WID ("switch_connection"));
++		/* Reset the switch if it failed */
++		if (success == FALSE)
++			gtk_switch_set_active (button, !gtk_switch_get_active (button));
++		set_connecting_page (self, CONNECTING_NOTEBOOK_PAGE_SWITCH);
++	}
++
++	remove_connecting (self, data->bdaddr);
++
++	g_free (bdaddr);
++
++out:
++	g_clear_error (&error);
++	g_free (data->bdaddr);
++	g_free (data);
++}
++
++static void
++switch_connected_active_changed (GtkSwitch        *button,
++				 GParamSpec       *spec,
++				 CcBluetoothPanel *self)
++{
++	char *proxy;
++	GValue value = { 0, };
++	ConnectData *data;
++	char *bdaddr;
++
++	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
++	if (is_connecting (self, bdaddr)) {
++		g_free (bdaddr);
++		return;
++	}
++
++	if (bluetooth_chooser_get_selected_device_info (BLUETOOTH_CHOOSER (self->priv->chooser),
++							"proxy", &value) == FALSE) {
++		g_warning ("Could not get D-Bus proxy for selected device");
++		return;
++	}
++	proxy = g_strdup (g_dbus_proxy_get_object_path (g_value_get_object (&value)));
++	g_value_unset (&value);
++
++	if (proxy == NULL)
++		return;
++
++	data = g_new0 (ConnectData, 1);
++	data->bdaddr = bdaddr;
++	data->self = self;
++
++	bluetooth_client_connect_service (self->priv->client,
++					  proxy,
++					  gtk_switch_get_active (button),
++					  self->priv->cancellable,
++					  connect_done,
++					  data);
++
++	add_connecting (self, data->bdaddr);
++	set_connecting_page (self, CONNECTING_NOTEBOOK_PAGE_SPINNER);
++	g_free (proxy);
++}
++
+ static void
+ cc_bluetooth_panel_constructed (GObject *object)
+ {
+@@ -109,6 +258,120 @@
+ 	gtk_widget_show_all (self->priv->kill_switch_header);
+ }
+ 
++enum {
++	NOTEBOOK_PAGE_EMPTY = 0,
++	NOTEBOOK_PAGE_PROPS = 1
++};
++
++static void
++set_notebook_page (CcBluetoothPanel *self,
++		   int               page)
++{
++	gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("props_notebook")), page);
++}
++
++static void
++cc_bluetooth_panel_update_properties (CcBluetoothPanel *self)
++{
++	char *bdaddr;
++	GtkSwitch *button;
++
++	button = GTK_SWITCH (WID ("switch_connection"));
++	g_signal_handlers_block_by_func (button, switch_connected_active_changed, self);
++
++	/* Hide all the buttons now, and show them again if we need to */
++	gtk_widget_hide (WID ("keyboard_box"));
++	gtk_widget_hide (WID ("sound_box"));
++	gtk_widget_hide (WID ("mouse_box"));
++	gtk_widget_hide (WID ("send_box"));
++
++	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
++
++	if (bdaddr == NULL) {
++		gtk_widget_set_sensitive (WID ("properties_vbox"), FALSE);
++		gtk_switch_set_active (button, FALSE);
++		gtk_widget_set_sensitive (WID ("button_delete"), FALSE);
++		set_notebook_page (self, NOTEBOOK_PAGE_EMPTY);
++	} else {
++		BluetoothType type;
++		gboolean connected;
++		GValue value = { 0 };
++
++		if (self->priv->debug)
++			bluetooth_chooser_dump_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
++
++		gtk_widget_set_sensitive (WID ("properties_vbox"), TRUE);
++
++		if (is_connecting (self, bdaddr)) {
++			gtk_switch_set_active (button, TRUE);
++			set_connecting_page (self, CONNECTING_NOTEBOOK_PAGE_SPINNER);
++		} else {
++			connected = bluetooth_chooser_get_selected_device_is_connected (BLUETOOTH_CHOOSER (self->priv->chooser));
++			gtk_switch_set_active (button, connected);
++			set_connecting_page (self, CONNECTING_NOTEBOOK_PAGE_SWITCH);
++		}
++
++		/* Paired */
++		bluetooth_chooser_get_selected_device_info (BLUETOOTH_CHOOSER (self->priv->chooser),
++							    "paired", &value);
++		gtk_label_set_text (GTK_LABEL (WID ("paired_label")),
++				    g_value_get_boolean (&value) ? _("Yes") : _("No"));
++		g_value_unset (&value);
++
++		/* UUIDs */
++		if (bluetooth_chooser_get_selected_device_info (BLUETOOTH_CHOOSER (self->priv->chooser),
++								"uuids", &value)) {
++			const char **uuids;
++			guint i;
++
++			uuids = (const char **) g_value_get_boxed (&value);
++
++			gtk_widget_set_sensitive (GTK_WIDGET(button),
++						  bluetooth_client_get_connectable (uuids));
++
++			for (i = 0; uuids && uuids[i] != NULL; i++) {
++				if (g_str_equal (uuids[i], "OBEXObjectPush")) {
++					gtk_widget_show (WID ("send_box"));
++					break;
++				}
++
++			}
++
++			g_value_unset (&value);
++		}
++
++		/* Type */
++		type = bluetooth_chooser_get_selected_device_type (BLUETOOTH_CHOOSER (self->priv->chooser));
++		gtk_label_set_text (GTK_LABEL (WID ("type_label")), bluetooth_type_to_string (type));
++		switch (type) {
++		case BLUETOOTH_TYPE_KEYBOARD:
++			gtk_widget_show (WID ("keyboard_box"));
++			break;
++		case BLUETOOTH_TYPE_MOUSE:
++		case BLUETOOTH_TYPE_TABLET:
++			gtk_widget_show (WID ("mouse_box"));
++			break;
++		case BLUETOOTH_TYPE_HEADSET:
++		case BLUETOOTH_TYPE_HEADPHONES:
++		case BLUETOOTH_TYPE_OTHER_AUDIO:
++			gtk_widget_show (WID ("sound_box"));
++		default:
++			/* others? */
++			;
++		}
++
++		gtk_label_set_text (GTK_LABEL (WID ("address_label")), bdaddr);
++
++		gtk_widget_set_sensitive (WID ("button_delete"), TRUE);
++		set_notebook_page (self, NOTEBOOK_PAGE_PROPS);
++	}
++
++	g_free (self->priv->selected_bdaddr);
++	self->priv->selected_bdaddr = bdaddr;
++
++	g_signal_handlers_unblock_by_func (button, switch_connected_active_changed, self);
++}
++
+ static void
+ power_callback (GObject          *object,
+ 		GParamSpec       *spec,
+@@ -118,117 +381,375 @@
+ 
+ 	state = gtk_switch_get_active (GTK_SWITCH (WID ("switch_bluetooth")));
+ 	g_debug ("Power switched to %s", state ? "on" : "off");
+-	g_dbus_proxy_call (self->priv->properties,
+-			   "Set",
+-			   g_variant_new_parsed ("('org.gnome.SettingsDaemon.Rfkill', 'BluetoothAirplaneMode', %v)",
+-						 g_variant_new_boolean (!state)),
+-			   G_DBUS_CALL_FLAGS_NONE,
+-			   -1,
+-			   self->priv->cancellable,
+-			   NULL, NULL);
++	bluetooth_killswitch_set_state (self->priv->killswitch,
++					state ? BLUETOOTH_KILLSWITCH_STATE_UNBLOCKED : BLUETOOTH_KILLSWITCH_STATE_SOFT_BLOCKED);
+ }
+ 
+ static void
+-cc_bluetooth_panel_update_power (CcBluetoothPanel *self)
++cc_bluetooth_panel_update_treeview_message (CcBluetoothPanel *self,
++					    const char       *message)
+ {
+-	GObject *toggle;
+-	gboolean sensitive, powered;
+-	const char *page;
++	if (message != NULL) {
++		gtk_widget_hide (self->priv->chooser);
++		gtk_widget_show (WID ("message_scrolledwindow"));
+ 
+-	g_debug ("Updating airplane mode: has_airplane_mode %d, hardware_airplane_mode %d, airplane_mode %d",
+-		 self->priv->has_airplane_mode, self->priv->hardware_airplane_mode, self->priv->airplane_mode);
++		gtk_label_set_text (GTK_LABEL (WID ("message_label")),
++				    message);
++	} else {
++		gtk_widget_hide (WID ("message_scrolledwindow"));
++		gtk_widget_show (self->priv->chooser);
++	}
++}
+ 
+-	if (self->priv->has_airplane_mode == FALSE) {
+-		g_debug ("No Bluetooth available");
+-		sensitive = FALSE;
+-		powered = FALSE;
+-		page = BLUETOOTH_NO_DEVICES_PAGE;
+-	} else if (self->priv->hardware_airplane_mode) {
+-		g_debug ("Bluetooth is Hard blocked");
+-		sensitive = FALSE;
+-		powered = FALSE;
+-		page = BLUETOOTH_HW_DISABLED_PAGE;
+-	} else if (self->priv->airplane_mode) {
++static void
++cc_bluetooth_panel_update_power (CcBluetoothPanel *self)
++{
++	BluetoothKillswitchState state;
++	char *path;
++	gboolean powered, sensitive;
++
++	g_object_get (G_OBJECT (self->priv->client),
++		      "default-adapter", &path,
++		      "default-adapter-powered", &powered,
++		      NULL);
++	state = bluetooth_killswitch_get_state (self->priv->killswitch);
++
++	g_debug ("Updating power, default adapter: %s (powered: %s), killswitch: %s",
++		 path ? path : "(none)",
++		 powered ? "on" : "off",
++		 bluetooth_killswitch_state_to_string (state));
++
++	if (path == NULL &&
++	    bluetooth_killswitch_has_killswitches (self->priv->killswitch) &&
++	    state != BLUETOOTH_KILLSWITCH_STATE_HARD_BLOCKED) {
+ 		g_debug ("Default adapter is unpowered, but should be available");
+ 		sensitive = TRUE;
+-		powered = FALSE;
+-		page = BLUETOOTH_DISABLED_PAGE;
++		cc_bluetooth_panel_update_treeview_message (self, _("Bluetooth is disabled"));
++	} else if (path == NULL &&
++		   state == BLUETOOTH_KILLSWITCH_STATE_HARD_BLOCKED) {
++		g_debug ("Bluetooth is Hard blocked");
++		sensitive = FALSE;
++		cc_bluetooth_panel_update_treeview_message (self, _("Bluetooth is disabled by hardware switch"));
++	} else if (path == NULL) {
++		sensitive = FALSE;
++		g_debug ("No Bluetooth available");
++		cc_bluetooth_panel_update_treeview_message (self, _("No Bluetooth adapters found"));
+ 	} else {
+-		g_debug ("Bluetooth is available and powered");
+ 		sensitive = TRUE;
+-		powered = TRUE;
+-		page = BLUETOOTH_WORKING_PAGE;
++		g_debug ("Bluetooth is available and powered");
++		cc_bluetooth_panel_update_treeview_message (self, NULL);
+ 	}
+ 
++	g_free (path);
+ 	gtk_widget_set_sensitive (WID ("box_power") , sensitive);
++	gtk_widget_set_sensitive (WID ("box_vis") , sensitive);
++}
+ 
+-	toggle = G_OBJECT (WID ("switch_bluetooth"));
+-	g_signal_handlers_block_by_func (toggle, power_callback, self);
+-	gtk_switch_set_active (GTK_SWITCH (toggle), powered);
+-	g_signal_handlers_unblock_by_func (toggle, power_callback, self);
++static void
++switch_panel (CcBluetoothPanel *self,
++	      const char       *panel)
++{
++  CcShell *shell;
++  GError *error = NULL;
++
++  shell = cc_panel_get_shell (CC_PANEL (self));
++  if (cc_shell_set_active_panel_from_id (shell, panel, NULL, &error) == FALSE)
++    {
++      g_warning ("Failed to activate '%s' panel: %s", panel, error->message);
++      g_error_free (error);
++    }
++}
++
++static gboolean
++keyboard_callback (GtkButton        *button,
++		   CcBluetoothPanel *self)
++{
++	switch_panel (self, KEYBOARD_PREFS);
++	return TRUE;
++}
++
++static gboolean
++mouse_callback (GtkButton        *button,
++		CcBluetoothPanel *self)
++{
++	switch_panel (self, MOUSE_PREFS);
++	return TRUE;
++}
+ 
+-	gtk_stack_set_visible_child_name (GTK_STACK (self->priv->stack), page);
++static gboolean
++sound_callback (GtkButton        *button,
++		CcBluetoothPanel *self)
++{
++	switch_panel (self, SOUND_PREFS);
++	return TRUE;
+ }
+ 
+ static void
+-airplane_mode_changed (GDBusProxy       *proxy,
+-		       GVariant         *changed_properties,
+-		       GStrv             invalidated_properties,
+-		       CcBluetoothPanel *self)
++send_callback (GtkButton        *button,
++	       CcBluetoothPanel *self)
+ {
+-	GVariant *v;
++	char *bdaddr, *alias;
++
++	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
++	alias = bluetooth_chooser_get_selected_device_name (BLUETOOTH_CHOOSER (self->priv->chooser));
+ 
+-	v = g_dbus_proxy_get_cached_property (self->priv->rfkill, "BluetoothAirplaneMode");
+-	self->priv->airplane_mode = g_variant_get_boolean (v);
+-	g_variant_unref (v);
++	bluetooth_send_to_address (bdaddr, alias);
+ 
+-	v = g_dbus_proxy_get_cached_property (self->priv->rfkill, "BluetoothHardwareAirplaneMode");
+-	self->priv->hardware_airplane_mode = g_variant_get_boolean (v);
+-	g_variant_unref (v);
++	g_free (bdaddr);
++	g_free (alias);
++}
+ 
+-	v = g_dbus_proxy_get_cached_property (self->priv->rfkill, "BluetoothHasAirplaneMode");
+-	self->priv->has_airplane_mode = g_variant_get_boolean (v);
+-	g_variant_unref (v);
++/* Visibility/Discoverable */
++static void discoverable_changed (BluetoothClient  *client,
++				  GParamSpec       *spec,
++				  CcBluetoothPanel *self);
+ 
+-	cc_bluetooth_panel_update_power (self);
++static void
++switch_discoverable_active_changed (GtkSwitch        *button,
++				    GParamSpec       *spec,
++				    CcBluetoothPanel *self)
++{
++	g_signal_handlers_block_by_func (self->priv->client, discoverable_changed, self);
++	g_object_set (G_OBJECT (self->priv->client), "default-adapter-discoverable",
++		      gtk_switch_get_active (button), NULL);
++	g_signal_handlers_unblock_by_func (self->priv->client, discoverable_changed, self);
+ }
+ 
+ static void
+-add_stack_page (CcBluetoothPanel *self,
+-		const char       *message,
+-		const char       *name)
++cc_bluetooth_panel_update_visibility (CcBluetoothPanel *self)
+ {
+-	GtkWidget *label;
++	gboolean discoverable;
++	GtkSwitch *button;
++	char *name;
++
++	button = GTK_SWITCH (WID ("switch_discoverable"));
++	g_object_get (G_OBJECT (self->priv->client), "default-adapter-discoverable", &discoverable, NULL);
++	g_signal_handlers_block_by_func (button, switch_discoverable_active_changed, self);
++	gtk_switch_set_active (button, discoverable);
++	g_signal_handlers_unblock_by_func (button, switch_discoverable_active_changed, self);
++
++	g_object_get (G_OBJECT (self->priv->client), "default-adapter-name", &name, NULL);
++	if (name == NULL) {
++		gtk_widget_set_sensitive (WID ("switch_discoverable"), FALSE);
++		gtk_widget_set_sensitive (WID ("visible_label"), FALSE);
++		gtk_label_set_text (GTK_LABEL (WID ("visible_label")), _("Visibility"));
++	} else {
++		char *label;
++
++		label = g_strdup_printf (_("Visibility of “%s”"), name);
++		g_free (name);
++		gtk_label_set_text (GTK_LABEL (WID ("visible_label")), label);
++		g_free (label);
+ 
+-	label = gtk_label_new (message);
+-	gtk_stack_add_named (GTK_STACK (self->priv->stack), label, name);
+-	gtk_widget_show (label);
++		gtk_widget_set_sensitive (WID ("switch_discoverable"), TRUE);
++		gtk_widget_set_sensitive (WID ("visible_label"), TRUE);
++	}
+ }
+ 
+ static void
+-panel_changed (GtkWidget        *settings_widget,
+-	       const char       *panel,
+-	       CcBluetoothPanel *self)
++discoverable_changed (BluetoothClient  *client,
++		      GParamSpec       *spec,
++		      CcBluetoothPanel *self)
+ {
+-	CcShell *shell;
++	cc_bluetooth_panel_update_visibility (self);
++}