Merge lp:~darkxst/gnome-control-center/vanilla3.8 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Tim Lunn]

[lp:~darkxst/gnome-control-center/vanilla3.8]

634. By Tim Lunn on 2014-02-12

remove remaining ubuntu-isms

635. By Tim Lunn on 2014-05-06

Rebase on current gnome-control-center in utopic

636. By Tim Lunn on 2014-05-06

remaining minor fixes from merge

637. By Tim Lunn on 2014-05-06

clean up changelog

638. By Tim Lunn on 2014-05-06

Merge logo changes
* debian/patches/ubuntu-gnome-version.patch: Merge build-time versioned
  logo from unity-control-center (LP: #1299912)
* debian/rules: generate logo
* debian/control.in: build-depend on ubuntu font and valac, also add
  build-dep on libkrb5-dev to fix FTBS on utopic

639. By Tim Lunn on 2014-05-06

rebase patch

640. By Tim Lunn on 2014-05-06

debian/control.in: Add build-depends on libnm-glib-vpn-dev (>= 0.9.8),
libmm-glib-dev and libsmbclient-dev, remove a few duplicated build-deps

641. By Tim Lunn on 2014-05-06

missing comma

642. By Tim Lunn on 2014-05-06

Add bug ref (LP: #1316383)

643. By Tim Lunn on 2014-05-06

* debian/patches/56_use_ubuntu_info_branding.patch:
  - Keep using this branding patch for now

644. By Tim Lunn on 2014-05-06

missing patch

645. By Tim Lunn on 2014-05-06

fix up branding to use gresources

=== removed file 'debian/UbuntuLogo.png'
Binary files debian/UbuntuLogo.png	2013-06-17 13:33:37 +0000 and debian/UbuntuLogo.png	1970-01-01 00:00:00 +0000 differ
=== added file 'debian/UbuntuLogoBlank.png'
Binary files debian/UbuntuLogoBlank.png	1970-01-01 00:00:00 +0000 and debian/UbuntuLogoBlank.png	2014-05-06 09:05:46 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-10 15:24:53 +0000
+++ debian/changelog	2014-05-06 09:05:46 +0000
@@ -1,3 +1,57 @@
+gnome-control-center (1:3.8.6-0ubuntu1~utopic2) utopic; urgency=medium
+
+  [ Robert Ancell ]
+  * New upstream release (LP: #1316383)
+  * Drop all Unity customizations
+  * debian/control:
+    - Build-depend on valac, libgirepository1.0-dev
+    - Use standards-version 3.9.4
+  * debian/gnome-control-center.sh:
+  * debian/patches/02_new_goa.patch:
+    - Build against newer libgoa
+  * debian/patches/git_iconview_columns.patch:
+    - Set the number of columns, that seems needed with new GTK versions
+
+  [ Tim Lunn ]
+  * debian/control.in: Add build-depends on libnm-glib-vpn-dev (>= 0.9.8),
+    libmm-glib-dev and libsmbclient-dev, remove a few duplicated build-deps
+  * debian/patches: drop all Ubuntu specific patches
+  * debian/patches/52_region_language.patch:
+    - Adapt region panel to use Ubuntu style regions and UTF-8
+  * debian/patches/56_use_ubuntu_info_branding.patch: 
+    - Keep using this branding patch for now
+  * debian/patches/64_restore_terminal_keyboard_shortcut.patch:
+    - Bring back terminal shortcut
+  * debian/patches/92_ubuntu_system_proxy.patch:
+    - Add system proxy support 
+  * debian/patches/99_add_lock-on-suspend.patch:
+    - Add option to lock on suspend
+  * debian/patches/git_rename_natural_scrolling.patch:
+    - change potentially offensive string
+  * debian/patches/git-background-*.patch:
+    - Allow setting a different background for the GNOME Shell lock
+      screen (LP: #1219188)
+  * debian/patches/revert_git_dont_hide_zoom.patch:
+    - Bring back zoom settings 
+  * debian/patches/ubuntu-external-panels.patch:
+    - Reimplement support for external panels
+  * debian/libgnome-control-center1.symbols: 
+    - Add new symbols from external panel patch
+  * debian/patches/git_keyboard_grp_xkb_option.patch:
+    - Dropped, included in new version
+
+ -- Robert Ancell <[e-mail]>  Wed, 04 Dec 2013 11:03:26 +1300
+
+gnome-control-center (1:3.6.3-0ubuntu57) utopic; urgency=medium
+
+  * debian/patches/ubuntu-gnome-version.patch: Merge build-time versioned
+    logo from unity-control-center (LP: #1299912)
+  * debian/rules: generate logo
+  * debian/control.in: build-depend on ubuntu font and valac, also add
+    build-dep on libkrb5-dev to fix FTBS on utopic 
+
+ -- Tim Lunn <[e-mail]>  Mon, 05 May 2014 08:37:17 +1000
+
 gnome-control-center (1:3.6.3-0ubuntu56) trusty; urgency=medium
 
   * debian/patches/git_keyboard_grp_xkb_option.patch:
@@ -68,7 +122,6 @@
 
  -- Iain Lane <[e-mail]>  Fri, 06 Dec 2013 12:43:49 +0000
 
-
 gnome-control-center (1:3.6.3-0ubuntu48) trusty; urgency=low
 
   * debian/patches/git_iconview_columns.patch:

=== modified file 'debian/control'
--- debian/control	2013-10-31 00:54:13 +0000
+++ debian/control	2014-05-06 09:05:46 +0000
@@ -7,14 +7,15 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>
-Standards-Version: 3.9.3
+Uploaders: Debian GNOME Maintainers <[e-mail]>
+Standards-Version: 3.9.4
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
                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),
@@ -23,42 +24,50 @@
                intltool (>= 0.37.1),
                libcanberra-gtk3-dev,
                libcheese-gtk-dev (>= 2.91.91.1),
-               libcolord-dev,
+               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.31.2),
+               libglib2.0-dev (>= 2.35.1),
                libgnome-bluetooth-dev (>= 3.3.4),
-               libgnome-desktop-3-dev (>= 3.5.91),
+               libgnome-desktop-3-dev (>= 3.7.5),
                libgnome-menu-3-dev,
                libgnomekbd-dev,
-               libgoa-1.0-dev (>= 3.5.90),
+               libgoa-1.0-dev (>= 3.10.0),
+               libaccountsservice-dev (>= 0.6.30),
                libgstreamer-plugins-base0.10-dev,
-               libgtk-3-dev (>= 3.5.13),
+               libgtk-3-dev (>= 3.7.7),
                libgtop2-dev,
                libibus-1.0-dev (>= 1.5.0),
-               libnm-glib-dev (>= 0.9) [linux-any],
-               libnm-gtk-dev (>= 0.9) [linux-any],
-               libnm-util-dev (>= 0.9) [linux-any],
+               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-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),
                libpwquality-dev,
+               libsmbclient-dev,
 #               libsocialweb-client-dev,
                libupower-glib-dev (>= 0.9.1),
                libsystemd-login-dev,
-               libwacom-dev (>= 0.6),
+               libwacom-dev (>= 0.7),
                libx11-dev,
                libxft-dev (>= 2.1.2),
                libxkbfile-dev,
                libxklavier-dev (>= 5.1),
                libxml2-dev,
                locales,
-               network-manager-dev (>= 0.9) [linux-any],
+               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
 
 Package: gnome-control-center
@@ -86,7 +95,8 @@
             mousetweaks,
             policykit-1-gnome,
             libcanberra-pulse,
-            system-config-printer-gnome
+            system-config-printer-gnome,
+            gnome-control-center-shared-data
 Replaces: gnome-bluetooth (<< 3.4.0)
 Breaks: gnome-power-manager (<< 3.0),
         gnome-session (<< 3.0),
@@ -137,6 +147,16 @@
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
+Package: gnome-control-center-shared-data
+Architecture: all
+Section: gnome
+Depends: ${misc:Depends}
+Replaces: gnome-control-center-data (<< 1:3.6.3-0ubuntu54)
+Conflicts: gnome-control-center-data (<< 1:3.6.3-0ubuntu54)
+Description: configuration applets for GNOME - shared data
+ This package contains datas that are used by gnome-control-center and the
+ new unity-control-center
+
 Package: libgnome-control-center-dev
 Architecture: any
 Section: libdevel

=== modified file 'debian/control.in'
--- debian/control.in	2014-03-21 11:25:33 +0000
+++ debian/control.in	2014-05-06 09:05:46 +0000
@@ -4,13 +4,14 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
                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),
@@ -19,42 +20,50 @@
                intltool (>= 0.37.1),
                libcanberra-gtk3-dev,
                libcheese-gtk-dev (>= 2.91.91.1),
-               libcolord-dev,
+               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.31.2),
+               libglib2.0-dev (>= 2.35.1),
                libgnome-bluetooth-dev (>= 3.3.4),
-               libgnome-desktop-3-dev (>= 3.5.91),
+               libgnome-desktop-3-dev (>= 3.7.5),
                libgnome-menu-3-dev,
                libgnomekbd-dev,
-               libgoa-1.0-dev (>= 3.5.90),
+               libgoa-1.0-dev (>= 3.10.0),
+               libaccountsservice-dev (>= 0.6.30),
                libgstreamer-plugins-base0.10-dev,
-               libgtk-3-dev (>= 3.5.13),
+               libgtk-3-dev (>= 3.7.7),
                libgtop2-dev,
                libibus-1.0-dev (>= 1.5.0),
-               libnm-glib-dev (>= 0.9) [linux-any],
-               libnm-gtk-dev (>= 0.9) [linux-any],
-               libnm-util-dev (>= 0.9) [linux-any],
+               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-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),
                libpwquality-dev,
+               libsmbclient-dev,
 #               libsocialweb-client-dev,
                libupower-glib-dev (>= 0.9.1),
                libsystemd-login-dev,
-               libwacom-dev (>= 0.6),
+               libwacom-dev (>= 0.7),
                libx11-dev,
                libxft-dev (>= 2.1.2),
                libxkbfile-dev,
                libxklavier-dev (>= 5.1),
                libxml2-dev,
                locales,
-               network-manager-dev (>= 0.9) [linux-any],
+               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
 
 Package: gnome-control-center

=== modified file 'debian/gnome-control-center-data.install'
--- debian/gnome-control-center-data.install	2014-03-21 11:25:33 +0000
+++ debian/gnome-control-center-data.install	2014-05-06 09:05:46 +0000
@@ -1,12 +1,7 @@
-etc/xdg/autostart
-etc/xdg/menus
-debian/searchingthedashlegalnotice.html /usr/share/gnome-control-center
 usr/share/gnome-control-center
 usr/share/sounds
-usr/share/desktop-directories
 usr/share/locale
 usr/share/icons
 usr/share/polkit-1
 #debian/gnome-control-center.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
 debian/source_gnome-control-center.py /usr/share/apport/package-hooks
-debian/UbuntuLogo.png /usr/share/gnome-control-center/ui

=== modified file 'debian/gnome-control-center.install'
--- debian/gnome-control-center.install	2013-07-08 17:05:39 +0000
+++ debian/gnome-control-center.install	2014-05-06 09:05:46 +0000
@@ -1,4 +1,3 @@
-usr/bin
-usr/lib/*/control-center-1/panels/*.so
+usr/bin/gnome-control-center
 usr/share/applications
 usr/share/man

=== modified file 'debian/libgnome-control-center1.symbols'
--- debian/libgnome-control-center1.symbols	2014-02-26 18:20:56 +0000
+++ debian/libgnome-control-center1.symbols	2014-05-06 09:05:46 +0000
@@ -1,17 +1,23 @@
 libgnome-control-center.so.1 libgnome-control-center1 #MINVER#
 * Build-Depends-Package: libgnome-control-center-dev
  cc_editable_entry_get_editable@Base 1:3.1.3
+ cc_editable_entry_get_ellipsize@Base 1:3.8.6
+ cc_editable_entry_get_max_width_chars@Base 1:3.8.6
  cc_editable_entry_get_scale@Base 1:3.1.3
  cc_editable_entry_get_selectable@Base 1:3.1.4
  cc_editable_entry_get_text@Base 1:3.1.3
  cc_editable_entry_get_type@Base 1:3.1.3
  cc_editable_entry_get_weight@Base 1:3.1.3
+ cc_editable_entry_get_width_chars@Base 1:3.8.6
  cc_editable_entry_new@Base 1:3.1.3
  cc_editable_entry_set_editable@Base 1:3.1.3
+ cc_editable_entry_set_ellipsize@Base 1:3.8.6
+ cc_editable_entry_set_max_width_chars@Base 1:3.8.6
  cc_editable_entry_set_scale@Base 1:3.1.3
  cc_editable_entry_set_selectable@Base 1:3.1.4
  cc_editable_entry_set_text@Base 1:3.1.3
  cc_editable_entry_set_weight@Base 1:3.1.3
+ cc_editable_entry_set_width_chars@Base 1:3.8.6
  cc_panel_get_help_uri@Base 1:3.5.2
  cc_panel_get_permission@Base 1:3.1.3
  cc_panel_get_shell@Base 1:2.91.2

=== removed file 'debian/patches/0001-online-accounts-use-the-async-function-to-get-all-th.patch'
--- debian/patches/0001-online-accounts-use-the-async-function-to-get-all-th.patch	2013-12-06 14:51:08 +0000
+++ debian/patches/0001-online-accounts-use-the-async-function-to-get-all-th.patch	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-From 82e6777cb1a32edb9c85b85c0c3768f9ca62c4c2 Mon Sep 17 00:00:00 2001
-From: Marco Barisione <[e-mail]>
-Date: Wed, 21 Aug 2013 11:48:25 +0100
-Subject: [PATCH] online-accounts: use the async function to get all the
- providers
-
-https://bugzilla.gnome.org/show_bug.cgi?id=706148
----
- panels/online-accounts/cc-online-accounts-panel.c | 49 ++++++++++++++++++-----
- 1 file changed, 40 insertions(+), 9 deletions(-)
-
-Index: b/panels/online-accounts/cc-online-accounts-panel.c
-===================================================================
---- a/panels/online-accounts/cc-online-accounts-panel.c
-+++ b/panels/online-accounts/cc-online-accounts-panel.c
-@@ -596,9 +596,17 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+typedef struct
-+{
-+  GoaPanel *panel;
-+} AddAccountData;
-+
- static void
--add_account (GoaPanel *panel)
-+get_all_providers_cb (GObject      *source,
-+                      GAsyncResult *res,
-+                      gpointer      user_data)
- {
-+  AddAccountData *data = user_data;
-   GtkWindow *parent;
-   GtkWidget *dialog;
-   gint response;
-@@ -609,12 +617,15 @@
- 
-   providers = NULL;
- 
--  parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel))));
-+  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 (data->panel))));
- 
--  dialog = goa_panel_add_account_dialog_new (panel->client);
-+  dialog = goa_panel_add_account_dialog_new (data->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;
-@@ -643,11 +654,11 @@
-     {
-       GtkTreeIter iter;
-       /* navigate to newly created object */
--      if (goa_panel_accounts_model_get_iter_for_object (panel->accounts_model,
-+      if (goa_panel_accounts_model_get_iter_for_object (data->panel->accounts_model,
-                                                         object,
-                                                         &iter))
-         {
--          gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (panel->accounts_treeview)),
-+          gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (data->panel->accounts_treeview)),
-                                           &iter);
-         }
-       g_object_unref (object);
-@@ -675,6 +686,18 @@
-  out:
-   g_list_foreach (providers, (GFunc) g_object_unref, NULL);
-   g_list_free (providers);
-+  g_clear_object (&data->panel);
-+  g_slice_free (AddAccountData, data);
-+}
-+
-+static void
-+add_account (GoaPanel *panel)
-+{
-+  AddAccountData *data;
-+
-+  data = g_slice_new0 (AddAccountData);
-+  data->panel = g_object_ref_sink (panel);
-+  goa_provider_get_all (get_all_providers_cb, data);
- }
- 
- /* ---------------------------------------------------------------------------------------------------- */

=== removed file 'debian/patches/0001-rfkill-glib-Don-t-use-g_assert_not_reached-in-type_t.patch'
--- debian/patches/0001-rfkill-glib-Don-t-use-g_assert_not_reached-in-type_t.patch	2013-10-23 17:02:34 +0000
+++ debian/patches/0001-rfkill-glib-Don-t-use-g_assert_not_reached-in-type_t.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-From 90f49a4d5dd646b8fce10f61a9231db4973a907b Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <[e-mail]>
-Date: Thu, 16 May 2013 15:41:17 +0200
-Subject: [PATCH] rfkill-glib: Don't use g_assert_not_reached in type_to_string
-
-New kernel versions can add new RFKILL types, we should now crash here,
-just say that we don't know what the switch is.
----
- panels/network/rfkill-glib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/network/rfkill-glib.c b/panels/network/rfkill-glib.c
-index e27ca40..7c9ee3c 100644
---- a/panels/network/rfkill-glib.c
-+++ b/panels/network/rfkill-glib.c
-@@ -80,7 +80,7 @@ type_to_string (unsigned int type)
- 	case RFKILL_TYPE_WWAN:
- 		return "WWAN";
- 	default:
--		g_assert_not_reached ();
-+		return "UNKNOWN";
- 	}
- }
- 
--- 
-1.8.3.2
-

=== added file 'debian/patches/02_new_goa.patch'
--- debian/patches/02_new_goa.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_new_goa.patch	2014-05-06 09:05:46 +0000
@@ -0,0 +1,46 @@
+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

=== removed file 'debian/patches/05_run_update_manager.patch'
--- debian/patches/05_run_update_manager.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/05_run_update_manager.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: b/panels/info/cc-info-panel.c
-===================================================================
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -1900,7 +1900,7 @@
- {
-   GError *error;
-   error = NULL;
--  g_spawn_command_line_async ("gpk-update-viewer", &error);
-+  g_spawn_command_line_async ("update-manager", &error);
-   if (error != NULL)
-     {
-       g_warning ("unable to launch Software Updates: %s", error->message);

=== removed file 'debian/patches/06_handle_passwd_with_ldap.patch'
--- debian/patches/06_handle_passwd_with_ldap.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/06_handle_passwd_with_ldap.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-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: b/panels/user-accounts/run-passwd.c
-===================================================================
---- a/panels/user-accounts/run-passwd.c
-+++ b/panels/user-accounts/run-passwd.c
-@@ -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;

=== removed file 'debian/patches/11_power-configure_lid_action.patch'
--- debian/patches/11_power-configure_lid_action.patch	2013-09-09 14:28:59 +0000
+++ debian/patches/11_power-configure_lid_action.patch	1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-Subject: [PATCH] power: Add configuration for lid action
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=659045
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/792636
---- a/panels/power/cc-power-panel.c
-+++ b/panels/power/cc-power-panel.c
-@@ -932,6 +932,7 @@
- set_ac_battery_ui_mode (CcPowerPanel *self)
- {
-   gboolean has_batteries = FALSE;
-+  gboolean has_lid = FALSE;
-   gboolean ret;
-   GError *error = NULL;
-   GPtrArray *devices;
-@@ -964,7 +965,13 @@
-         }
-     }
-   g_ptr_array_unref (devices);
-+
-+  has_lid = up_client_get_lid_is_present (self->priv->up_client);
-+
- out:
-+  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
-+  gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
-+  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);
-   gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
-@@ -1080,6 +1087,26 @@
-                     G_CALLBACK (activate_link_cb),
-                     self);
- 
-+  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
-+  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-+                                               "combobox_lid_ac"));
-+  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
-+  set_value_for_combo (GTK_COMBO_BOX (widget), value);
-+  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
-+  g_signal_connect (widget, "changed",
-+                    G_CALLBACK (combo_enum_changed_cb),
-+                    self);
-+
-+  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
-+  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-+                                               "combobox_lid_battery"));
-+  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
-+  set_value_for_combo (GTK_COMBO_BOX (widget), value);
-+  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
-+  g_signal_connect (widget, "changed",
-+                    G_CALLBACK (combo_enum_changed_cb),
-+                    self);
-+
-   widget = WID (self->priv->builder, "vbox_power");
-   gtk_widget_reparent (widget, (GtkWidget *) self);
- }
---- a/panels/power/power.ui
-+++ b/panels/power/power.ui
-@@ -53,6 +53,28 @@
-       </row>
-     </data>
-   </object>
-+  <object class="GtkListStore" id="liststore_lid">
-+    <columns>
-+      <!-- column-name name -->
-+      <column type="gchararray"/>
-+      <!-- column-name value -->
-+      <column type="gint"/>
-+      <!-- column-name sensitive -->
-+      <column type="gboolean"/>
-+    </columns>
-+    <data>
-+      <row>
-+        <col id="0" translatable="yes">Suspend</col>
-+        <col id="1">1</col>
-+        <col id="2">True</col>
-+      </row>
-+      <row>
-+        <col id="0" translatable="yes">Do nothing</col>
-+        <col id="1">5</col>
-+        <col id="2">True</col>
-+      </row>
-+    </data>
-+  </object>
-   <object class="GtkWindow" id="window_power">
-     <property name="can_focus">False</property>
-     <property name="resizable">False</property>
-@@ -172,6 +194,50 @@
-                 <property name="top_attach">2</property>
-               </packing>
-             </child>
-+            <child>
-+              <object class="GtkLabel" id="label_lid_action">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="halign">end</property>
-+                <property name="label" translatable="yes">When the lid is closed</property>
-+              </object>
-+              <packing>
-+                <property name="left_attach">0</property>
-+                <property name="top_attach">3</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkComboBox" id="combobox_lid_battery">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="model">liststore_lid</property>
-+                <property name="hexpand">True</property>
-+                <accessibility>
-+                  <relation type="labelled-by" target="label_header_battery"/>
-+                  <relation type="labelled-by" target="label_lid_action"/>
-+                </accessibility>
-+              </object>
-+              <packing>
-+                <property name="left_attach">1</property>
-+                <property name="top_attach">3</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkComboBox" id="combobox_lid_ac">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="model">liststore_lid</property>
-+                <property name="hexpand">True</property>
-+                <accessibility>
-+                  <relation type="labelled-by" target="label_header_ac"/>
-+                  <relation type="labelled-by" target="label_lid_action"/>
-+                </accessibility>
-+              </object>
-+              <packing>
-+                <property name="left_attach">2</property>
-+                <property name="top_attach">3</property>
-+              </packing>
-+            </child>
-           </object>
-           <packing>
-             <property name="expand">False</property>
-@@ -352,9 +418,12 @@
-   </object>
-   <object class="GtkSizeGroup" id="sizegroup_combos">
-     <widgets>
-+      <widget name="combobox_lid_battery"/>
-+      <widget name="combobox_lid_ac"/>
-       <widget name="combobox_critical"/>
-       <widget name="combobox_sleep_battery"/>
-       <widget name="combobox_sleep_ac"/>
-+      <widget name="combobox_sleep_ac"/>
-     </widgets>
-   </object>
- </interface>

=== removed file 'debian/patches/12_add_never_turn_screen_off.patch'
--- debian/patches/12_add_never_turn_screen_off.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/12_add_never_turn_screen_off.patch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-Index: b/panels/screen/cc-screen-panel.c
-===================================================================
---- a/panels/screen/cc-screen-panel.c
-+++ b/panels/screen/cc-screen-panel.c
-@@ -402,8 +402,7 @@
-       gtk_tree_model_get (model, &iter,
-                           1, &value_tmp,
-                           -1);
--      if (value == value_tmp ||
--          (value_tmp > value_prev && value < value_tmp))
-+      if (value == value_tmp)
-         {
-           gtk_combo_box_set_active_iter (combo_box, &iter);
-           return;
-Index: b/panels/screen/screen.ui
-===================================================================
---- a/panels/screen/screen.ui
-+++ b/panels/screen/screen.ui
-@@ -84,6 +84,10 @@
-         <col id="0" translatable="yes">1 hour</col>
-         <col id="1">3600</col>
-       </row>
-+      <row>
-+	<col id="0" translatable="yes">Never</col>
-+	<col id="1">0</col>
-+      </row>
-     </data>
-   </object>
-   <object class="GtkWindow" id="window1">

=== removed file 'debian/patches/51_unity_options_in_display_panel.patch'
--- debian/patches/51_unity_options_in_display_panel.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/51_unity_options_in_display_panel.patch	1970-01-01 00:00:00 +0000
@@ -1,592 +0,0 @@
-Index: gnome-control-center-3.4.2/panels/display/cc-display-panel.c
-===================================================================
---- gnome-control-center-3.4.2.orig/panels/display/cc-display-panel.c	2012-05-15 12:18:30.000000000 +0200
-+++ gnome-control-center-3.4.2/panels/display/cc-display-panel.c	2012-07-23 10:26:57.281976435 +0200
-@@ -54,6 +54,13 @@
- #define MINIMUM_WIDTH 675
- #define MINIMUM_HEIGHT 530
- 
-+#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
-+#define UNITY_GSETTINGS_PATH "/org/compiz/profiles/unity/plugins/unityshell/"
-+#define UNITY_LAUNCHER_ALL_MONITORS_KEY "num-launchers"
-+#define UNITY_STICKY_EDGE_KEY "launcher-capture-mouse"
-+#define UNITY2D_GSETTINGS_MAIN "com.canonical.Unity2d"
-+#define UNITY2D_GSETTINGS_LAUNCHER "com.canonical.Unity2d.Launcher"
-+
- enum {
-   TEXT_COL,
-   WIDTH_COL,
-@@ -72,6 +79,9 @@
-   GnomeRROutputInfo         *current_output;
- 
-   GSettings      *clock_settings;
-+  GSettings      *unity_settings;
-+  GSettings      *unity2d_settings_main;
-+  GSettings      *unity2d_settings_launcher;
-   GtkBuilder     *builder;
-   guint           focus_id;
- 
-@@ -119,6 +129,8 @@
- 					      guint                  n_properties,
- 					      GObjectConstructParam *properties);
- static void on_screen_changed (GnomeRRScreen *scr, gpointer data);
-+static void refresh_unity_launcher_placement (CcDisplayPanel *self);
-+static gboolean unity_launcher_on_all_monitors (GSettings *settings);
- 
- static void
- cc_display_panel_get_property (GObject    *object,
-@@ -168,6 +180,13 @@
-   if (self->priv->clock_settings != NULL)
-     g_object_unref (self->priv->clock_settings);
- 
-+  if (self->priv->unity2d_settings_main != NULL)
-+    g_object_unref (self->priv->unity2d_settings_main);
-+  if (self->priv->unity2d_settings_launcher != NULL)
-+    g_object_unref (self->priv->unity2d_settings_launcher);
-+  if (self->priv->unity_settings != NULL)
-+    g_object_unref (self->priv->unity_settings);
-+
-   shell = cc_panel_get_shell (CC_PANEL (self));
-   if (shell != NULL)
-     {
-@@ -223,6 +242,12 @@
- }
- 
- static gboolean
-+is_unity_session (void)
-+{
-+  return (g_strcmp0 (g_getenv("XDG_CURRENT_DESKTOP"), "Unity") == 0);
-+}
-+
-+static gboolean
- should_show_resolution (gint output_width,
-                         gint output_height,
-                         gint width,
-@@ -262,6 +287,9 @@
-      gnome_rr_labeler_show (self->priv->labeler);
- 
-   select_current_output_from_dialog_position (self);
-+
-+  if (is_unity_session ())
-+    refresh_unity_launcher_placement (self);
- }
- 
- static void
-@@ -599,6 +627,10 @@
-   gtk_widget_set_sensitive (self->priv->clone_checkbox, mirror_is_supported);
-   gtk_widget_set_sensitive (self->priv->clone_label, mirror_is_supported);
- 
-+  /* set inactive the launcher placement choice */
-+  gtk_widget_set_sensitive (WID ("launcher_placement_combo"), !mirror_is_active);
-+  gtk_widget_set_sensitive (WID ("stickyedge_switch"), !mirror_is_active);
-+
-   g_signal_handlers_unblock_by_func (self->priv->clone_checkbox, G_CALLBACK (on_clone_changed), self);
- }
- 
-@@ -838,6 +870,7 @@
-   rebuild_on_off_radios (self);
-   rebuild_resolution_combo (self);
-   rebuild_rotation_combo (self);
-+  refresh_unity_launcher_placement (self);
- 
-   self->priv->ignore_gui_changes = FALSE;
- }
-@@ -1722,6 +1755,10 @@
-   outputs = gnome_rr_config_get_outputs (self->priv->current_configuration);
-   for (i = 0; outputs[i] != NULL; ++i)
-     gnome_rr_output_info_set_primary (outputs[i], outputs[i] == output);
-+
-+  gtk_widget_queue_draw (WID ("self->priv->area"));
-+  /* refresh the combobox */
-+  refresh_unity_launcher_placement (self);
- }
- 
- static void
-@@ -2073,7 +2110,30 @@
-   g_object_unref (layout);
-   cairo_restore (cr);
- 
--  if (gnome_rr_output_info_get_primary (output))
-+  /* Only display a launcher on all or primary monitor */
-+  if (is_unity_session ())
-+    {
-+      if (gnome_rr_output_info_is_active (output) && (unity_launcher_on_all_monitors (self->priv->unity_settings) || gnome_rr_output_info_get_primary (output)))
-+        {
-+          cairo_rectangle (cr, x, y, 10, h * scale + 0.5);
-+          cairo_set_source_rgb (cr, 0, 0, 0);
-+          foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (self->priv->area),
-+                                               cr,
-+                                               (FooScrollAreaEventFunc) on_top_bar_event,
-+                                               self);
-+          cairo_fill (cr);
-+
-+          cairo_set_source_rgb (cr, 0.25, 0.25, 0.25);
-+          cairo_rectangle (cr, x + 1, y + 6, 8, 8);
-+          cairo_rectangle (cr, x + 1, y + 16, 8, 8);
-+          cairo_rectangle (cr, x + 1, y + 26, 8, 8);
-+          cairo_rectangle (cr, x + 1, y + 36, 8, 8);
-+          cairo_rectangle (cr, x + 1, y + h * scale + 0.5 - 10, 8, 8);
-+          cairo_fill (cr);
-+        }
-+    }
-+
-+  if (gnome_rr_output_info_get_primary (output) && !is_unity_session ())
-     {
-       const char *clock_format;
-       char *text;
-@@ -2556,6 +2616,233 @@
- }
- 
- static void
-+stickyedge_widget_refresh (GtkSwitch *switcher, GSettings *settings)
-+{
-+  gboolean stickyedge_enabled = g_settings_get_boolean (settings, UNITY_STICKY_EDGE_KEY);
-+
-+  gtk_switch_set_active (switcher, stickyedge_enabled);
-+}
-+
-+static void
-+ext_stickyedge_changed_callback (GSettings* settings,
-+                                 guint key,
-+                                 gpointer user_data)
-+{
-+  stickyedge_widget_refresh (GTK_SWITCH (user_data), settings);
-+}
-+
-+static void
-+on_stickyedge_changed (GtkSwitch *switcher, GParamSpec *pspec, gpointer user_data)
-+{
-+  CcDisplayPanel *self = CC_DISPLAY_PANEL (user_data);
-+  gboolean enabled = gtk_switch_get_active (GTK_SWITCH (switcher));
-+
-+  /* 3d */
-+  g_settings_set_boolean (self->priv->unity_settings, UNITY_STICKY_EDGE_KEY, enabled);
-+  /* 2d */
-+  if (self->priv->unity2d_settings_main)
-+    g_settings_set_boolean (self->priv->unity2d_settings_main, "sticky-edges", enabled);
-+}
-+
-+static gboolean
-+unity_launcher_on_all_monitors (GSettings *settings)
-+{
-+  gint value = g_settings_get_int (settings, UNITY_LAUNCHER_ALL_MONITORS_KEY);
-+  return (value == 0);
-+}
-+
-+static GdkPixbuf*
-+get_monitor_pixbuf (CcDisplayPanel *self, GnomeRROutputInfo *output)
-+{
-+  GdkRGBA color;
-+  cairo_surface_t *cairo_surface;
-+  cairo_t *cr;
-+  int monitor_width = 30;
-+  int monitor_height = 15;
-+
-+  gnome_rr_labeler_get_rgba_for_output (self->priv->labeler, output, &color);
-+
-+  cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, monitor_width, monitor_height);
-+  cr = cairo_create (cairo_surface);
-+  cairo_surface_destroy (cairo_surface);
-+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-+  cairo_paint (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-+  cairo_set_source_rgb (cr, color.red, color.green, color.blue);
-+  cairo_rectangle (cr, 0.5, 0.5, monitor_width - 1, monitor_height - 1);
-+  cairo_fill (cr);
-+
-+  cairo_set_line_width (cr, 1);
-+  cairo_set_source_rgba (cr, 0, 0, 0, 1.0);
-+  cairo_rectangle (cr, 0.5, 0.5, monitor_width - 1, monitor_height - 1);
-+  cairo_stroke (cr);
-+
-+  return gdk_pixbuf_get_from_surface (cairo_get_target (cr), 0, 0, monitor_width, monitor_height);
-+}
-+
-+static void
-+refresh_unity_launcher_placement (CcDisplayPanel *self)
-+{
-+  GtkWidget *launcher_placement_combo = WID ("launcher_placement_combo");
-+  GtkListStore *liststore;
-+  GtkTreeIter iter;
-+  GList *connected_outputs = NULL;
-+  GList *list;
-+  gboolean launcher_on_all_monitors = unity_launcher_on_all_monitors (self->priv->unity_settings);
-+  gint index_of_primary_screen = 0;
-+  gint i;
-+
-+  liststore = (GtkListStore *) gtk_builder_get_object (self->priv->builder, "available_launcher_placement_store");
-+  gtk_list_store_clear (liststore);
-+
-+  connected_outputs = list_connected_outputs (self, NULL, NULL);
-+  for (list = connected_outputs, i = 0; list != NULL; list = list->next)
-+    {
-+      char *monitor_name;
-+      GdkPixbuf *monitor_pixbuf;
-+      GnomeRROutputInfo *output = list->data;
-+
-+      if (!gnome_rr_output_info_is_active (output))
-+        continue;
-+
-+      gtk_list_store_append (liststore, &iter);
-+      monitor_name = g_strdup (gnome_rr_output_info_get_display_name (output));
-+      monitor_pixbuf = get_monitor_pixbuf (self, output);
-+
-+      gtk_list_store_set (liststore, &iter, 0, monitor_pixbuf, 1, monitor_name, -1);
-+
-+      /* select it if primary and only one launcher */
-+      if (gnome_rr_output_info_get_primary (output) && (!launcher_on_all_monitors))
-+        index_of_primary_screen = i;
-+      i++;
-+
-+      g_object_unref (monitor_pixbuf);
-+      g_free (monitor_name);
-+    }
-+
-+   // FIXME: check autosort?
-+   gtk_list_store_append (liststore, &iter);
-+   gtk_list_store_set (liststore, &iter, 0, NULL, 1, _("All displays"), -1);
-+
-+   if (launcher_on_all_monitors)
-+     index_of_primary_screen = i;
-+
-+   gtk_combo_box_set_active (GTK_COMBO_BOX (launcher_placement_combo), index_of_primary_screen);
-+}
-+
-+static gboolean
-+switcher_set_to_launcher_on_all_monitors (CcDisplayPanel *self)
-+{
-+  GtkComboBox *combo = GTK_COMBO_BOX (WID ("launcher_placement_combo"));
-+  gint active = gtk_combo_box_get_active (combo);
-+  gint number_items = gtk_tree_model_iter_n_children (gtk_combo_box_get_model (combo),
-+                                                      NULL);
-+  return (active == number_items - 1);
-+}
-+
-+static void
-+ext_launcher_placement_changed_callback (GSettings* settings,
-+                                         guint key,
-+                                         gpointer user_data)
-+{
-+  // add some crazyness as 2d/3d are not using the same keys
-+  CcDisplayPanel *self = CC_DISPLAY_PANEL (user_data);
-+  gint launcher_unity_value = 0;
-+
-+  // two options support: all monitors (0)i or just primary desktop (hence set to 1, not any other number)
-+  if (! switcher_set_to_launcher_on_all_monitors (self))
-+    launcher_unity_value = 1;
-+
-+  if (g_settings_get_int (settings, UNITY_LAUNCHER_ALL_MONITORS_KEY) != launcher_unity_value)
-+    refresh_unity_launcher_placement (self);
-+}
-+
-+static void
-+on_launcher_placement_combo_changed (GtkComboBox *combo, CcDisplayPanel *self)
-+{
-+  gint active = gtk_combo_box_get_active (combo);
-+  gint i;
-+  gint index_on_combo = 0;
-+
-+  if (active < 0)
-+    return;
-+  gint value = 0;
-+  gboolean on_all_monitors = switcher_set_to_launcher_on_all_monitors (self);
-+
-+  if (!on_all_monitors) {
-+    value = 1;
-+    // set the primary output if needed
-+    GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (self->priv->current_configuration);
-+
-+    for (i = 0; outputs[i] != NULL; ++i)
-+      {
-+        GnomeRROutputInfo *output = outputs[i];
-+        if (!gnome_rr_output_info_is_active (output))
-+          continue;
-+
-+        if ((active == index_on_combo) && !gnome_rr_output_info_get_primary (output))
-+          {
-+            set_primary_output (self, output);
-+            break;
-+          }
-+        index_on_combo++;
-+      }
-+  }
-+
-+  /* 3d */
-+  if (self->priv->unity_settings)
-+    g_settings_set_int (self->priv->unity_settings, UNITY_LAUNCHER_ALL_MONITORS_KEY, value);
-+  /* 2d */
-+  if (self->priv->unity2d_settings_launcher)
-+    g_settings_set_boolean (self->priv->unity2d_settings_launcher, "only-one-launcher", !on_all_monitors);
-+}
-+
-+static void
-+setup_unity_settings (CcDisplayPanel *self)
-+{
-+  const gchar * const *schemas;
-+
-+  /* Only use the unity-2d schema if it's installed */
-+  schemas = g_settings_list_schemas ();
-+  while (*schemas != NULL)
-+    {
-+      if (g_strcmp0 (*schemas, UNITY2D_GSETTINGS_LAUNCHER) == 0)
-+        {
-+          self->priv->unity2d_settings_main = g_settings_new (UNITY2D_GSETTINGS_MAIN);
-+          self->priv->unity2d_settings_launcher = g_settings_new (UNITY2D_GSETTINGS_LAUNCHER);
-+          break;
-+        }
-+      schemas++;
-+    }
-+  schemas = g_settings_list_relocatable_schemas ();
-+  while (*schemas != NULL)
-+    {
-+      if (g_strcmp0 (*schemas, UNITY_GSETTINGS_SCHEMA) == 0)
-+        {
-+          self->priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH);
-+          break;
-+        }
-+      schemas++;
-+    }
-+
-+  if (!self->priv->unity_settings)
-+    return;
-+
-+  GtkWidget *sticky_edge_switch = WID ("stickyedge_switch");
-+  g_signal_connect (sticky_edge_switch, "notify::active",
-+                    G_CALLBACK (on_stickyedge_changed), self);
-+  g_signal_connect (self->priv->unity_settings, "changed::" UNITY_STICKY_EDGE_KEY,
-+                    G_CALLBACK (ext_stickyedge_changed_callback), sticky_edge_switch);
-+  stickyedge_widget_refresh (GTK_SWITCH (sticky_edge_switch), self->priv->unity_settings);
-+
-+  g_signal_connect (G_OBJECT (WID ("launcher_placement_combo")), "changed",
-+              G_CALLBACK (on_launcher_placement_combo_changed), self);
-+  g_signal_connect (self->priv->unity_settings, "changed::" UNITY_LAUNCHER_ALL_MONITORS_KEY,
-+                    G_CALLBACK (ext_launcher_placement_changed_callback), self);
-+}
-+
-+static void
- cc_display_panel_init (CcDisplayPanel *self)
- {
- }
-@@ -2572,7 +2859,7 @@
-   CcDisplayPanel *self;
-   CcShell *shell;
-   GtkWidget *toplevel;
--  gchar *objects[] = {"display-panel", NULL};
-+  gchar *objects[] = {"display-panel", "available_launcher_placement_store", NULL};
- 
-   obj = G_OBJECT_CLASS (cc_display_panel_parent_class)->constructor (gtype, n_properties, properties);
-   self = CC_DISPLAY_PANEL (obj);
-@@ -2661,6 +2948,18 @@
-   g_signal_connect_swapped (WID ("apply_button"),
-                             "clicked", G_CALLBACK (apply), self);
- 
-+  /* Unity settings */
-+  if (is_unity_session ())
-+    setup_unity_settings (self);
-+  else
-+    {
-+      gtk_widget_hide (WID ("unity_launcher_placement_sep"));
-+      gtk_widget_hide (WID ("launcher_placement_label"));
-+      gtk_widget_hide (WID ("sticky_edge_label"));
-+      gtk_widget_hide (WID ("launcher_placement_combo"));
-+      gtk_widget_hide (WID ("stickyedge_switch"));
-+    }
-+
-   gtk_widget_show (self->priv->panel);
-   gtk_container_add (GTK_CONTAINER (self), self->priv->panel);
- 
-@@ -2675,4 +2974,3 @@
-                                   CC_TYPE_DISPLAY_PANEL,
-                                   "display", 0);
- }
--
-Index: gnome-control-center-3.4.2/panels/display/display-capplet.ui
-===================================================================
---- gnome-control-center-3.4.2.orig/panels/display/display-capplet.ui	2012-03-05 15:04:55.000000000 +0100
-+++ gnome-control-center-3.4.2/panels/display/display-capplet.ui	2012-07-23 10:26:45.805976846 +0200
-@@ -1,6 +1,14 @@
- <?xml version="1.0"?>
- <interface>
-   <requires lib="gtk+" version="2.16"/>
-+  <object class="GtkListStore" id="available_launcher_placement_store">
-+    <columns>
-+      <!-- column-name MONITOR_PREVIEW -->
-+      <column type="GdkPixbuf"/>
-+      <!-- column-name LAUNCHER_PLACEMENT_NAME -->
-+      <column type="gchararray"/>
-+    </columns>
-+  </object>
-   <!-- interface-naming-policy toplevel-contextual -->
-   <object class="GtkWindow" id="window1">
-     <child>
-@@ -96,56 +104,89 @@
-                     <child>
-                       <object class="GtkTable" id="table1">
-                         <property name="visible">True</property>
--                        <property name="n_rows">3</property>
-+                        <property name="n_rows">5</property>
-                         <property name="n_columns">2</property>
-                         <property name="column_spacing">12</property>
-                         <property name="row_spacing">6</property>
-                         <child>
--                          <object class="GtkAlignment" id="alignment4">
-+                          <object class="GtkLabel" id="label2">
-+                            <property name="visible">True</property>
-+                            <property name="xalign">1</property>
-+                            <property name="label" translatable="yes">_Resolution</property>
-+                            <property name="use_underline">True</property>
-+                            <property name="mnemonic_widget">resolution_combo</property>
-+                            <style>
-+                              <class name="dim-label"/>
-+                            </style>
-+                          </object>
-+                          <packing>
-+                            <property name="x_options">GTK_FILL</property>
-+                            <property name="y_options"></property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkLabel" id="label5">
-+                            <property name="visible">True</property>
-+                            <property name="xalign">1</property>
-+                            <property name="label" translatable="yes">R_otation</property>
-+                            <property name="mnemonic_widget">rotation_combo</property>
-+                            <property name="use_underline">True</property>
-+                            <style>
-+                              <class name="dim-label"/>
-+                            </style>
-+                          </object>
-+                          <packing>
-+                            <property name="top_attach">1</property>
-+                            <property name="bottom_attach">2</property>
-+                            <property name="x_options">GTK_FILL</property>
-+                            <property name="y_options"></property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkSeparator" id="unity_launcher_placement_sep">
-                             <property name="visible">True</property>
--                            <child>
--                              <placeholder/>
--                            </child>
-                           </object>
-                           <packing>
--                            <property name="left_attach">1</property>
--                            <property name="right_attach">2</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
--                            <property name="x_options"></property>
-+                            <property name="left_attach">0</property>
-+						    <property name="right_attach">2</property>
-+                            <property name="x_options">GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-                         <child>
--                          <object class="GtkLabel" id="label2">
-+                          <object class="GtkLabel" id="launcher_placement_label">
-                             <property name="visible">True</property>
-                             <property name="xalign">1</property>
--                            <property name="label" translatable="yes">_Resolution</property>
-+                            <property name="label" translatable="yes">L_auncher placement</property>
-+                            <property name="mnemonic_widget">launcher_placement_combo</property>
-                             <property name="use_underline">True</property>
--                            <property name="mnemonic_widget">resolution_combo</property>
-                             <style>
-                               <class name="dim-label"/>
-                             </style>
-                           </object>
-                           <packing>
-+                            <property name="top_attach">3</property>
-+                            <property name="bottom_attach">4</property>
-                             <property name="x_options">GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-                         <child>
--                          <object class="GtkLabel" id="label5">
-+                          <object class="GtkLabel" id="sticky_edge_label">
-                             <property name="visible">True</property>
-                             <property name="xalign">1</property>
--                            <property name="label" translatable="yes">R_otation</property>
--                            <property name="mnemonic_widget">rotation_combo</property>
-+                            <property name="label" translatable="yes">S_ticky edges</property>
-+                            <property name="mnemonic_widget">stickyedge_switch</property>
-                             <property name="use_underline">True</property>
-                             <style>
-                               <class name="dim-label"/>
-                             </style>
-                           </object>
-                           <packing>
--                            <property name="top_attach">1</property>
--                            <property name="bottom_attach">2</property>
-+                            <property name="top_attach">4</property>
-+                            <property name="bottom_attach">5</property>
-                             <property name="x_options">GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
-@@ -179,6 +220,63 @@
-                           </packing>
-                         </child>
-                         <child>
-+                          <object class="GtkComboBox" id="launcher_placement_combo">
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">False</property>
-+                            <property name="model">available_launcher_placement_store</property>
-+                            <property name="id_column">1</property>
-+                            <child>
-+                              <object class="GtkCellRendererPixbuf" id="monitor_preview_renderer"/>
-+                              <attributes>
-+                                <attribute name="pixbuf">0</attribute>
-+                              </attributes>
-+                            </child>
-+                            <child>
-+                              <object class="GtkCellRendererText" id="launcher_placement_name_renderer"/>
-+                              <attributes>
-+                                <attribute name="text">1</attribute>
-+                              </attributes>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="left_attach">1</property>
-+                            <property name="right_attach">2</property>
-+                            <property name="top_attach">3</property>
-+                            <property name="bottom_attach">4</property>
-+                            <property name="y_options"></property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <object class="GtkHBox" id="hbox4">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">12</property>
-+                            <child>
-+                              <object class="GtkSwitch" id="stickyedge_switch">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="receives_default">False</property>
-+                                <property name="active">True</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="left_attach">1</property>
-+                            <property name="right_attach">2</property>
-+                            <property name="top_attach">4</property>
-+                            <property name="bottom_attach">5</property>
-+                            <property name="y_options"></property>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">0</property>
-+                           </packing>
-+                        </child>
-+                        <child>
-                           <placeholder/>
-                         </child>
-                       </object>

=== added file 'debian/patches/52_region_language.patch'
--- debian/patches/52_region_language.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/52_region_language.patch	2014-05-06 09:05:46 +0000
@@ -0,0 +1,586 @@
+Description: Adapts the region capplet and the language chooser in the user accounts capplet
+Forwarded: https://bugzilla.gnome.org/695939, https://bugzilla.gnome.org/695940
+Author: Gunnar Hjalmarsson <[e-mail]>
+Last-Update: 2013-03-21
+
+ Some background that explains the need for this patch:
+
+ * Ubuntu isn't shipped with all languages installed and all locales generated.
+   Instead the users install the needed language pack(s), and the corresponding
+   locales are generated.
+
+ * The code in accountsservice for handling languages has been extended via Ubuntu
+   specific patches. That code is shared by multiple packages. Currently those
+   packages are:
+   - gnome-control-center
+   - language-selector (Xubuntu and Lubuntu will keep using the language-selector
+     UI for now)
+   - lightdm (for the language chooser in lightdm-gtk-greeter)
+
+ With this patch applied, the g-c-c region capplet and the language chooser in the
+ user accounts capplet behave approximately the same way as language-selector. No
+ migration code needed when standard Ubuntu drops the language-selector UI.
+
+ Compared with how the region capplet in g-c-c works out of the box, this patch
+ results in:
+
+ * Languages are dealt with using 'll' and 'll_CC' language codes instead of
+   complete locale names.
+
+ * Selected language is stored in both LANGUAGE and LANG.
+
+ * Only one language list that shows the translations belonging to the installed
+   language packs (not a 'short' and a 'long' list).
+
+ * User level settings of language and regional formats are stored as
+   accountsservice properties and in ~/.pam_environment.
+
+ * All the formats related locale categories set, not just a subset.
+ 
+ The following changes now live in gnome-desktop3
+
+ * Translation @variants, e.g. ca@valencia, are displayed properly.
+
+ * Locales stored with codeset '.UTF-8' instead of '.utf8'.
+
+ * The 'common_name' field taken into account when parsing the iso-codes XML files
+   for language names.
+
+From 785b001bbc1d9cca74745ea6dfb75d60f3b5b7a9 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Fri, 12 Apr 2013 08:55:40 +1000
+Subject: [PATCH] Ubuntu changes required for proper region support.
+
+---
+ panels/common/cc-common-language.c   | 110 +++++++++++++++++++++++++++---
+ panels/common/cc-common-language.h   |   3 +
+ panels/common/cc-language-chooser.c  |   5 +-
+ panels/region/cc-format-chooser.c    |   2 +
+ panels/region/cc-input-chooser.c     |   4 +-
+ panels/region/cc-region-panel.c      | 127 ++++++++++++++++++++++++++---------
+ panels/user-accounts/um-user-panel.c |  11 ++-
+ 7 files changed, 216 insertions(+), 46 deletions(-)
+
+--- a/panels/common/cc-common-language.c
++++ b/panels/common/cc-common-language.c
+@@ -321,6 +321,67 @@
+         return language;
+ }
+ 
++gchar *
++cc_common_language_get_property (const gchar *prop_name)
++{
++  GDBusConnection  *bus;
++  gchar            *user_path;
++  GError           *error = NULL;
++  GVariant         *properties;
++  GVariantIter     *iter;
++  gchar            *key;
++  GVariant         *value;
++  gchar            *ret = NULL;
++
++  if (g_strcmp0 (prop_name, "Language") != 0 && g_strcmp0 (prop_name, "FormatsLocale") != 0) {
++    g_warning ("Invalid argument: '%s'", prop_name);
++    return ret;
++  }
++
++  bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
++  user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ());
++
++  properties = g_dbus_connection_call_sync (bus,
++                                            "org.freedesktop.Accounts",
++                                            user_path,
++                                            "org.freedesktop.DBus.Properties",
++                                            "GetAll",
++                                            g_variant_new ("(s)", "org.freedesktop.Accounts.User"),
++                                            G_VARIANT_TYPE ("(a{sv})"),
++                                            G_DBUS_CALL_FLAGS_NONE,
++                                            -1,
++                                            NULL,
++                                            &error);
++  if (!properties) {
++    g_warning ("Error calling GetAll() when retrieving properties for %s: %s", user_path, error->message);
++    g_error_free (error);
++                /* g_hash_table_lookup() is not NULL-safe, so don't return NULL */
++                if (g_strcmp0 (prop_name, "Language") == 0)
++                        ret = g_strdup ("en");
++                else
++                        ret = g_strdup ("en_US.UTF-8");
++    goto out;
++  }
++
++  g_variant_get (properties, "(a{sv})", &iter);
++  while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
++    if (g_strcmp0 (key, prop_name) == 0) {
++      g_variant_get (value, "s", &ret);
++      break;
++    }
++  }
++
++  g_variant_unref (properties);
++  g_variant_iter_free (iter);
++
++out:
++  g_object_unref (bus);
++  g_free (user_path);
++
++  return ret;
++}
++
++
+ typedef struct {
+ 	GtkListStore *store;
+ 	gboolean      user_lang;
+@@ -428,7 +489,7 @@
+ 	char *lang;
+ 	gboolean found;
+ 
+-	lang = cc_common_language_get_current_language ();
++	lang = cc_common_language_get_property ("Language");
+ 	g_debug ("Trying to select lang '%s' in treeview", lang);
+ 	model = gtk_tree_view_get_model (treeview);
+ 	found = FALSE;
+@@ -513,6 +574,7 @@
+ 	return lang;
+ }
+ 
++/*
+ static void
+ add_other_users_language (GHashTable *ht)
+ {
+@@ -573,6 +635,7 @@
+ 
+         g_object_unref (proxy);
+ }
++*/
+ 
+ static void
+ insert_language (GHashTable *ht,
+@@ -596,10 +659,10 @@
+ 
+         g_debug ("We have translations for %s", lang);
+ 
+-        if (g_str_has_suffix (lang, ".utf8"))
++        if (g_str_has_suffix (lang, ".UTF-8"))
+                 key = g_strdup (lang);
+         else
+-                key = g_strdup_printf ("%s.utf8", lang);
++                key = g_strdup_printf ("%s.UTF-8", lang);
+ 
+         label_own_lang = gnome_get_language_from_locale (key, key);
+         label_current_lang = gnome_get_language_from_locale (key, NULL);
+@@ -625,9 +688,18 @@
+ cc_common_language_get_initial_languages (void)
+ {
+         GHashTable *ht;
++        gchar **langs;
++        gint i;
+ 
+         ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+ 
++        langs = gnome_get_all_locales ();
++        for (i = 0; langs[i]; i++) {
++                char *language = strtok (langs[i], ".");
++                insert_language (ht, language);
++        }
++        g_strfreev (langs);
++/*
+         insert_language (ht, "en_US");
+         insert_language (ht, "en_GB");
+         insert_language (ht, "de_DE");
+@@ -637,7 +709,7 @@
+         insert_language (ht, "ja_JP");
+         insert_language (ht, "ru_RU");
+         insert_language (ht, "ar_EG");
+-
++*/
+         return ht;
+ }
+ 
+@@ -651,10 +723,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 */
+-        add_other_users_language (ht);
++        // add_other_users_language (ht);
+ 
+         /* Add current locale */
+-        name = cc_common_language_get_current_language ();
++        name = cc_common_language_get_property ("Language");
+         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 @@
+         return ht;
+ }
+ 
++void
++cc_common_language_get_locale (const gchar *language, gchar **locale){
++        gchar *command;
++        GError *error = NULL;
++        /* Get locale that corresponds to the language */
++        command = g_strconcat ("/usr/share/language-tools/language2locale ", language, NULL);
++        if (!g_spawn_command_line_sync (command, locale, NULL, NULL, &error)) {
++                g_warning ("Couldn't get LANG locale: %s", error->message);
++                g_error_free (error);
++                g_free (command);
++
++                return;
++        }
++
++        g_free (command);
++        g_strchomp (*locale);
++        if (strlen (*locale) == 0) {
++                g_warning ("Couldn't get LANG locale -- Copying interrupted");
++                return;
++        }
++
++}
+ static void
+ foreach_user_lang_cb (gpointer key,
+                       gpointer value,
+@@ -734,7 +828,7 @@
+         user_langs = cc_common_language_get_initial_languages ();
+ 
+         /* Add the current locale first */
+-        name = cc_common_language_get_current_language ();
++        name = cc_common_language_get_property ("Language");
+         display = g_hash_table_lookup (user_langs, name);
+         if (!display) {
+                 insert_language (user_langs, name);
+@@ -750,8 +844,8 @@
+         g_hash_table_foreach (user_langs, (GHFunc) foreach_user_lang_cb, store);
+ 
+         /* And now the "Other…" selection */
+-        gtk_list_store_append (store, &iter);
+-        gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other…"), -1);
++        //gtk_list_store_append (store, &iter);
++        //gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other…"), -1);
+ 
+         g_hash_table_destroy (user_langs);
+ }
+--- a/panels/common/cc-common-language.h
++++ b/panels/common/cc-common-language.h
+@@ -45,6 +45,7 @@
+                                                      GHashTable       *user_langs);
+ gboolean cc_common_language_has_font                (const gchar  *locale);
+ gchar   *cc_common_language_get_current_language    (void);
++gchar   *cc_common_language_get_property            (const gchar  *prop_name);
+ 
+ GHashTable *cc_common_language_get_initial_languages   (void);
+ GHashTable *cc_common_language_get_user_languages      (void);
+@@ -57,6 +58,8 @@
+ 
+ void     cc_common_language_add_user_languages (GtkTreeModel *model);
+ 
++void    cc_common_language_get_locale (const gchar *language, gchar **locale);
++
+ G_END_DECLS
+ 
+ #endif
+--- a/panels/common/cc-language-chooser.c
++++ b/panels/common/cc-language-chooser.c
+@@ -1,5 +1,4 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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));
+                         }
+                 } else {
++
+                         gtk_widget_set_opacity (check, 0.0);
++
+                 }
+         }
+         g_list_free (children);
+--- a/panels/region/cc-format-chooser.c
++++ b/panels/region/cc-format-chooser.c
+@@ -170,7 +170,9 @@
+ 
+                 } else {
+                         /* mark as unselected */
++
+                         gtk_widget_set_opacity (check, 0.0);
++
+                 }
+         }
+         g_list_free (children);
+--- a/panels/region/cc-input-chooser.c
++++ b/panels/region/cc-input-chooser.c
+@@ -909,7 +909,7 @@
+           lang_code != NULL &&
+           country_code != NULL)
+         {
+-          gchar *locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code);
++          gchar *locale = g_strdup_printf ("%s_%s.UTF-8", lang_code, country_code);
+ 
+           info = g_hash_table_lookup (priv->locales, locale);
+           if (info)
+@@ -1034,7 +1034,7 @@
+       if (!gnome_parse_locale (*locale, &lang_code, &country_code, NULL, NULL))
+         continue;
+ 
+-      simple_locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code);
++      simple_locale = g_strdup_printf ("%s_%s.UTF-8", lang_code, country_code);
+       if (g_hash_table_contains (priv->locales, simple_locale))
+         {
+           g_free (simple_locale);
+--- a/panels/region/cc-region-panel.c
++++ b/panels/region/cc-region-panel.c
+@@ -404,14 +404,55 @@
+ }
+ 
+ static void
++set_formats_locale (const gchar *formats_locale)
++{
++        GDBusProxy  *proxy;
++        GError      *error = NULL;
++        gchar       *user_path;
++        GVariant    *ret;
++
++        user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ());
++        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++                                               G_DBUS_PROXY_FLAGS_NONE,
++                                               NULL,
++                                               "org.freedesktop.Accounts",
++                                               user_path,
++                                               "org.freedesktop.Accounts.User",
++                                               NULL,
++                                               &error);
++        if (!proxy) {
++                g_warning ("Couldn't get accountsservice proxy for %s: %s", user_path, error->message);
++                g_error_free (error);
++                g_free (user_path);
++                return;
++        }
++
++        ret = g_dbus_proxy_call_sync (proxy,
++                                      "SetFormatsLocale",
++                                      g_variant_new ("(s)", formats_locale),
++                                      G_DBUS_CALL_FLAGS_NONE,
++                                      -1,
++                                      NULL,
++                                      &error);
++        if (!ret) {
++                g_warning ("Couldn't set FormatsLocale: %s", error->message);
++                g_error_free (error);
++        } else
++                g_variant_unref (ret);
++
++        g_object_unref (proxy);
++        g_free (user_path);
++}
++
++static void
+ 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 @@
+         CcRegionPanelPrivate *priv = self->priv;
+ 
+         g_free (priv->region);
+-        priv->region = g_settings_get_string (priv->locale_settings, KEY_REGION);
++        priv->region = cc_common_language_get_property ("FormatsLocale");
+         update_region_label (self);
+ }
+ 
+@@ -576,14 +617,16 @@
+ {
+ 	CcRegionPanelPrivate *priv = self->priv;
+         const gchar *language;
+-
+-        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";
+ 
+         g_free (priv->language);
+-        priv->language = g_strdup (language);
++        priv->language = g_strdup (locale);
+         update_language_label (self);
+ }
+ 
+@@ -1428,6 +1471,16 @@
+         update_buttons (self);
+ }
+ 
++static gchar *
++strip_quotes (const gchar *str)
++{
++        if ((g_str_has_prefix (str, "\"") && g_str_has_suffix (str, "\""))
++          || (g_str_has_prefix (str, "'") && g_str_has_suffix (str, "'")))
++                return g_strndup (str + 1, strlen (str) - 2);
++        else
++                return g_strdup (str);
++}
++
+ static void
+ on_localed_properties_changed (GDBusProxy     *proxy,
+                                GVariant       *changed_properties,
+@@ -1442,34 +1495,49 @@
+                 const gchar **strv;
+                 gsize len;
+                 gint i;
+-                const gchar *lang, *messages, *time;
++                gchar *lang, *language, *messages, *time;
+ 
+                 strv = g_variant_get_strv (v, &len);
+ 
+-                lang = messages = time = NULL;
++                lang = language = messages = time = NULL;
+                 for (i = 0; strv[i]; i++) {
+                         if (g_str_has_prefix (strv[i], "LANG=")) {
+-                                lang = strv[i] + strlen ("LANG=");
++                                lang = strip_quotes (strv[i] + strlen ("LANG="));
++                        } else if (g_str_has_prefix (strv[i], "LANGUAGE=")) {
++                                gchar *tmp = strip_quotes (strv[i] + strlen ("LANGUAGE="));
++                                gchar **tokens = g_strsplit (tmp, ":", 2);
++                                language = g_strdup (tokens[0]);
++                                g_free (tmp);
++                                g_strfreev (tokens);
+                         } else if (g_str_has_prefix (strv[i], "LC_MESSAGES=")) {
+-                                messages = strv[i] + strlen ("LC_MESSAGES=");
++                                messages = strip_quotes (strv[i] + strlen ("LC_MESSAGES="));
+                         } else if (g_str_has_prefix (strv[i], "LC_TIME=")) {
+-                                time = strv[i] + strlen ("LC_TIME=");
++                                time = strip_quotes (strv[i] + strlen ("LC_TIME="));
+                         }
+                 }
++                g_free (strv);
++
+                 if (!lang) {
+-                        lang = "";
++                        lang = g_strdup ("en_US.UTF-8");
+                 }
+-                if (!messages) {
+-                        messages = lang;
++                if (!language) {
++                        if (messages)
++                                language = g_strdup (messages);
++                        else
++                                language = g_strdup (lang);
+                 }
+                 if (!time) {
+-                        time = lang;
++                        time = g_strdup (lang);
+                 }
+                 g_free (priv->system_language);
+-                priv->system_language = g_strdup (messages);
++                priv->system_language = g_strdup (language);
+                 g_free (priv->system_region);
+                 priv->system_region = g_strdup (time);
+                 g_variant_unref (v);
++                g_free (lang);
++                g_free (language);
++                g_free (messages);
++                g_free (time);
+ 
+                 update_language_label (self);
+         }
+@@ -1539,29 +1607,28 @@
+ 	CcRegionPanelPrivate *priv = self->priv;
+         GVariantBuilder *b;
+         gchar *s;
++        gchar *lang;
++        gint i;
++
++        cc_common_language_get_locale (priv->system_language, &lang);
+ 
+         b = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+-        s = g_strconcat ("LANG=", priv->system_language, NULL);
++        s = g_strconcat ("LANG=", lang, NULL);
+         g_variant_builder_add (b, "s", s);
+         g_free (s);
+ 
+-        if (g_strcmp0 (priv->system_language, priv->system_region) != 0) {
+-                s = g_strconcat ("LC_TIME=", priv->system_region, NULL);
+-                g_variant_builder_add (b, "s", s);
+-                g_free (s);
+-                s = g_strconcat ("LC_NUMERIC=", priv->system_region, NULL);
+-                g_variant_builder_add (b, "s", s);
+-                g_free (s);
+-                s = g_strconcat ("LC_MONETARY=", priv->system_region, NULL);
+-                g_variant_builder_add (b, "s", s);
+-                g_free (s);
+-                s = g_strconcat ("LC_MEASUREMENT=", priv->system_region, NULL);
+-                g_variant_builder_add (b, "s", s);
+-                g_free (s);
+-                s = g_strconcat ("LC_PAPER=", priv->system_region, NULL);
++        s = g_strconcat ("LANGUAGE=", priv->system_language, NULL);
++        g_variant_builder_add (b, "s", s);
++        g_free (s);
++        const gchar *format_categories[] = { "LC_NUMERIC", "LC_TIME",
++           "LC_MONETARY", "LC_PAPER", "LC_IDENTIFICATION", "LC_NAME",
++           "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", NULL };
++        for (i = 0; format_categories[i] != NULL; i++) {
++                s = g_strconcat (format_categories[i], "=", priv->system_region, NULL);
+                 g_variant_builder_add (b, "s", s);
+                 g_free (s);
+         }
++
+         g_dbus_proxy_call (priv->localed,
+                            "SetLocale",
+                            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 @@
+         cc_common_language_add_user_languages (model);
+ 
+         lang = g_strdup (act_user_get_language (user));
++        cc_common_language_get_locale (lang, &lang);
+         if (!lang)
+-                lang = cc_common_language_get_current_language ();
++                lang = cc_common_language_get_property ("Language");
+         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 @@
+         }
+         else {
+                 lang = g_strdup (act_user_get_language (user));
++                cc_common_language_get_locale (lang, &lang);
+                 if (!lang) {
+-                        lang = cc_common_language_get_current_language ();
++                        lang = cc_common_language_get_property ("Language");
+                 }
+         }
+         cc_common_language_get_iter_for_language (model, lang, &iter);
+@@ -845,6 +847,7 @@
+         GtkTreeModel *model;
+         GtkTreeIter iter;
+         gchar *lang;
++        gchar *locale;
+         ActUser *user;
+ 
+         if (!um_editable_combo_get_active_iter (combo, &iter))
+@@ -855,8 +858,10 @@
+         model = um_editable_combo_get_model (combo);
+ 
+         gtk_tree_model_get (model, &iter, 0, &lang, -1);
++        cc_common_language_get_locale(act_user_get_language (user),&locale);
++
+         if (lang) {
+-                if (g_strcmp0 (lang, act_user_get_language (user)) != 0) {
++                if (g_strcmp0 (lang, locale) != 0) {
+                         act_user_set_language (user, lang);
+                 }
+                 g_free (lang);

=== removed file 'debian/patches/52_region_language.patch'
--- debian/patches/52_region_language.patch	2013-07-05 22:08:12 +0000
+++ debian/patches/52_region_language.patch	1970-01-01 00:00:00 +0000
@@ -1,652 +0,0 @@
-Description: Adapts the region capplet and the language chooser in the user accounts capplet
-Forwarded: https://bugzilla.gnome.org/695939, https://bugzilla.gnome.org/695940
-Author: Gunnar Hjalmarsson <[e-mail]>
-Last-Update: 2013-03-21
-
- Some background that explains the need for this patch:
-
- * Ubuntu isn't shipped with all languages installed and all locales generated.
-   Instead the users install the needed language pack(s), and the corresponding
-   locales are generated.
-
- * The code in accountsservice for handling languages has been extended via Ubuntu
-   specific patches. That code is shared by multiple packages. Currently those
-   packages are:
-   - gnome-control-center
-   - language-selector (Xubuntu and Lubuntu will keep using the language-selector
-     UI for now)
-   - lightdm (for the language chooser in lightdm-gtk-greeter)
-
- With this patch applied, the g-c-c region capplet and the language chooser in the
- user accounts capplet behave approximately the same way as language-selector. No
- migration code needed when standard Ubuntu drops the language-selector UI.
-
- Compared with how the region capplet in g-c-c works out of the box, this patch
- results in:
-
- * Languages are dealt with using 'll' and 'll_CC' language codes instead of
-   complete locale names.
-
- * Selected language is stored in both LANGUAGE and LANG.
-
- * Only one language list that shows the translations belonging to the installed
-   language packs (not a 'short' and a 'long' list).
-
- * User level settings of language and regional formats are stored as
-   accountsservice properties and in ~/.pam_environment.
-
- * All the formats related locale categories set, not just a subset.
-
- * Translation @variants, e.g. ca@valencia, are displayed properly.
-
- * Locales stored with codeset '.UTF-8' instead of '.utf8'.
-
- * The 'common_name' field taken into account when parsing the iso-codes XML files
-   for language names.
-
-Index: gnome-control-center-3.6.3/panels/common/cc-common-language.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/common/cc-common-language.c	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/common/cc-common-language.c	2013-03-21 14:22:09.358586554 +0100
-@@ -326,6 +326,66 @@
-         return language;
- }
- 
-+gchar *
-+cc_common_language_get_property (const gchar *prop_name)
-+{
-+	GDBusConnection  *bus;
-+	gchar            *user_path;
-+	GError           *error = NULL;
-+	GVariant         *properties;
-+	GVariantIter     *iter;
-+	gchar            *key;
-+	GVariant         *value;
-+	gchar            *ret = NULL;
-+
-+	if (g_strcmp0 (prop_name, "Language") != 0 && g_strcmp0 (prop_name, "FormatsLocale") != 0) {
-+		g_warning ("Invalid argument: '%s'", prop_name);
-+		return ret;
-+	}
-+
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ());
-+
-+	properties = g_dbus_connection_call_sync (bus,
-+	                                          "org.freedesktop.Accounts",
-+	                                          user_path,
-+	                                          "org.freedesktop.DBus.Properties",
-+	                                          "GetAll",
-+	                                          g_variant_new ("(s)", "org.freedesktop.Accounts.User"),
-+	                                          G_VARIANT_TYPE ("(a{sv})"),
-+	                                          G_DBUS_CALL_FLAGS_NONE,
-+	                                          -1,
-+	                                          NULL,
-+	                                          &error);
-+	if (!properties) {
-+		g_warning ("Error calling GetAll() when retrieving properties for %s: %s", user_path, error->message);
-+		g_error_free (error);
-+                /* g_hash_table_lookup() is not NULL-safe, so don't return NULL */
-+                if (g_strcmp0 (prop_name, "Language") == 0)
-+                        ret = g_strdup ("en");
-+                else
-+                        ret = g_strdup ("en_US.UTF-8");
-+		goto out;
-+	}
-+
-+	g_variant_get (properties, "(a{sv})", &iter);
-+	while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
-+		if (g_strcmp0 (key, prop_name) == 0) {
-+			g_variant_get (value, "s", &ret);
-+			break;
-+		}
-+	}
-+
-+	g_variant_unref (properties);
-+	g_variant_iter_free (iter);
-+
-+out:
-+	g_object_unref (bus);
-+	g_free (user_path);
-+
-+	return ret;
-+}
-+
- static void
- languages_foreach_cb (gpointer key,
- 		      gpointer value,
-@@ -407,7 +467,7 @@
- 	char *lang;
- 	gboolean found;
- 
--	lang = cc_common_language_get_current_language ();
-+	lang = cc_common_language_get_property ("Language");
- 	g_debug ("Trying to select lang '%s' in treeview", lang);
- 	model = gtk_tree_view_get_model (treeview);
- 	found = FALSE;
-@@ -440,6 +500,7 @@
- 		g_warning ("Could not find current language '%s' in the treeview", lang);
- }
- 
-+/*
- static void
- add_other_users_language (GHashTable *ht)
- {
-@@ -519,6 +580,7 @@
- 
-         g_object_unref (proxy);
- }
-+*/
- 
- GHashTable *
- cc_common_language_get_initial_languages (void)
-@@ -530,6 +592,7 @@
-         ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- 
-         /* Add some common languages first */
-+/*
-         g_hash_table_insert (ht, g_strdup ("en_US.utf8"), g_strdup (_("English")));
-         if (gdm_language_has_translations ("en_GB"))
-                 g_hash_table_insert (ht, g_strdup ("en_GB.utf8"), g_strdup (_("British English")));
-@@ -550,12 +613,29 @@
-         if (gdm_language_has_translations ("ar") ||
-             gdm_language_has_translations ("ar_EG"))
-                 g_hash_table_insert (ht, g_strdup ("ar_EG.utf8"), g_strdup (_("Arabic")));
--
-+*/
-         /* Add the languages used by other users on the system */
--        add_other_users_language (ht);
-+//        add_other_users_language (ht);
-+
-+        /* Add installed languages */
-+        gchar  *avail_languages;
-+        GError *error = NULL;
-+        if (g_spawn_command_line_sync ("/usr/share/language-tools/language-options",
-+                                        &avail_languages, NULL, NULL, &error)) {
-+                name = strtok (avail_languages, "\n");
-+                while (name != NULL) {
-+                        language = gdm_get_language_from_name (name, NULL);
-+                        g_hash_table_insert (ht, g_strdup (name), language);
-+                        name = strtok (NULL, "\n");
-+                }
-+                g_free (avail_languages);
-+        } else {
-+                g_warning ("Couldn't get available languages: %s", error->message);
-+                g_error_free (error);
-+        }
- 
--        /* Add current locale */
--        name = cc_common_language_get_current_language ();
-+        /* Add current language */
-+        name = cc_common_language_get_property ("Language");
-         if (g_hash_table_lookup (ht, name) == NULL) {
-                 language = gdm_get_language_from_name (name, NULL);
-                 g_hash_table_insert (ht, name, language);
-Index: gnome-control-center-3.6.3/panels/common/cc-common-language.h
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/common/cc-common-language.h	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/common/cc-common-language.h	2013-03-15 17:20:48.903849975 +0100
-@@ -45,6 +45,7 @@
-                                                      GHashTable       *user_langs);
- gboolean cc_common_language_has_font                (const gchar  *locale);
- gchar   *cc_common_language_get_current_language    (void);
-+gchar   *cc_common_language_get_property            (const gchar  *prop_name);
- 
- GHashTable *cc_common_language_get_initial_languages   (void);
- GHashTable *cc_common_language_get_initial_regions     (const gchar *lang);
-Index: gnome-control-center-3.6.3/panels/common/cc-language-chooser.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/common/cc-language-chooser.c	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/common/cc-language-chooser.c	2013-03-15 17:20:48.919849976 +0100
-@@ -105,8 +105,8 @@
- 
- 	user_langs = cc_common_language_get_initial_languages ();
- 
--	/* Add the current locale first */
--	name = cc_common_language_get_current_language ();
-+	/* Add the current language first */
-+	name = cc_common_language_get_property ("Language");
- 	display = g_hash_table_lookup (user_langs, name);
- 
-         gtk_list_store_append (store, &iter);
-@@ -118,8 +118,8 @@
- 	g_hash_table_foreach (user_langs, (GHFunc) languages_foreach_cb, store);
- 
- 	/* And now the "Other..." selection */
--        gtk_list_store_append (store, &iter);
--        gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
-+//        gtk_list_store_append (store, &iter);
-+//        gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
- 
-         g_hash_table_destroy (user_langs);
- }
-Index: gnome-control-center-3.6.3/panels/common/gdm-languages.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/common/gdm-languages.c	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/common/gdm-languages.c	2013-03-15 17:20:48.923849976 +0100
-@@ -224,6 +224,7 @@
-                          const char *codeset,
-                          const char *modifier)
- {
-+        const char *adj_codeset;
-         char *name;
- 
-         g_assert (language[0] != 0);
-@@ -231,12 +232,17 @@
-         g_assert (codeset == NULL || codeset[0] != 0);
-         g_assert (modifier == NULL || modifier[0] != 0);
- 
-+        if (g_strcmp0 (codeset, "utf8") == 0) {
-+                adj_codeset = "UTF-8";
-+        } else
-+                adj_codeset = codeset;
-+
-         name = g_strdup_printf ("%s%s%s%s%s%s%s",
-                                 language,
-                                 territory != NULL? "_" : "",
-                                 territory != NULL? territory : "",
-                                 codeset != NULL? "." : "",
--                                codeset != NULL? codeset : "",
-+                                codeset != NULL? adj_codeset : "",
-                                 modifier != NULL? "@" : "",
-                                 modifier != NULL? modifier : "");
- 
-@@ -854,6 +860,7 @@
-         const char *ccode_longT;
-         const char *ccode;
-         const char *ccode_id;
-+        const char *lang_common_name;
-         const char *lang_name;
- 
-         if (! (g_str_equal (element_name, "iso_639_entry") || g_str_equal (element_name, "iso_639_3_entry"))
-@@ -865,6 +872,7 @@
-         ccode_longB = NULL;
-         ccode_longT = NULL;
-         ccode_id = NULL;
-+        lang_common_name = NULL;
-         lang_name = NULL;
- 
-         while (*attr_names && *attr_values) {
-@@ -901,6 +909,11 @@
-                                 }
-                                 ccode_id = *attr_values;
-                         }
-+                } else if (g_str_equal (*attr_names, "common_name")) {
-+                        /* skip if empty */
-+                        if (**attr_values) {
-+                                lang_common_name = *attr_values;
-+                        }
-                 } else if (g_str_equal (*attr_names, "name")) {
-                         lang_name = *attr_values;
-                 }
-@@ -909,6 +922,10 @@
-                 ++attr_values;
-         }
- 
-+        if (lang_common_name != NULL) {
-+                lang_name = lang_common_name;
-+        }
-+
-         if (lang_name == NULL) {
-                 return;
-         }
-@@ -1131,6 +1148,7 @@
-         char *langinfo_codeset;
-         char *translated_language;
-         char *translated_territory;
-+        char *modifier;
-         gboolean is_utf8 = TRUE;
- 
-         g_return_val_if_fail (name != NULL, NULL);
-@@ -1153,12 +1171,13 @@
-         language_code = NULL;
-         territory_code = NULL;
-         codeset_code = NULL;
-+        modifier = NULL;
- 
-         gdm_parse_language_name (name,
-                                  &language_code,
-                                  &territory_code,
-                                  &codeset_code,
--                                 NULL);
-+                                 &modifier);
- 
-         if (language_code == NULL) {
-                 goto out;
-@@ -1184,7 +1203,7 @@
-                                         translated_territory);
-         }
- 
--        language_name_get_codeset_details (name, &langinfo_codeset, &is_utf8);
-+//        language_name_get_codeset_details (name, &langinfo_codeset, &is_utf8);
- 
-         if (codeset_code == NULL && langinfo_codeset != NULL) {
-             codeset_code = g_strdup (langinfo_codeset);
-@@ -1196,6 +1215,10 @@
-                                         codeset_code);
-         }
- 
-+        if (modifier != NULL) {
-+                g_string_append_printf (full_language, " - %s", modifier);
-+        }
-+
- out:
-        g_free (language_code);
-        g_free (territory_code);
-@@ -1203,6 +1226,7 @@
-        g_free (langinfo_codeset);
-        g_free (translated_language);
-        g_free (translated_territory);
-+       g_free (modifier);
- 
-        if (full_language->len == 0) {
-                g_string_free (full_language, TRUE);
-Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-formats.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-formats.c	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-formats.c	2013-03-15 17:20:48.927849976 +0100
-@@ -31,6 +31,7 @@
- #include "cc-language-chooser.h"
- #include "gdm-languages.h"
- #include "gnome-region-panel-formats.h"
-+#include "gnome-region-panel-system.h"
- 
- static void
- display_date (GtkLabel *label, GDateTime *dt, const gchar *format)
-@@ -149,6 +150,46 @@
-         g_free (active_id);
- }
- 
-+static void
-+set_formats_locale (const gchar *formats_locale)
-+{
-+	GDBusProxy  *proxy;
-+	GError      *error = NULL;
-+	gchar       *user_path;
-+	GVariant    *ret;
-+
-+	user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ());
-+	proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+	                                       G_DBUS_PROXY_FLAGS_NONE,
-+	                                       NULL,
-+	                                       "org.freedesktop.Accounts",
-+	                                       user_path,
-+	                                       "org.freedesktop.Accounts.User",
-+	                                       NULL,
-+	                                       &error);
-+	if (!proxy) {
-+		g_warning ("Couldn't get accountsservice proxy for %s: %s", user_path, error->message);
-+		g_error_free (error);
-+		g_free (user_path);
-+		return;
-+	}
-+
-+	ret = g_dbus_proxy_call_sync (proxy,
-+	                              "SetFormatsLocale",
-+	                              g_variant_new ("(s)", formats_locale),
-+	                              G_DBUS_CALL_FLAGS_NONE,
-+	                              -1,
-+	                              NULL,
-+	                              &error);
-+	if (!ret) {
-+		g_warning ("Couldn't set FormatsLocale: %s", error->message);
-+		g_error_free (error);
-+	} else
-+		g_variant_unref (ret);
-+
-+	g_object_unref (proxy);
-+	g_free (user_path);
-+}
- 
- static void
- update_settings_cb (GtkTreeSelection *selection, gpointer user_data)
-@@ -159,7 +200,6 @@
-         gchar *active_id;
-         GtkWidget *treeview;
-         GSettings *locale_settings;
--        gchar *current_setting;
- 
-         if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-                 return;
-@@ -169,13 +209,10 @@
-         treeview = GTK_WIDGET (gtk_builder_get_object (builder, "region_selector"));
- 
-         locale_settings = g_object_get_data (G_OBJECT (treeview), "settings");
--        current_setting = g_settings_get_string (locale_settings, "region");
- 
--        if (g_strcmp0 (active_id, current_setting) != 0) {
--                g_settings_set_string (locale_settings, "region", active_id);
--        }
-+        set_formats_locale (active_id);
-+        locale_settings_changed (locale_settings, NULL, builder);
- 
--        g_free (current_setting);
-         g_free (active_id);
- }
- 
-@@ -184,7 +221,7 @@
- {
-         gchar *current_setting;
- 
--        current_setting = g_settings_get_string (locale_settings, "region");
-+        current_setting = cc_common_language_get_property ("FormatsLocale");
-         select_region (treeview, current_setting);
-         g_free (current_setting);
- }
-@@ -213,7 +250,6 @@
- populate_regions (GtkBuilder *builder, const gchar *current_lang)
- {
-         gchar *current_region;
--        GSettings *locale_settings;
-         GHashTable *ht;
-         GHashTableIter htiter;
-         GtkTreeModel *model;
-@@ -228,11 +264,10 @@
-         g_signal_handlers_block_by_func (selection, update_settings_cb, builder);
- 
-         model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
--        locale_settings = g_object_get_data (G_OBJECT (treeview), "settings");
- 
-         ht = cc_common_language_get_initial_regions (current_lang);
- 
--        current_region = g_settings_get_string (locale_settings, "region");
-+        current_region = cc_common_language_get_property ("FormatsLocale");
-         if (!current_region || !current_region[0]) {
-                 current_region = g_strdup (current_lang);
-         }
-Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-system.c	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c	2013-03-15 17:48:09.379904608 +0100
-@@ -88,7 +88,7 @@
-                 gtk_widget_set_sensitive (button, TRUE);
- }
- 
--static void
-+void
- locale_settings_changed (GSettings *settings,
-                          const gchar *key,
-                          GtkBuilder *dialog)
-@@ -96,7 +96,7 @@
-         GtkWidget *label;
-         gchar *region, *display_region;
- 
--        region = g_settings_get_string (locale_settings, "region");
-+        region = cc_common_language_get_property ("FormatsLocale");
-         if (!region || !region[0]) {
-                 label = WID ("user_display_language");
-                 region = g_strdup ((gchar*)g_object_get_data (G_OBJECT (label), "language"));
-@@ -216,6 +216,16 @@
-         }
- }
- 
-+static gchar *
-+strip_quotes (const gchar *str)
-+{
-+        if ((g_str_has_prefix (str, "\"") && g_str_has_suffix (str, "\""))
-+          || (g_str_has_prefix (str, "'") && g_str_has_suffix (str, "'")))
-+                return g_strndup (str + 1, strlen (str) - 2);
-+        else
-+                return g_strdup (str);
-+}
-+
- static void
- on_localed_properties_changed (GDBusProxy   *proxy,
-                                GVariant     *changed_properties,
-@@ -244,33 +254,43 @@
-                 const gchar **strv;
-                 gsize len;
-                 gint i;
--                const gchar *lang, *messages, *time;
-+                gchar *lang, *language, *messages, *time;
-                 gchar *name;
-                 GtkWidget *label;
- 
-                 strv = g_variant_get_strv (v, &len);
- 
--                lang = messages = time = NULL;
-+                lang = language = messages = time = NULL;
-                 for (i = 0; strv[i]; i++) {
-                         if (g_str_has_prefix (strv[i], "LANG=")) {
--                                lang = strv[i] + strlen ("LANG=");
-+                                lang = strip_quotes (strv[i] + strlen ("LANG="));
-+                        }
-+                        else if (g_str_has_prefix (strv[i], "LANGUAGE=")) {
-+                                gchar *tmp = strip_quotes (strv[i] + strlen ("LANGUAGE="));
-+                                gchar **tokens = g_strsplit (tmp, ":", 2);
-+                                language = g_strdup (tokens[0]);
-+                                g_free (tmp);
-+                                g_strfreev (tokens);
-                         }
-                         else if (g_str_has_prefix (strv[i], "LC_MESSAGES=")) {
--                                messages = strv[i] + strlen ("LC_MESSAGES=");
-+                                messages = strip_quotes (strv[i] + strlen ("LC_MESSAGES="));
-                         }
-                         else if (g_str_has_prefix (strv[i], "LC_TIME=")) {
--                                time = strv[i] + strlen ("LC_TIME=");
-+                                time = strip_quotes (strv[i] + strlen ("LC_TIME="));
-                         }
-                 }
--                if (!messages) {
--                        messages = lang;
-+                if (!language) {
-+                        if (messages)
-+                                language = g_strdup (messages);
-+                        else
-+                                language = g_strdup (lang);
-                 }
-                 if (!time) {
--                        time = lang;
-+                        time = g_strdup (lang);
-                 }
- 
--                if (messages) {
--                        name = gdm_get_language_from_name (messages, NULL);
-+                if (language) {
-+                        name = gdm_get_language_from_name (language, NULL);
-                         label = WID ("system_display_language");
-                         gtk_label_set_text (GTK_LABEL (label), name);
-                         g_free (name);
-@@ -285,6 +305,10 @@
-                         g_object_set_data_full (G_OBJECT (label), "region", g_strdup (time), g_free);
-                 }
-                 g_variant_unref (v);
-+                g_free (lang);
-+                g_free (language);
-+                g_free (messages);
-+                g_free (time);
-         }
- 
-         label = WID ("system_input_source");
-@@ -350,27 +374,44 @@
-         GtkWidget *label;
-         GVariantBuilder *b;
-         gchar *s;
-+        gchar *command;
-+        gchar *lang;
-+        GError *error = NULL;
-+        gint i;
- 
-         label = WID ("user_display_language");
-         language = g_object_get_data (G_OBJECT (label), "language");
-         label = WID ("user_format");
-         region = g_object_get_data (G_OBJECT (label), "region");
- 
-+        /* Get locale that corresponds to the language */
-+        command = g_strconcat ("/usr/share/language-tools/language2locale ", language, NULL);
-+        if (!g_spawn_command_line_sync (command, &lang, NULL, NULL, &error)) {
-+                g_warning ("Couldn't get LANG locale: %s", error->message);
-+                g_error_free (error);
-+                g_free (command);
-+                return;
-+        }
-+        g_free (command);
-+        g_strchomp (lang);
-+        if (strlen (lang) == 0) {
-+                g_warning ("Couldn't get LANG locale -- Copying interrupted");
-+                return;
-+        }
-+
-         b = g_variant_builder_new (G_VARIANT_TYPE ("as"));
--        s = g_strconcat ("LANG=", language, NULL);
-+        s = g_strconcat ("LANG=", lang, NULL);
-         g_variant_builder_add (b, "s", s);
-+        g_free (lang);
-         g_free (s);
--        if (g_strcmp0 (language, region) != 0) {
--                s = g_strconcat ("LC_TIME=", region, NULL);
--                g_variant_builder_add (b, "s", s);
--                g_free (s);
--                s = g_strconcat ("LC_NUMERIC=", region, NULL);
--                g_variant_builder_add (b, "s", s);
--                g_free (s);
--                s = g_strconcat ("LC_MONETARY=", region, NULL);
--                g_variant_builder_add (b, "s", s);
--                g_free (s);
--                s = g_strconcat ("LC_MEASUREMENT=", region, NULL);
-+        s = g_strconcat ("LANGUAGE=", language, NULL);
-+        g_variant_builder_add (b, "s", s);
-+        g_free (s);
-+        const gchar *format_categories[] = { "LC_NUMERIC", "LC_TIME",
-+           "LC_MONETARY", "LC_PAPER", "LC_IDENTIFICATION", "LC_NAME",
-+           "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", NULL };
-+        for (i = 0; format_categories[i] != NULL; i++) {
-+                s = g_strconcat (format_categories[i], "=", region, NULL);
-                 g_variant_builder_add (b, "s", s);
-                 g_free (s);
-         }
-@@ -525,7 +566,7 @@
-         g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, input_sources_settings);
- 
-         /* Display user settings */
--        language = cc_common_language_get_current_language ();
-+        language = cc_common_language_get_property ("Language");
-         system_update_language (dialog, language);
-         g_free (language);
- 
-Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.h
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-system.h	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.h	2013-03-15 17:20:48.927849976 +0100
-@@ -27,5 +27,8 @@
- void setup_system           (GtkBuilder *builder);
- void system_update_language (GtkBuilder  *builder,
-                              const gchar *language);
-+void locale_settings_changed (GSettings   *settings,
-+                              const gchar *key,
-+                              GtkBuilder  *dialog);
- 
- #endif
-Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel.ui	2013-03-15 17:20:48.939849976 +0100
-+++ gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui	2013-03-15 17:20:48.931849976 +0100
-@@ -192,7 +192,7 @@
-                         </child>
-                         <child>
-                           <object class="GtkToolbar" id="language-toolbar">
--                            <property name="visible">True</property>
-+                            <property name="visible">False</property>
-                             <property name="can_focus">False</property>
-                             <property name="toolbar_style">icons</property>
-                             <property name="show_arrow">False</property>

=== removed file 'debian/patches/53_use_ubuntu_help.patch'
--- debian/patches/53_use_ubuntu_help.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/53_use_ubuntu_help.patch	1970-01-01 00:00:00 +0000
@@ -1,282 +0,0 @@
-Description: Use pre-installed Ubuntu Desktop Guide instead of GNOME help when
- running Unity
-Forwarded: not-needed
-Author: Jeremy Bicha <[e-mail]>
-Index: gnome-control-center-3.6.2/panels/bluetooth/cc-bluetooth-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/bluetooth/cc-bluetooth-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/bluetooth/cc-bluetooth-panel.c	2012-11-02 19:29:57.639315414 -0400
-@@ -72,7 +72,10 @@
- static const char *
- cc_bluetooth_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/bluetooth";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/bluetooth";
-+  else
-+    return "help:gnome-help/bluetooth";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/color/cc-color-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/color/cc-color-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/color/cc-color-panel.c	2012-11-02 19:30:52.679313112 -0400
-@@ -2285,7 +2285,10 @@
- static const char *
- cc_color_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/color";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/color";
-+  else
-+    return "help:gnome-help/color";
- }
- 
- static void
-@@ -2567,6 +2570,12 @@
-   g_signal_connect (widget, "realize",
-                     G_CALLBACK (gcm_prefs_window_realize_cb),
-                     prefs);
-+
-+  widget = WID (priv->builder, "linkbutton_help");
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    g_object_set (G_OBJECT (widget),
-+              "uri", "help:ubuntu-help/color-whyimportant",
-+              NULL);
- }
- 
- void
-Index: gnome-control-center-3.6.2/panels/datetime/cc-datetime-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/datetime/cc-datetime-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/datetime/cc-datetime-panel.c	2012-11-02 19:29:57.639315414 -0400
-@@ -178,7 +178,10 @@
- static const char *
- cc_date_time_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/clock";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/clock";
-+  else
-+    return "help:gnome-help/clock";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/display/cc-display-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/display/cc-display-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/display/cc-display-panel.c	2012-11-02 19:29:57.643315414 -0400
-@@ -205,7 +205,10 @@
- static const char *
- cc_display_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/prefs-display";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/prefs-display";
-+  else
-+    return "help:gnome-help/prefs-display";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/mouse/cc-mouse-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/mouse/cc-mouse-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/mouse/cc-mouse-panel.c	2012-11-02 19:29:57.643315414 -0400
-@@ -107,7 +107,10 @@
- static const char *
- cc_mouse_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/mouse";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/mouse";
-+  else
-+    return "help:gnome-help/mouse";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/network/cc-network-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/network/cc-network-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/network/cc-network-panel.c	2012-11-02 19:29:57.643315414 -0400
-@@ -232,7 +232,10 @@
- static const char *
- cc_network_panel_get_help_uri (CcPanel *panel)
- {
--	return "help:gnome-help/net";
-+        if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+            return "help:ubuntu-help/net";
-+        else
-+            return "help:gnome-help/net";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/online-accounts/cc-online-accounts-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/online-accounts/cc-online-accounts-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/online-accounts/cc-online-accounts-panel.c	2012-11-02 19:29:57.643315414 -0400
-@@ -256,7 +256,10 @@
- static const char *
- goa_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/accounts";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/accounts";
-+  else
-+    return "help:gnome-help/accounts";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/power/cc-power-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/power/cc-power-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/power/cc-power-panel.c	2012-11-02 19:29:57.647315413 -0400
-@@ -124,7 +124,10 @@
- static const char *
- cc_power_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/power";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/power";
-+  else
-+    return "help:gnome-help/power";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/printers/cc-printers-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/printers/cc-printers-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/printers/cc-printers-panel.c	2012-11-02 19:29:57.647315413 -0400
-@@ -251,7 +251,10 @@
- static const char *
- cc_printers_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/printing";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/printing";
-+  else
-+    return "help:gnome-help/printing";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/screen/cc-screen-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c	2012-11-02 19:29:57.647315413 -0400
-@@ -146,7 +146,10 @@
- static const char *
- cc_screen_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/prefs-display";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/prefs-display";
-+  else
-+    return "help:gnome-help/prefs-display";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/sound/cc-sound-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/sound/cc-sound-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/sound/cc-sound-panel.c	2012-11-02 19:29:57.647315413 -0400
-@@ -70,7 +70,10 @@
- static const char *
- cc_sound_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/media#sound";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/media#sound";
-+  else
-+    return "help:gnome-help/media#sound";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/universal-access/cc-ua-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/universal-access/cc-ua-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/universal-access/cc-ua-panel.c	2012-11-02 19:29:57.651315413 -0400
-@@ -159,7 +159,10 @@
- static const char *
- cc_ua_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/a11y";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/a11y";
-+  else
-+    return "help:gnome-help/a11y";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/user-accounts/um-password-dialog.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/user-accounts/um-password-dialog.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/user-accounts/um-password-dialog.c	2012-11-02 19:29:57.651315413 -0400
-@@ -523,9 +523,14 @@
- 
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-strength-hints-label");
-         old_label = gtk_label_get_label (GTK_LABEL (widget));
--        label = g_strdup_printf ("<a href=\"%s\">%s</a>",
--                                 "help:gnome-help/user-goodpassword",
--                                 old_label);
-+        if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+            label = g_strdup_printf ("<a href=\"%s\">%s</a>",
-+                                 "help:ubuntu-help/user-goodpassword",
-+                                  old_label);
-+        else
-+            label = g_strdup_printf ("<a href=\"%s\">%s</a>",
-+                                  "help:gnome-help/user-goodpassword",
-+                                  old_label);
-         gtk_label_set_markup (GTK_LABEL (widget), label);
-         g_free (label);
- 
-Index: gnome-control-center-3.6.2/panels/user-accounts/um-user-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/user-accounts/um-user-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/user-accounts/um-user-panel.c	2012-11-02 19:29:57.651315413 -0400
-@@ -1372,7 +1372,10 @@
- static const char *
- um_user_panel_get_help_uri (CcPanel *panel)
- {
--	return "help:gnome-help/user-accounts";
-+ if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+   return "help:ubuntu-help/user-accounts";
-+ else
-+ return "help:gnome-help/user-accounts";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/panels/wacom/cc-wacom-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/wacom/cc-wacom-panel.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/panels/wacom/cc-wacom-panel.c	2012-11-02 19:29:57.651315413 -0400
-@@ -123,7 +123,10 @@
- static const char *
- cc_wacom_panel_get_help_uri (CcPanel *panel)
- {
--  return "help:gnome-help/wacom";
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    return "help:ubuntu-help/wacom";
-+  else
-+    return "help:gnome-help/wacom";
- }
- 
- static void
-Index: gnome-control-center-3.6.2/shell/control-center.c
-===================================================================
---- gnome-control-center-3.6.2.orig/shell/control-center.c	2012-11-02 19:29:55.031315523 -0400
-+++ gnome-control-center-3.6.2/shell/control-center.c	2012-11-02 19:30:16.431314628 -0400
-@@ -175,8 +175,12 @@
- 
-   if (panel)
-     uri = cc_panel_get_help_uri (panel);
--
--  gtk_show_uri (gtk_widget_get_screen (window),
-+    if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+      gtk_show_uri (gtk_widget_get_screen (window),
-+                uri ? uri : "help:ubuntu-help/prefs",
-+                GDK_CURRENT_TIME, NULL);
-+    else
-+      gtk_show_uri (gtk_widget_get_screen (window),
-                 uri ? uri : "help:gnome-help/prefs",
-                 GDK_CURRENT_TIME, NULL);
- }

=== removed file 'debian/patches/54_enable_alt_tap_in_shortcut.patch'
--- debian/patches/54_enable_alt_tap_in_shortcut.patch	2013-07-05 22:08:12 +0000
+++ debian/patches/54_enable_alt_tap_in_shortcut.patch	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-Index: gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/keyboard/keyboard-shortcuts.c	2012-11-21 18:09:33.690816155 +0100
-+++ gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c	2012-11-21 18:09:34.222816183 +0100
-@@ -1716,7 +1716,7 @@
-   gtk_tree_view_append_column (treeview, column);
- 
-   renderer = (GtkCellRenderer *) g_object_new (GTK_TYPE_CELL_RENDERER_ACCEL,
--                                               "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_OTHER,
-+                                               "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_MODIFIER_TAP,
-                                                NULL);
- 
-   g_signal_connect (treeview, "button_press_event",
-Index: gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/keyboard/cc-keyboard-item.c	2012-05-24 16:20:10.000000000 +0200
-+++ gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.c	2012-11-21 18:09:34.222816183 +0100
-@@ -143,14 +143,25 @@
-               const char     *value,
- 	      gboolean        set_backend)
- {
-+  /* don't reassign <Alt_L> or <Alt> key in the callback to the binding itself (as it's invalid for the cell renderer) */
-+  if ((g_strcmp0 (value, "<Alt_L>") == 0) || (g_strcmp0 (value, "<Alt>") == 0))
-+    return;
-+
-   g_free (item->binding);
-   item->binding = g_strdup (value);
-   binding_from_string (item->binding, &item->keyval, &item->keycode, &item->mask);
- 
-+  const char *key;
-+  char *cheated_modifier = NULL;
-+  if (g_strcmp0 (item->binding, "Alt_L") == 0)
-+    cheated_modifier = g_strdup_printf ("<%s>", item->binding);
-+
-   if (set_backend == FALSE)
-     return;
- 
--  settings_set_binding (item->settings, item->key, item->binding);
-+  settings_set_binding (item->settings, item->key, cheated_modifier ? cheated_modifier: item->binding);
-+
-+  g_free (cheated_modifier);
- }
- 
- const char *
-@@ -441,6 +452,13 @@
-   item->settings = g_settings_new (item->schema);
-   item->binding = settings_get_binding (item->settings, item->key);
-   item->editable = g_settings_is_writable (item->settings, item->key);
-+
-+  if ((g_strcmp0 (item->binding, "<Alt>") == 0) || (g_strcmp0 (item->binding, "<Alt_L>") == 0))
-+    {
-+      g_free (item->binding);
-+      item->binding = g_strdup ("Alt_L");
-+    }
-+
-   binding_from_string (item->binding, &item->keyval, &item->keycode, &item->mask);
- 
-   signal_name = g_strdup_printf ("changed::%s", item->key);

=== removed file 'debian/patches/55_user_accounts_hide_controls.patch'
--- debian/patches/55_user_accounts_hide_controls.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/55_user_accounts_hide_controls.patch	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-Index: gnome-control-center-3.6.3/panels/user-accounts/um-password-dialog.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/user-accounts/um-password-dialog.c	2013-01-22 15:11:55.971943861 -0500
-+++ gnome-control-center-3.6.3/panels/user-accounts/um-password-dialog.c	2013-01-22 15:11:55.959943861 -0500
-@@ -52,6 +52,7 @@
-         GtkWidget *ok_button;
- 
-         UmUser *user;
-+        gboolean using_ecryptfs;
- 
-         GtkWidget *old_password_label;
-         GtkWidget *old_password_entry;
-@@ -471,6 +472,38 @@
-         }
- }
- 
-+int _is_gdm_running = -1;
-+gboolean
-+is_gdm_running (void)
-+{
-+        if (_is_gdm_running == -1) {
-+                GDBusProxy *proxy;
-+                gchar *owner_name;
-+
-+                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_CONNECT_SIGNALS |
-+                                                       G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-+                                                       NULL,
-+                                                       "org.gnome.DisplayManager",
-+                                                       "/org/gnome/DisplayManager/Manager",
-+                                                       "org.gnome.DisplayManager.Manager",
-+                                                       NULL, NULL);
-+
-+                if (proxy == NULL)
-+                        return FALSE;
-+
-+                owner_name = g_dbus_proxy_get_name_owner (proxy);
-+
-+                g_object_unref (proxy);
-+                g_free (owner_name);
-+
-+                _is_gdm_running = (owner_name != NULL) ? 1 : 0;
-+        }
-+
-+        return _is_gdm_running;
-+}
-+
- UmPasswordDialog *
- um_password_dialog_new (void)
- {
-@@ -591,6 +624,13 @@
-                           G_CALLBACK (entry_size_changed), widget);
-         um->normal_hint_label = widget;
- 
-+        if (!is_gdm_running ()) {
-+                widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-hint-label");
-+                gtk_widget_hide (widget);
-+                gtk_widget_hide (um->normal_hint_entry);
-+                gtk_widget_hide (um->normal_hint_label);
-+        }
-+
-         um->strength_indicator = (GtkWidget *) gtk_builder_get_object (builder, "strength-indicator");
- 
-         um->strength_indicator_label = (GtkWidget *) gtk_builder_get_object (builder, "strength-indicator-label");
-@@ -625,6 +665,12 @@
- 
-                 gtk_tree_model_get (model, iter, 1, &mode, -1);
- 
-+                if (mode == 1 && !is_gdm_running ())
-+                        return FALSE;
-+
-+                if (mode == 2 && um->using_ecryptfs)
-+                        return FALSE;
-+
-                 if (mode == 3 && locked)
-                         return FALSE;
- 
-@@ -651,6 +697,8 @@
-         if (user) {
-                 um->user = g_object_ref (user);
- 
-+                um->using_ecryptfs = is_using_ecryptfs (um_user_get_user_name (user));
-+
-                 pixbuf = um_user_render_icon (user, FALSE, 48);
-                 gtk_image_set_from_pixbuf (GTK_IMAGE (um->user_icon), pixbuf);
-                 g_object_unref (pixbuf);
-Index: gnome-control-center-3.6.3/panels/user-accounts/um-user-panel.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/user-accounts/um-user-panel.c	2013-01-22 15:11:55.971943861 -0500
-+++ gnome-control-center-3.6.3/panels/user-accounts/um-user-panel.c	2013-01-22 15:12:18.031943282 -0500
-@@ -629,7 +629,10 @@
-         /* Autologin: show when local account */
-         widget = get_widget (d, "autologin-switch");
-         label = get_widget (d, "autologin-label");
--        show = um_user_is_local_account (user);
-+        /* Don't show autologin option if ecryptfs is in use, because it won't
-+           work if user turns it on. */
-+        show = um_user_is_local_account (user) &&
-+               !is_using_ecryptfs (um_user_get_user_name (user));
-         gtk_widget_set_visible (widget, show);
-         gtk_widget_set_visible (label, show);
- }
-Index: gnome-control-center-3.6.3/panels/user-accounts/um-utils.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/user-accounts/um-utils.c	2013-01-22 15:11:55.971943861 -0500
-+++ gnome-control-center-3.6.3/panels/user-accounts/um-utils.c	2013-01-22 15:11:55.963943861 -0500
-@@ -746,3 +746,27 @@
-         g_string_free (item3, TRUE);
-         g_string_free (item4, TRUE);
- }
-+
-+gboolean
-+is_using_ecryptfs (const gchar *name)
-+{
-+        gboolean using_ecryptfs = FALSE;
-+        int status;
-+        gchar *prog;
-+        gchar *cmd;
-+
-+        prog = g_find_program_in_path ("ecryptfs-verify");
-+        if (prog != NULL) {
-+                gchar *cmd = g_strdup_printf("'%s' -h -u '%s'", prog, name);
-+
-+                if (g_spawn_command_line_sync (cmd, NULL, NULL, &status, NULL)) {
-+                        if (status == 0)
-+                                using_ecryptfs = TRUE;
-+                }
-+
-+                g_free (prog);
-+                g_free (cmd);
-+        }
-+
-+        return using_ecryptfs;
-+}
-Index: gnome-control-center-3.6.3/panels/user-accounts/um-utils.h
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/user-accounts/um-utils.h	2013-01-22 15:11:55.971943861 -0500
-+++ gnome-control-center-3.6.3/panels/user-accounts/um-utils.h	2013-01-22 15:11:55.963943861 -0500
-@@ -65,6 +65,8 @@
- void     generate_username_choices        (const gchar     *name,
-                                            GtkListStore    *store);
- 
-+gboolean is_using_ecryptfs                (const gchar     *name);
-+
- G_END_DECLS
- 
- #endif

=== added file 'debian/patches/56_use_ubuntu_info_branding.patch'
--- debian/patches/56_use_ubuntu_info_branding.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/56_use_ubuntu_info_branding.patch	2014-05-06 09:05:46 +0000
@@ -0,0 +1,31 @@
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -1561,6 +1561,8 @@
+       g_free (text);
+     }
+ 
++  gtk_widget_hide (WID ("version_label"));
++
+   glibtop_get_mem (&mem);
+   text = g_format_size_full (mem.total, G_FORMAT_SIZE_IEC_UNITS);
+   widget = WID ("memory_label");
+--- a/panels/info/info.ui
++++ b/panels/info/info.ui
+@@ -243,7 +243,7 @@
+                               <object class="GtkImage" id="system_image">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="pixbuf">GnomeLogoVerticalMedium.svg</property>
++                                <property name="pixbuf">UbuntuLogo.png</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+--- a/panels/info/info.gresource.xml
++++ b/panels/info/info.gresource.xml
+@@ -3,5 +3,6 @@
+   <gresource prefix="/org/gnome/control-center/info">
+     <file preprocess="xml-stripblanks">info.ui</file>
+     <file>GnomeLogoVerticalMedium.svg</file>
++    <file>UbuntuLogo.png</file>
+   </gresource>
+ </gresources>

=== removed file 'debian/patches/56_use_ubuntu_info_branding.patch'
--- debian/patches/56_use_ubuntu_info_branding.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/56_use_ubuntu_info_branding.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Index: b/panels/info/cc-info-panel.c
-===================================================================
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -1706,6 +1706,8 @@
-       g_free (text);
-     }
- 
-+  gtk_widget_hide (WID ("version_label"));
-+
-   glibtop_get_mem (&mem);
-   text = g_format_size_full (mem.total, G_FORMAT_SIZE_IEC_UNITS);
-   widget = WID ("memory_label");
-Index: b/panels/info/info.ui
-===================================================================
---- a/panels/info/info.ui
-+++ b/panels/info/info.ui
-@@ -242,7 +242,7 @@
-                               <object class="GtkImage" id="system_image">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
--                                <property name="pixbuf">GnomeLogoVerticalMedium.svg</property>
-+                                <property name="pixbuf">UbuntuLogo.png</property>
-                               </object>
-                               <packing>
-                                 <property name="expand">False</property>

=== removed file 'debian/patches/58_hide_gdm_notifications.patch'
--- debian/patches/58_hide_gdm_notifications.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/58_hide_gdm_notifications.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Description: Hide "Show notifications when locked" settings when running
- Unity. You currently need GNOME Shell running on GDM for that to work.
-Forwarded: not-needed
-Author: Jeremy Bicha <[e-mail]>
-Index: gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/screen/cc-screen-panel.c	2012-11-03 19:10:00.926617924 -0400
-+++ gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c	2012-11-03 19:17:14.902599774 -0400
-@@ -545,6 +545,8 @@
-                    "show-notifications",
-                    widget, "active",
-                    G_SETTINGS_BIND_DEFAULT);
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    gtk_widget_hide (widget);
- 
-   update_lock_screen_sensitivity (self);
- 

=== removed file 'debian/patches/58_ubuntu_icon_views_redesign.patch'
--- debian/patches/58_ubuntu_icon_views_redesign.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/58_ubuntu_icon_views_redesign.patch	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-Index: gnome-control-center-3.6.3/shell/gnome-control-center.c
-===================================================================
---- gnome-control-center-3.6.3.orig/shell/gnome-control-center.c	2012-11-24 10:39:18.476282140 -0500
-+++ gnome-control-center-3.6.3/shell/gnome-control-center.c	2012-11-24 10:52:26.776249171 -0500
-@@ -50,7 +50,8 @@
-  * for the user than resizing vertically
-  * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */
- #define FIXED_WIDTH 740
--#define FIXED_HEIGHT 636
-+#define UNITY_FIXED_WIDTH 850
-+#define FIXED_HEIGHT 650
- #define SMALL_SCREEN_FIXED_HEIGHT 400
- 
- #define MIN_ICON_VIEW_HEIGHT 300
-@@ -910,8 +911,12 @@
-       gtk_widget_show (W (priv->builder, "search-entry"));
-       gtk_widget_hide (W (priv->builder, "lock-button"));
- 
--      gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox),
--                                                 FIXED_WIDTH, NULL, &nat_height);
-+      if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+        gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox),
-+                                                   UNITY_FIXED_WIDTH, NULL, &nat_height);
-+      else
-+        gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox),
-+                                                   FIXED_WIDTH, NULL, &nat_height);
-       gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window),
-                                                   priv->small_screen == SMALL_SCREEN_TRUE ? SMALL_SCREEN_FIXED_HEIGHT : nat_height);
-     }
-@@ -921,12 +926,22 @@
-       gtk_widget_hide (W (priv->builder, "search-entry"));
-       /* set the scrolled window small so that it doesn't force
-          the window to be larger than this panel */
--      gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->window),
--                                                 FIXED_WIDTH, NULL, &nat_height);
--      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT);
--      gtk_window_resize (GTK_WINDOW (priv->window),
--                         FIXED_WIDTH,
--                         nat_height);
-+      if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) {
-+        gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->window),
-+                                                   UNITY_FIXED_WIDTH, NULL, &nat_height);
-+        gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT);
-+        gtk_window_resize (GTK_WINDOW (priv->window),
-+                           UNITY_FIXED_WIDTH,
-+                           nat_height);
-+      }
-+      else {
-+        gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->window),
-+                                                   FIXED_WIDTH, NULL, &nat_height);
-+        gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT);
-+        gtk_window_resize (GTK_WINDOW (priv->window),
-+                           FIXED_WIDTH,
-+                           nat_height);
-+      }
-     }
- }
- 
-@@ -1373,7 +1388,10 @@
-   /* Main scrolled window */
-   priv->scrolled_window = W (priv->builder, "scrolledwindow1");
- 
--  gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);
-+  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-+    gtk_widget_set_size_request (priv->scrolled_window, UNITY_FIXED_WIDTH, -1);
-+  else
-+    gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);
-   priv->main_vbox = W (priv->builder, "main-vbox");
-   g_signal_connect (priv->notebook, "notify::page",
-                     G_CALLBACK (notebook_page_notify_cb), priv);

=== removed file 'debian/patches/59_install_gcm_components_on_demand.patch'
--- debian/patches/59_install_gcm_components_on_demand.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/59_install_gcm_components_on_demand.patch	1970-01-01 00:00:00 +0000
@@ -1,231 +0,0 @@
-Index: b/panels/color/cc-color-panel.c
-===================================================================
---- a/panels/color/cc-color-panel.c
-+++ b/panels/color/cc-color-panel.c
-@@ -25,6 +25,7 @@
- #include <colord.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
-+#include <gio/gio.h>
- 
- #include "cc-color-panel.h"
- 
-@@ -260,32 +261,148 @@
- }
- 
- static void
--gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
-+gcm_packagekit_finished_cb (GObject *source, GAsyncResult *res, gpointer user_data)
-+{
-+  GPtrArray *argv = (GPtrArray *)user_data;
-+  GVariant *reply;
-+  GError *error = NULL;
-+  gboolean ret;
-+
-+  reply = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, &error);
-+  g_variant_unref (reply);
-+
-+  if (error != NULL)
-+    {
-+      g_warning ("failed to install required component: %s", error->message);
-+      g_ptr_array_unref (argv);
-+      g_error_free (error);
-+      return;
-+    }
-+
-+  ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
-+                       NULL, NULL, NULL, &error);
-+  g_ptr_array_unref (argv);
-+  if (!ret)
-+    {
-+      g_warning ("failed to run command: %s", error->message);
-+      g_error_free (error);
-+    }
-+}
-+
-+struct gcm_packagekit_closure_data
-+{
-+  GPtrArray *argv;
-+  guint xid;
-+};
-+
-+static void
-+gcm_packagekit_proxy_ready_cb (GObject *source, GAsyncResult *res, gpointer user_data)
-+{
-+  struct gcm_packagekit_closure_data *data =
-+    (struct gcm_packagekit_closure_data *)user_data;
-+  GDBusProxy *session_installer;
-+  GVariantBuilder *builder;
-+  GError *error = NULL;
-+
-+  session_installer = g_dbus_proxy_new_for_bus_finish (res, &error);
-+  if (error != NULL)
-+    {
-+      g_warning ("failed to connect to PackageKit interface: %s",
-+                 error->message);
-+      g_ptr_array_unref (data->argv);
-+      g_free (data);
-+      g_error_free (error);
-+      return;
-+    }
-+
-+  builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
-+  g_variant_builder_add (builder, "s",
-+                         g_ptr_array_index (data->argv, 0));
-+  g_dbus_proxy_call (session_installer,
-+                     "InstallProvideFiles",
-+                     g_variant_new ("(uass)",
-+                                    data->xid,
-+                                    builder,
-+                                    "hide-finished"
-+                                    ),
-+                     G_DBUS_CALL_FLAGS_NONE,
-+                     -1,
-+                     NULL,
-+                     &gcm_packagekit_finished_cb,
-+                     data->argv);
-+
-+  g_free (data);
-+  g_variant_builder_unref (builder);
-+}
-+
-+static void
-+gcm_prefs_install_component (guint xid, GPtrArray *argv)
-+{
-+  struct gcm_packagekit_closure_data *data;
-+  data = g_malloc (sizeof (*data));
-+  data->argv = argv;
-+  data->xid = xid;
-+  g_ptr_array_ref (data->argv);
-+
-+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-+                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
-+                            G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
-+                            NULL,
-+                            "org.freedesktop.PackageKit",
-+                            "/org/freedesktop/PackageKit",
-+                            "org.freedesktop.PackageKit.Modify",
-+                            NULL,
-+                            &gcm_packagekit_proxy_ready_cb,
-+                            data);
-+}
-+
-+static void
-+gcm_prefs_run_maybe_install (guint xid, gchar *filename, GPtrArray *argv)
- {
-   gboolean ret;
-   GError *error = NULL;
-+
-+  ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
-+                       NULL, NULL, NULL, &error);
-+  if (!ret)
-+    {
-+      if ((error->domain == g_spawn_error_quark ()) &&
-+          (error->code == G_SPAWN_ERROR_NOENT))
-+        {
-+          gcm_prefs_install_component (xid, argv);
-+        }
-+      else
-+        {
-+          g_warning ("failed to run command: %s", error->message);
-+        }
-+      g_error_free (error);
-+    }
-+}
-+
-+static void
-+gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
-+{
-   guint xid;
-   GPtrArray *argv;
-+  gchar *calibrater_filename;
-   CcColorPanelPrivate *priv = prefs->priv;
- 
-   /* get xid */
-   xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (priv->main_window)));
- 
-+  calibrater_filename = g_build_filename (BINDIR, "gcm-calibrate", NULL);
-+
-   /* run with modal set */
-   argv = g_ptr_array_new_with_free_func (g_free);
--  g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
-+  g_ptr_array_add (argv, calibrater_filename);
-   g_ptr_array_add (argv, g_strdup ("--device"));
-   g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device)));
-   g_ptr_array_add (argv, g_strdup ("--parent-window"));
-   g_ptr_array_add (argv, g_strdup_printf ("%i", xid));
-   g_ptr_array_add (argv, NULL);
--  ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
--                       NULL, NULL, NULL, &error);
--  if (!ret)
--    {
--      g_warning ("failed to run calibrate: %s", error->message);
--      g_error_free (error);
--    }
-+
-+  gcm_prefs_run_maybe_install (xid, calibrater_filename, argv);
-+
-   g_ptr_array_unref (argv);
- }
- 
-@@ -656,10 +773,9 @@
-   GtkTreeModel *model;
-   GtkTreeSelection *selection;
-   gchar *options = NULL;
-+  gchar *viewer_filename;
-   GPtrArray *argv = NULL;
-   guint xid;
--  gboolean ret;
--  GError *error = NULL;
-   CcColorPanelPrivate *priv = prefs->priv;
- 
-   /* get the selected row */
-@@ -677,21 +793,17 @@
-   /* get xid */
-   xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (priv->main_window)));
- 
-+  viewer_filename = g_build_filename (BINDIR, "gcm-viewer", NULL);
-   /* open up gcm-viewer as a info pane */
-   argv = g_ptr_array_new_with_free_func (g_free);
--  g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL));
-+  g_ptr_array_add (argv, viewer_filename);
-   g_ptr_array_add (argv, g_strdup ("--profile"));
-   g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
-   g_ptr_array_add (argv, g_strdup ("--parent-window"));
-   g_ptr_array_add (argv, g_strdup_printf ("%i", xid));
-   g_ptr_array_add (argv, NULL);
--  ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0,
--                       NULL, NULL, NULL, &error);
--  if (!ret)
--    {
--      g_warning ("failed to run calibrate: %s", error->message);
--      g_error_free (error);
--    }
-+
-+  gcm_prefs_run_maybe_install (xid, viewer_filename, argv);
- 
-   g_ptr_array_unref (argv);
-   g_free (options);
-@@ -995,7 +1107,6 @@
- {
-   GtkWidget *widget;
-   CdDeviceRelation relation;
--  gchar *s;
-   CcColorPanelPrivate *priv = prefs->priv;
- 
-   /* get profile */
-@@ -1026,13 +1137,7 @@
-   /* allow getting profile info */
-   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                "toolbutton_profile_view"));
--  if ((s = g_find_program_in_path ("gcm-viewer")))
--    {
--      gtk_widget_set_sensitive (widget, TRUE);
--      g_free (s);
--    }
--  else
--      gtk_widget_set_sensitive (widget, FALSE);
-+  gtk_widget_set_sensitive (widget, TRUE);
- 
-   /* hide device specific stuff */
-   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,

=== removed file 'debian/patches/60_ubuntu_nav_bar.patch'
--- debian/patches/60_ubuntu_nav_bar.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/60_ubuntu_nav_bar.patch	1970-01-01 00:00:00 +0000
@@ -1,406 +0,0 @@
-# Description: set a navigation bar in the g-c-c shell
-# UbuntuSpecific: yes
-#
-=== modified file 'shell/Makefile.am'
-Index: gnome-control-center-3.6.3/shell/Makefile.am
-===================================================================
---- gnome-control-center-3.6.3.orig/shell/Makefile.am	2012-10-01 11:39:00.000000000 +0200
-+++ gnome-control-center-3.6.3/shell/Makefile.am	2012-11-22 10:20:59.485282338 +0100
-@@ -26,6 +26,8 @@
- 	cc-shell-item-view.h			\
- 	cc-shell-model.c			\
- 	cc-shell-model.h			\
-+	cc-shell-nav-bar.c			\
-+	cc-shell-nav-bar.h			\
- 	cc-editable-entry.c			\
- 	cc-editable-entry.h			\
- 	cc-panel.c				\
-Index: gnome-control-center-3.6.3/shell/cc-shell-marshal.list
-===================================================================
---- gnome-control-center-3.6.3.orig/shell/cc-shell-marshal.list	2011-11-07 18:22:02.000000000 +0100
-+++ gnome-control-center-3.6.3/shell/cc-shell-marshal.list	2012-11-22 10:20:56.873282212 +0100
-@@ -1 +1,2 @@
- VOID:STRING,STRING,STRING
-+VOID:VOID
-Index: gnome-control-center-3.6.3/shell/cc-shell-nav-bar.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.3/shell/cc-shell-nav-bar.c	2012-11-22 10:20:56.873282212 +0100
-@@ -0,0 +1,150 @@
-+/*
-+ * Copyright 2012 Canonical
-+ *
-+ * The Control Center is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; either version 2 of the License, or (at your
-+ * option) any later version.
-+ *
-+ * The Control Center is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with the Control Center; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ *
-+ * Author: Aurélien Gâteau <[e-mail]>
-+ */
-+
-+#include "cc-shell-nav-bar.h"
-+#include "cc-shell-marshal.h"
-+
-+#include <glib/gi18n.h>
-+
-+G_DEFINE_TYPE (CcShellNavBar, cc_shell_nav_bar, GTK_TYPE_BOX)
-+
-+#define SHELL_NAV_BAR_PRIVATE(o) \
-+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SHELL_NAV_BAR, CcShellNavBarPrivate))
-+
-+struct _CcShellNavBarPrivate
-+{
-+  GtkWidget *home_button;
-+  GtkWidget *detail_button;
-+};
-+
-+enum
-+{
-+  HOME_CLICKED,
-+  LAST_SIGNAL
-+};
-+
-+static guint signals[LAST_SIGNAL] = {0,};
-+
-+static void
-+cc_shell_nav_bar_get_property (GObject    *object,
-+                                 guint       property_id,
-+                                 GValue     *value,
-+                                 GParamSpec *pspec)
-+{
-+  switch (property_id)
-+    {
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-+    }
-+}
-+
-+static void
-+cc_shell_nav_bar_set_property (GObject      *object,
-+                                 guint         property_id,
-+                                 const GValue *value,
-+                                 GParamSpec   *pspec)
-+{
-+  switch (property_id)
-+    {
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-+    }
-+}
-+
-+static void
-+cc_shell_nav_bar_dispose (GObject *object)
-+{
-+  G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->dispose (object);
-+}
-+
-+static void
-+cc_shell_nav_bar_finalize (GObject *object)
-+{
-+  G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->finalize (object);
-+}
-+
-+static void
-+home_button_clicked_cb (GtkButton *button,
-+                        CcShellNavBar *bar)
-+{
-+  g_signal_emit (bar, signals[HOME_CLICKED], 0);
-+}
-+
-+static void
-+cc_shell_nav_bar_class_init (CcShellNavBarClass *klass)
-+{
-+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+
-+  g_type_class_add_private (klass, sizeof (CcShellNavBarPrivate));
-+
-+  object_class->get_property = cc_shell_nav_bar_get_property;
-+  object_class->set_property = cc_shell_nav_bar_set_property;
-+  object_class->dispose = cc_shell_nav_bar_dispose;
-+  object_class->finalize = cc_shell_nav_bar_finalize;
-+
-+  signals[HOME_CLICKED] = g_signal_new ("home-clicked",
-+                                        CC_TYPE_SHELL_NAV_BAR,
-+                                        G_SIGNAL_RUN_FIRST,
-+                                        0,
-+                                        NULL,
-+                                        NULL,
-+                                        cc_shell_marshal_VOID__VOID,
-+                                        G_TYPE_NONE,
-+                                        0);
-+}
-+
-+static void
-+cc_shell_nav_bar_init (CcShellNavBar *self)
-+{
-+  self->priv = SHELL_NAV_BAR_PRIVATE (self);
-+  self->priv->home_button = gtk_button_new_with_mnemonic (_("_All Settings"));
-+  self->priv->detail_button = gtk_button_new();
-+
-+  gtk_box_pack_start (GTK_BOX(self), self->priv->home_button, FALSE, FALSE, 0);
-+  gtk_box_pack_start (GTK_BOX(self), self->priv->detail_button, FALSE, FALSE, 0);
-+
-+  gtk_widget_show (self->priv->home_button);
-+
-+  g_signal_connect (self->priv->home_button, "clicked",
-+                    G_CALLBACK (home_button_clicked_cb), self);
-+
-+  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET(self));
-+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
-+  gtk_style_context_add_class (context, "breadcrumbs");
-+}
-+
-+GtkWidget *
-+cc_shell_nav_bar_new (void)
-+{
-+  return g_object_new (CC_TYPE_SHELL_NAV_BAR, NULL);
-+}
-+
-+void
-+cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label)
-+{
-+  gtk_widget_show (bar->priv->detail_button);
-+  gtk_button_set_label (GTK_BUTTON (bar->priv->detail_button), label);
-+}
-+
-+void
-+cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar)
-+{
-+  gtk_widget_hide (bar->priv->detail_button);
-+}
-Index: gnome-control-center-3.6.3/shell/cc-shell-nav-bar.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.3/shell/cc-shell-nav-bar.h	2012-11-22 10:20:56.877282212 +0100
-@@ -0,0 +1,76 @@
-+/*
-+ * Copyright 2012 Canonical
-+ *
-+ * The Control Center is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; either version 2 of the License, or (at your
-+ * option) any later version.
-+ *
-+ * The Control Center is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with the Control Center; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ *
-+ * Author: Aurélien Gâteau <[e-mail]>
-+ */
-+
-+#ifndef _CC_SHELL_NAV_BAR_H
-+#define _CC_SHELL_NAV_BAR_H
-+
-+#include <gtk/gtk.h>
-+
-+G_BEGIN_DECLS
-+
-+#define CC_TYPE_SHELL_NAV_BAR cc_shell_nav_bar_get_type()
-+
-+#define CC_SHELL_NAV_BAR(obj) \
-+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-+  CC_TYPE_SHELL_NAV_BAR, CcShellNavBar))
-+
-+#define CC_SHELL_NAV_BAR_CLASS(klass) \
-+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-+  CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
-+
-+#define CC_IS_SHELL_NAV_BAR(obj) \
-+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-+  CC_TYPE_SHELL_NAV_BAR))
-+
-+#define CC_IS_SHELL_NAV_BAR_CLASS(klass) \
-+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-+  CC_TYPE_SHELL_NAV_BAR))
-+
-+#define CC_SHELL_NAV_BAR_GET_CLASS(obj) \
-+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-+  CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass))
-+
-+typedef struct _CcShellNavBar CcShellNavBar;
-+typedef struct _CcShellNavBarClass CcShellNavBarClass;
-+typedef struct _CcShellNavBarPrivate CcShellNavBarPrivate;
-+
-+struct _CcShellNavBar
-+{
-+  GtkBox parent;
-+
-+  CcShellNavBarPrivate *priv;
-+};
-+
-+struct _CcShellNavBarClass
-+{
-+  GtkBoxClass parent_class;
-+};
-+
-+GType cc_shell_nav_bar_get_type (void) G_GNUC_CONST;
-+
-+GtkWidget *cc_shell_nav_bar_new (void);
-+
-+void cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label);
-+
-+void cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar);
-+
-+G_END_DECLS
-+
-+#endif /* _CC_SHELL_NAV_BAR_H */
-Index: gnome-control-center-3.6.3/shell/gnome-control-center.c
-===================================================================
---- gnome-control-center-3.6.3.orig/shell/gnome-control-center.c	2012-11-22 10:20:56.833282210 +0100
-+++ gnome-control-center-3.6.3/shell/gnome-control-center.c	2012-11-22 10:20:59.485282338 +0100
-@@ -38,6 +38,7 @@
- #include "cc-shell.h"
- #include "cc-shell-category-view.h"
- #include "cc-shell-model.h"
-+#include "cc-shell-nav-bar.h"
- 
- G_DEFINE_TYPE (GnomeControlCenter, gnome_control_center, CC_TYPE_SHELL)
- 
-@@ -75,6 +76,7 @@
-   GtkWidget  *search_entry;
-   GtkWidget  *lock_button;
-   GPtrArray  *custom_widgets;
-+  GtkWidget  *nav_bar;
- 
-   GMenuTree  *menu_tree;
-   GtkListStore *store;
-@@ -237,6 +239,7 @@
-   /* switch to the new panel */
-   gtk_widget_show (box);
-   notebook_select_page (priv->notebook, box);
-+  cc_shell_nav_bar_show_detail_button (CC_SHELL_NAV_BAR(shell->priv->nav_bar), name);
- 
-   /* set the title of the window */
-   icon_name = get_icon_name_from_g_icon (gicon);
-@@ -299,6 +302,8 @@
- 
-   /* clear any custom widgets */
-   _shell_remove_all_custom_widgets (priv);
-+
-+  cc_shell_nav_bar_hide_detail_button (CC_SHELL_NAV_BAR (priv->nav_bar));
- }
- 
- void
-@@ -902,11 +907,8 @@
- 
-   child = notebook_get_selected_page (GTK_WIDGET (notebook));
- 
--  /* make sure the home button is shown on all pages except the overview page */
--
-   if (child == priv->scrolled_window || child == priv->search_scrolled)
-     {
--      gtk_widget_hide (W (priv->builder, "home-button"));
-       gtk_widget_show (W (priv->builder, "search-entry"));
-       gtk_widget_hide (W (priv->builder, "lock-button"));
- 
-@@ -917,7 +919,6 @@
-     }
-   else
-     {
--      gtk_widget_show (W (priv->builder, "home-button"));
-       gtk_widget_hide (W (priv->builder, "search-entry"));
-       /* set the scrolled window small so that it doesn't force
-          the window to be larger than this panel */
-@@ -1332,6 +1333,7 @@
-   GError *err = NULL;
-   GnomeControlCenterPrivate *priv;
-   GdkScreen *screen;
-+  GtkWidget *widget;
- 
-   priv = self->priv = CONTROL_CENTER_PRIVATE (self);
- 
-@@ -1378,8 +1380,14 @@
-   g_signal_connect (priv->notebook, "notify::page",
-                     G_CALLBACK (notebook_page_notify_cb), priv);
- 
--  g_signal_connect (gtk_builder_get_object (priv->builder, "home-button"),
--                    "clicked", G_CALLBACK (home_button_clicked_cb), self);
-+  priv->nav_bar = cc_shell_nav_bar_new ();
-+  widget = W (priv->builder, "hbox1");
-+  gtk_box_pack_start (GTK_BOX (widget), priv->nav_bar, FALSE, FALSE, 0);
-+  gtk_box_reorder_child (GTK_BOX (widget), priv->nav_bar, 0);
-+  gtk_widget_show (priv->nav_bar);
-+
-+  g_signal_connect (priv->nav_bar,
-+                    "home-clicked", G_CALLBACK (home_button_clicked_cb), self);
- 
-   /* keep a list of custom widgets to unload on panel change */
-   priv->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
-Index: gnome-control-center-3.6.3/shell/shell.ui
-===================================================================
---- gnome-control-center-3.6.3.orig/shell/shell.ui	2012-11-14 12:42:44.000000000 +0100
-+++ gnome-control-center-3.6.3/shell/shell.ui	2012-11-22 10:21:52.369284899 +0100
-@@ -34,36 +34,6 @@
-                       <object class="GtkHBox" id="hbox1">
-                         <property name="visible">True</property>
-                         <child>
--                          <object class="GtkAspectFrame" id="home-aspect-frame">
--                            <property name="visible">True</property>
--			    <property name="can_focus">False</property>
--			    <property name="xalign">0</property>
--			    <property name="ratio">1</property>
--			    <property name="shadow-type">none</property>
--			    <property name="obey-child">False</property>
--                            <child>
--                              <object class="GtkButton" id="home-button">
--                                <property name="use_action_appearance">False</property>
--                                <property name="can_focus">True</property>
--                                <property name="receives_default">True</property>
--                                <property name="no_show_all">True</property>
--                                <property name="use_action_appearance">False</property>
--                                <property name="image">image1</property>
--                                <property name="use_underline">True</property>
--                                <child internal-child="accessible">
--                                  <object class="AtkObject" id="home-button-atkobject">
--                                    <property name="AtkObject::accessible-name" translatable="yes">All Settings</property>
--                                  </object>
--                                </child>
--                              </object>
--                            </child>
--                          </object>
--                          <packing>
--                            <property name="expand">False</property>
--                            <property name="position">0</property>
--                          </packing>
--                        </child>
--                        <child>
-                           <object class="GtkAlignment" id="entry-alignment">
-                             <property name="visible">True</property>
-                             <property name="xalign">1</property>
-@@ -93,7 +63,7 @@
-                             </child>
-                           </object>
-                           <packing>
--                            <property name="position">1</property>
-+                            <property name="position">0</property>
-                           </packing>
-                         </child>
-                       </object>
-@@ -172,13 +142,6 @@
-       <column type="gchararray"/>
-     </columns>
-   </object>
--  <object class="GtkSizeGroup" id="sizegroup">
--    <property name="mode">vertical</property>
--    <widgets>
--      <widget name="home-button"/>
--      <widget name="entry-alignment"/>
--    </widgets>
--  </object>
-   <object class="GtkImage" id="image1">
-     <property name="visible">True</property>
-     <property name="can_focus">False</property>

=== removed file 'debian/patches/61_workaround_online_account.patch'
--- debian/patches/61_workaround_online_account.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/61_workaround_online_account.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Description: Don't show goa in Unity, we use uoa there
-# Upstream: the change is ubuntu specific
-#
-Index: gnome-control-center-3.3.91/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.3.91.orig/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in   2012-03-05 15:04:55.000000000 +0100
-+++ gnome-control-center-3.3.91/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in        2012-03-06 17:52:14.907083003 +0100
-@@ -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=Online Accounts

=== added file 'debian/patches/64_restore_terminal_keyboard_shortcut.patch'
--- debian/patches/64_restore_terminal_keyboard_shortcut.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/64_restore_terminal_keyboard_shortcut.patch	2014-05-06 09:05:46 +0000
@@ -0,0 +1,13 @@
+Index: gnome-control-center-3.4.2/panels/keyboard/01-launchers.xml.in
+===================================================================
+--- gnome-control-center-3.4.2.orig/panels/keyboard/01-launchers.xml.in	2011-08-25 11:09:31.000000000 -0400
++++ gnome-control-center-3.4.2/panels/keyboard/01-launchers.xml.in	2012-08-25 23:34:01.889092065 -0400
+@@ -7,6 +7,8 @@
+ 
+ 	<KeyListEntry name="email" _description="Launch email client"/>
+ 
++	<KeyListEntry name="terminal" _description="Launch terminal"/>
++
+ 	<KeyListEntry name="www" _description="Launch web browser"/>
+ 
+ 	<KeyListEntry name="home" _description="Home folder"/>

=== removed file 'debian/patches/64_restore_terminal_keyboard_shortcut.patch'
--- debian/patches/64_restore_terminal_keyboard_shortcut.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/64_restore_terminal_keyboard_shortcut.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: gnome-control-center-3.4.2/panels/keyboard/01-launchers.xml.in
-===================================================================
---- gnome-control-center-3.4.2.orig/panels/keyboard/01-launchers.xml.in	2011-08-25 11:09:31.000000000 -0400
-+++ gnome-control-center-3.4.2/panels/keyboard/01-launchers.xml.in	2012-08-25 23:34:01.889092065 -0400
-@@ -7,6 +7,8 @@
- 
- 	<KeyListEntry name="email" _description="Launch email client"/>
- 
-+	<KeyListEntry name="terminal" _description="Launch terminal"/>
-+
- 	<KeyListEntry name="www" _description="Launch web browser"/>
- 
- 	<KeyListEntry name="home" _description="Home folder"/>

=== removed file 'debian/patches/90_force_fallback.patch'
--- debian/patches/90_force_fallback.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/90_force_fallback.patch	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-Index: b/panels/info/info.ui
-===================================================================
---- a/panels/info/info.ui
-+++ b/panels/info/info.ui
-@@ -1191,7 +1191,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkLabel" id="fallback-label">
--                                <property name="visible">True</property>
-+                                <property name="visible">False</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">1</property>
-                                 <property name="label" translatable="yes" comments="Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.">Forced _Fallback Mode</property>
-@@ -1240,7 +1240,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkBox" id="graphics_fallback_switch_box">
--                                <property name="visible">True</property>
-+                                <property name="visible">False</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="halign">start</property>
-                                 <property name="valign">center</property>

=== removed file 'debian/patches/91_unity_no_printing_panel.patch'
--- debian/patches/91_unity_no_printing_panel.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/91_unity_no_printing_panel.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-diff -Nur gnome-control-center-3.6.3/panels/printers/gnome-printers-panel.desktop.in.in gnome-control-center-3.6.3.new/panels/printers/gnome-printers-panel.desktop.in.in
---- gnome-control-center-3.6.3/panels/printers/gnome-printers-panel.desktop.in.in	2013-03-19 11:48:12.950319345 +0100
-+++ gnome-control-center-3.6.3.new/panels/printers/gnome-printers-panel.desktop.in.in	2013-03-19 11:47:56.902318811 +0100
-@@ -8,7 +8,7 @@
- StartupNotify=true
- # The X-GNOME-Settings-Panel is necessary to show in the main shell UI
- Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
- X-GNOME-Settings-Panel=printers
- # Translators: those are keywords for the printing control-center panel
- _Keywords=Printer;Queue;Print;Paper;Ink;Toner;

=== added file 'debian/patches/92_ubuntu_system_proxy.patch'
--- debian/patches/92_ubuntu_system_proxy.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/92_ubuntu_system_proxy.patch	2014-05-06 09:05:46 +0000
@@ -0,0 +1,213 @@
+--- a/panels/network/net-proxy.c
++++ b/panels/network/net-proxy.c
+@@ -25,8 +25,14 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
++#include <grp.h>
++#include <unistd.h>
++#include <gdesktop-enums.h>
++
+ #include "net-proxy.h"
+ 
++
++
+ #define NET_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_PROXY, NetProxyPrivate))
+ 
+ struct _NetProxyPrivate
+@@ -306,6 +312,148 @@
+         return g_variant_builder_end (&builder);
+ }
+ 
++
++static gboolean
++ubuntu_is_in_admin_group (int id_group)
++{
++        gid_t groups [1024];
++       int i, ngroups;
++
++        ngroups = getgroups (1024, groups);
++        if (ngroups < 0) {
++                perror ("getgroups");
++                return FALSE;
++        }
++
++        for (i = 0; i < ngroups; ++i) {
++                if (groups[i] == id_group)
++                        return TRUE;
++        }
++
++        return FALSE;
++}
++
++static gboolean
++ubuntu_is_admin ()
++{
++        struct group *admin_group;
++
++        admin_group = getgrnam ("admin");
++        if (admin_group != NULL && ubuntu_is_in_admin_group (admin_group->gr_gid))
++                return TRUE;
++
++        admin_group = getgrnam ("sudo");
++        if (admin_group != NULL && ubuntu_is_in_admin_group (admin_group->gr_gid))
++                return TRUE;
++
++        return FALSE;
++}
++
++static void
++ubuntu_reset_system_proxy (GDBusProxy *proxy, const gchar *protocol)
++{
++        GVariant *result;
++        GError *error = NULL;
++
++        result = g_dbus_proxy_call_sync (proxy, "set_proxy",
++                                         g_variant_new ("(ss)", protocol, ""),
++                                         G_DBUS_CALL_FLAGS_NONE,
++                                         -1, NULL, &error);
++        if (result)
++                g_variant_unref (result);
++        else {
++                g_warning ("Error while calling set_proxy for %s protocol: %s", protocol, error->message);
++                g_error_free (error);
++        }
++}
++
++static void
++ubuntu_set_proxy_for_protocol (GDBusProxy *proxy, const gchar *protocol, GSettings *settings)
++{
++        GVariant *result;
++        gchar *proxy_str, *host;
++        GError *error = NULL;
++        gint port;
++
++        host = g_settings_get_string (settings, "host");
++        port = g_settings_get_int (settings, "port");
++
++        if (host && *host == '\0') {
++                ubuntu_reset_system_proxy (proxy, protocol);
++        } else {
++                proxy_str = g_strdup_printf ("%s://%s:%i/", protocol, host, port);
++
++                result = g_dbus_proxy_call_sync (proxy, "set_proxy",
++                                                 g_variant_new ("(ss)", protocol, proxy_str),
++                                                 G_DBUS_CALL_FLAGS_NONE,
++                                                 -1, NULL, &error);
++                if (result)
++                        g_variant_unref (result);
++                else {
++                        g_warning ("Error while calling set_proxy for %s protocol: %s", protocol, error->message);
++                        g_error_free (error);
++                }
++                g_free (proxy_str);
++        }
++
++        /* Free memory */
++        g_free (host);
++        g_object_unref (settings);
++}
++
++static void
++ubuntu_on_proxy_apply_system_settings (GtkButton *button, gpointer user_data)
++{
++        GDBusConnection *bus;
++        GDBusProxy *dbus_proxy;
++        GError *error;
++        GDesktopProxyMode proxy_mode;
++        NetProxy *proxy = NET_PROXY (user_data);
++
++        error = NULL;
++        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++        if (!bus) {
++                g_warning ("Could not retrieve system bus: %s", error->message);
++                g_error_free (error);
++
++                return;
++        }
++
++        dbus_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
++                                       "com.ubuntu.SystemService",
++                                       "/",
++                                       "com.ubuntu.SystemService",
++                                       NULL,
++                                       &error);
++        if (!dbus_proxy) {
++                g_warning ("Could not retrieve bus object: %s", error->message);
++                g_error_free (error);
++
++                return;
++        }
++
++        /* Retrieve the current settings */
++        proxy_mode = g_settings_get_enum (proxy->priv->settings, "mode");
++        switch (proxy_mode) {
++        case G_DESKTOP_PROXY_MODE_AUTO:
++        case G_DESKTOP_PROXY_MODE_NONE:
++                ubuntu_reset_system_proxy (dbus_proxy, "http");
++                ubuntu_reset_system_proxy (dbus_proxy, "https");
++                ubuntu_reset_system_proxy (dbus_proxy, "ftp");
++                ubuntu_reset_system_proxy (dbus_proxy, "socks");
++                break;
++        case G_DESKTOP_PROXY_MODE_MANUAL:
++                ubuntu_set_proxy_for_protocol (dbus_proxy, "http", g_settings_get_child (proxy->priv->settings, "http"));
++                ubuntu_set_proxy_for_protocol (dbus_proxy, "https", g_settings_get_child (proxy->priv->settings, "https"));
++                ubuntu_set_proxy_for_protocol (dbus_proxy, "ftp", g_settings_get_child (proxy->priv->settings, "ftp"));
++                ubuntu_set_proxy_for_protocol (dbus_proxy, "socks", g_settings_get_child (proxy->priv->settings, "socks"));
++                break;
++        }
++
++        /* Free memory */
++        g_object_unref (dbus_proxy);
++}
++
+ static void
+ net_proxy_init (NetProxy *proxy)
+ {
+@@ -427,6 +575,13 @@
+                                       G_SETTINGS_BIND_DEFAULT, get_ignore_hosts, set_ignore_hosts,
+                                       NULL, NULL);
+ 
++        /* Ubuntu button for system proxy settings */
++        if (ubuntu_is_admin ()) {
++                g_signal_connect (G_OBJECT (gtk_builder_get_object (proxy->priv->builder, "system_proxy_button")), "clicked",
++                                  G_CALLBACK (ubuntu_on_proxy_apply_system_settings), proxy);
++        } else
++                gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder, "system_proxy_button")));
++
+         /* hide the switch until we get some more detail in the mockup */
+         widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder,
+                                                      "device_proxy_off_switch"));
+--- a/panels/network/network-proxy.ui
++++ b/panels/network/network-proxy.ui
+@@ -229,6 +229,21 @@
+           </packing>
+         </child>
+         <child>
++          <object class="GtkButton" id="system_proxy_button">
++            <property name="label" translatable="yes">Apply system wide</property>
++            <property name="visible">True</property>
++            <property name="can_focus">True</property>
++            <property name="receives_default">True</property>
++            <property name="use_action_appearance">False</property>
++          </object>
++          <packing>
++            <property name="left_attach">0</property>
++            <property name="top_attach">8</property>
++            <property name="width">3</property>
++            <property name="height">1</property>
++          </packing>
++        </child>
++        <child>
+           <object class="GtkLabel" id="label_proxy_warning">
+             <property name="visible">False</property>
+             <property name="can_focus">False</property>
+@@ -239,7 +254,7 @@
+           </object>
+           <packing>
+             <property name="left_attach">0</property>
+-            <property name="top_attach">8</property>
++            <property name="top_attach">9</property>
+             <property name="width">3</property>
+             <property name="height">1</property>
+           </packing>

=== removed file 'debian/patches/92_ubuntu_system_proxy.patch'
--- debian/patches/92_ubuntu_system_proxy.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/92_ubuntu_system_proxy.patch	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-Index: gnome-control-center-3.6.3/panels/network/net-proxy.c
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/network/net-proxy.c	2013-04-16 16:14:41.159226157 +0200
-+++ gnome-control-center-3.6.3/panels/network/net-proxy.c	2013-04-16 16:14:59.847226780 +0200
-@@ -25,8 +25,14 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- 
-+#include <grp.h>
-+#include <unistd.h>
-+#include <gdesktop-enums.h>
-+
- #include "net-proxy.h"
- 
-+
-+
- #define NET_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_PROXY, NetProxyPrivate))
- 
- struct _NetProxyPrivate
-@@ -250,6 +256,148 @@
-         g_type_class_add_private (klass, sizeof (NetProxyPrivate));
- }
- 
-+
-+static gboolean
-+ubuntu_is_in_admin_group (int id_group)
-+{
-+        gid_t groups [1024];
-+       int i, ngroups;
-+
-+        ngroups = getgroups (1024, groups);
-+        if (ngroups < 0) {
-+                perror ("getgroups");
-+                return FALSE;
-+        }
-+
-+        for (i = 0; i < ngroups; ++i) {
-+                if (groups[i] == id_group)
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static gboolean
-+ubuntu_is_admin ()
-+{
-+        struct group *admin_group;
-+
-+        admin_group = getgrnam ("admin");
-+        if (admin_group != NULL && ubuntu_is_in_admin_group (admin_group->gr_gid))
-+                return TRUE;
-+
-+        admin_group = getgrnam ("sudo");
-+        if (admin_group != NULL && ubuntu_is_in_admin_group (admin_group->gr_gid))
-+                return TRUE;
-+
-+        return FALSE;
-+}
-+
-+static void
-+ubuntu_reset_system_proxy (GDBusProxy *proxy, const gchar *protocol)
-+{
-+        GVariant *result;
-+        GError *error = NULL;
-+
-+        result = g_dbus_proxy_call_sync (proxy, "set_proxy",
-+                                         g_variant_new ("(ss)", protocol, ""),
-+                                         G_DBUS_CALL_FLAGS_NONE,
-+                                         -1, NULL, &error);
-+        if (result)
-+                g_variant_unref (result);
-+        else {
-+                g_warning ("Error while calling set_proxy for %s protocol: %s", protocol, error->message);
-+                g_error_free (error);
-+        }
-+}
-+
-+static void
-+ubuntu_set_proxy_for_protocol (GDBusProxy *proxy, const gchar *protocol, GSettings *settings)
-+{
-+        GVariant *result;
-+        gchar *proxy_str, *host;
-+        GError *error = NULL;
-+        gint port;
-+
-+        host = g_settings_get_string (settings, "host");
-+        port = g_settings_get_int (settings, "port");
-+
-+        if (host && *host == '\0') {
-+                ubuntu_reset_system_proxy (proxy, protocol);
-+        } else {
-+                proxy_str = g_strdup_printf ("%s://%s:%i/", protocol, host, port);
-+
-+                result = g_dbus_proxy_call_sync (proxy, "set_proxy",
-+                                                 g_variant_new ("(ss)", protocol, proxy_str),
-+                                                 G_DBUS_CALL_FLAGS_NONE,
-+                                                 -1, NULL, &error);
-+                if (result)
-+                        g_variant_unref (result);
-+                else {
-+                        g_warning ("Error while calling set_proxy for %s protocol: %s", protocol, error->message);
-+                        g_error_free (error);
-+                }
-+                g_free (proxy_str);
-+        }
-+
-+        /* Free memory */
-+        g_free (host);
-+        g_object_unref (settings);
-+}
-+
-+static void
-+ubuntu_on_proxy_apply_system_settings (GtkButton *button, gpointer user_data)
-+{
-+        GDBusConnection *bus;
-+        GDBusProxy *dbus_proxy;
-+        GError *error;
-+        GDesktopProxyMode proxy_mode;
-+        NetProxy *proxy = NET_PROXY (user_data);
-+
-+        error = NULL;
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (!bus) {
-+                g_warning ("Could not retrieve system bus: %s", error->message);
-+                g_error_free (error);
-+
-+                return;
-+        }
-+
-+        dbus_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+                                       "com.ubuntu.SystemService",
-+                                       "/",
-+                                       "com.ubuntu.SystemService",
-+                                       NULL,
-+                                       &error);
-+        if (!dbus_proxy) {
-+                g_warning ("Could not retrieve bus object: %s", error->message);
-+                g_error_free (error);
-+
-+                return;
-+        }
-+
-+        /* Retrieve the current settings */
-+        proxy_mode = g_settings_get_enum (proxy->priv->settings, "mode");
-+        switch (proxy_mode) {
-+        case G_DESKTOP_PROXY_MODE_AUTO:
-+        case G_DESKTOP_PROXY_MODE_NONE:
-+                ubuntu_reset_system_proxy (dbus_proxy, "http");
-+                ubuntu_reset_system_proxy (dbus_proxy, "https");
-+                ubuntu_reset_system_proxy (dbus_proxy, "ftp");
-+                ubuntu_reset_system_proxy (dbus_proxy, "socks");
-+                break;
-+        case G_DESKTOP_PROXY_MODE_MANUAL:
-+                ubuntu_set_proxy_for_protocol (dbus_proxy, "http", g_settings_get_child (proxy->priv->settings, "http"));
-+                ubuntu_set_proxy_for_protocol (dbus_proxy, "https", g_settings_get_child (proxy->priv->settings, "https"));
-+                ubuntu_set_proxy_for_protocol (dbus_proxy, "ftp", g_settings_get_child (proxy->priv->settings, "ftp"));
-+                ubuntu_set_proxy_for_protocol (dbus_proxy, "socks", g_settings_get_child (proxy->priv->settings, "socks"));
-+                break;
-+        }
-+
-+        /* Free memory */
-+        g_object_unref (dbus_proxy);
-+}
-+
- static void
- net_proxy_init (NetProxy *proxy)
- {
-@@ -369,6 +517,13 @@
-                                                      "label_proxy_status"));
-         gtk_label_set_label (GTK_LABEL (widget), "");
- 
-+        /* Ubuntu button for system proxy settings */
-+        if (ubuntu_is_admin ()) {
-+                g_signal_connect (G_OBJECT (gtk_builder_get_object (proxy->priv->builder, "system_proxy_button")), "clicked",
-+                                  G_CALLBACK (ubuntu_on_proxy_apply_system_settings), proxy);
-+        } else
-+                gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder, "system_proxy_button")));
-+
-         /* hide the switch until we get some more detail in the mockup */
-         widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder,
-                                                      "device_proxy_off_switch"));
-Index: gnome-control-center-3.6.3/panels/network/network-proxy.ui
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/network/network-proxy.ui	2013-04-16 16:14:41.159226157 +0200
-+++ gnome-control-center-3.6.3/panels/network/network-proxy.ui	2013-04-16 16:14:41.155226157 +0200
-@@ -280,6 +280,21 @@
-           </packing>
-         </child>
-         <child>
-+          <object class="GtkButton" id="system_proxy_button">
-+            <property name="label" translatable="yes">Apply system wide</property>
-+            <property name="visible">True</property>
-+            <property name="can_focus">True</property>
-+            <property name="receives_default">True</property>
-+            <property name="use_action_appearance">False</property>
-+          </object>
-+          <packing>
-+            <property name="left_attach">0</property>
-+            <property name="top_attach">7</property>
-+            <property name="width">3</property>
-+            <property name="height">1</property>
-+          </packing>
-+        </child>
-+        <child>
-           <object class="GtkLabel" id="label_proxy_warning">
-             <property name="visible">True</property>
-             <property name="can_focus">False</property>
-@@ -290,7 +305,7 @@
-           </object>
-           <packing>
-             <property name="left_attach">0</property>
--            <property name="top_attach">7</property>
-+            <property name="top_attach">8</property>
-             <property name="width">3</property>
-             <property name="height">1</property>
-           </packing>

=== removed file 'debian/patches/97_unity_power_ui.patch'
--- debian/patches/97_unity_power_ui.patch	2013-10-18 14:33:16 +0000
+++ debian/patches/97_unity_power_ui.patch	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-Description: When indicator-power is installed, display an extra option in the power panel.
-Forwarded: not-needed
-
-Index: b/panels/power/cc-power-panel.c
-===================================================================
---- a/panels/power/cc-power-panel.c
-+++ b/panels/power/cc-power-panel.c
-@@ -39,6 +39,7 @@
- {
-   GSettings     *lock_settings;
-   GSettings     *gsd_settings;
-+  GSettings     *power_settings;
-   GCancellable  *cancellable;
-   GtkBuilder    *builder;
-   GDBusProxy    *proxy;
-@@ -89,6 +90,11 @@
-       g_object_unref (priv->gsd_settings);
-       priv->gsd_settings = NULL;
-     }
-+  if (priv->power_settings)
-+    {
-+      g_object_unref (priv->power_settings);
-+      priv->power_settings = NULL;
-+    }
-   if (priv->cancellable != NULL)
-     {
-       g_cancellable_cancel (priv->cancellable);
-@@ -1112,6 +1118,37 @@
- 
-   widget = WID (self->priv->builder, "vbox_power");
-   gtk_widget_reparent (widget, (GtkWidget *) self);
-+
-+  /* Set up Unity-specific controls */
-+  /* References:
-+   *  https://wiki.ubuntu.com/Power
-+   *  https://docs.google.com/document/d/1ILTJDiDCd25Npt2AmgzF8aOnZZECxTfM0hvsbWT2BxA/edit?pli=1#heading=h.i5lg1g344bsb
-+   */
-+  // First check the schema is installed
-+  GSettingsSchemaSource *schema_source = g_settings_schema_source_ref (
-+              g_settings_schema_source_get_default ());
-+  GSettingsSchema *schema = g_settings_schema_source_lookup (
-+              schema_source,
-+              "com.canonical.indicator.power",
-+              TRUE);
-+  g_settings_schema_source_unref (schema_source);
-+
-+  if (schema)
-+    {
-+      widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-+                                                   "combobox_indicator"));
-+      self->priv->power_settings = g_settings_new ("com.canonical.indicator.power");
-+      g_settings_bind (self->priv->power_settings, "icon-policy",
-+                       widget, "active-id", G_SETTINGS_BIND_DEFAULT);
-+      g_settings_schema_unref (schema);
-+    }
-+  else
-+    {
-+      gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "separator_indicator")));
-+      gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "label_indicator")));
-+      gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "combobox_indicator")));
-+    }
-+
- }
- 
- void
-Index: b/panels/power/power.ui
-===================================================================
---- a/panels/power/power.ui
-+++ b/panels/power/power.ui
-@@ -75,6 +75,28 @@
-       </row>
-     </data>
-   </object>
-+  <object class="GtkListStore" id="liststore_indicator">
-+    <columns>
-+      <!-- column-name name -->
-+      <column type="gchararray"/>
-+      <!-- column-name value -->
-+      <column type="gchararray"/>
-+    </columns>
-+    <data>
-+      <row>
-+        <col id="0" translatable="yes">When battery is present</col>
-+        <col id="1">present</col>
-+      </row>
-+      <row>
-+        <col id="0" translatable="yes">When battery is charging/in use</col>
-+        <col id="1">charge</col>
-+      </row>
-+      <row>
-+        <col id="0" translatable="yes">Never</col>
-+        <col id="1">never</col>
-+      </row>
-+    </data>
-+  </object>
-   <object class="GtkWindow" id="window_power">
-     <property name="can_focus">False</property>
-     <property name="resizable">False</property>
-@@ -238,6 +260,48 @@
-                 <property name="top_attach">3</property>
-               </packing>
-             </child>
-+            <child>
-+              <object class="GtkSeparator" id="separator_indicator">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+              </object>
-+              <packing>
-+                <property name="left_attach">0</property>
-+                <property name="top_attach">4</property>
-+                <property name="width">4</property>
-+                <property name="height">1</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="label_indicator">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="halign">end</property>
-+                <property name="label" translatable="yes">Show battery status in the _menu bar</property>
-+                <property name="use_underline">True</property>
-+              </object>
-+              <packing>
-+                <property name="left_attach">0</property>
-+                <property name="top_attach">5</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkComboBoxText" id="combobox_indicator">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="model">liststore_indicator</property>
-+                <property name="hexpand">True</property>
-+                <accessibility>
-+                  <relation type="labelled-by" target="label_indicator"/>
-+                </accessibility>
-+              </object>
-+              <packing>
-+                <property name="left_attach">1</property>
-+                <property name="top_attach">5</property>
-+                <property name="width">2</property>
-+                <property name="height">1</property>
-+              </packing>
-+            </child>
-           </object>
-           <packing>
-             <property name="expand">False</property>
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,7 +94,7 @@
- dnl Check that we meet the  dependencies
- dnl ==============================================
- 
--GLIB_REQUIRED_VERSION=2.31.0
-+GLIB_REQUIRED_VERSION=2.31.2
- GTK_REQUIRED_VERSION=3.5.13
- PA_REQUIRED_VERSION=2.0
- CANBERRA_REQUIRED_VERSION=0.13

=== removed file 'debian/patches/98_default_sound_theme.patch'
--- debian/patches/98_default_sound_theme.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/98_default_sound_theme.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Description: the default sound theme is "ubuntu" for us
-# UbuntuSpecific: yes
-#
-Index: b/panels/sound/gvc-sound-theme-chooser.c
-===================================================================
---- a/panels/sound/gvc-sound-theme-chooser.c
-+++ b/panels/sound/gvc-sound-theme-chooser.c
-@@ -67,7 +67,7 @@
- #define DEFAULT_ALERT_ID        "__default"
- #define CUSTOM_THEME_NAME       "__custom"
- #define NO_SOUNDS_THEME_NAME    "__no_sounds"
--#define DEFAULT_THEME           "freedesktop"
-+#define DEFAULT_THEME           "ubuntu"
- 
- enum {
-         THEME_DISPLAY_COL,

=== added file 'debian/patches/99_add_lock-on-suspend.patch'
--- debian/patches/99_add_lock-on-suspend.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99_add_lock-on-suspend.patch	2014-05-06 09:05:46 +0000
@@ -0,0 +1,75 @@
+Description: Add a new preference to lock the screen when the system suspends.
+Author: Marc Deslauriers <[e-mail]>
+Forwarded: no, likely a Ubuntu-specific preference
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076
+
+From: Tim Lunn <[e-mail]>
+Date: Mon, 3 Jun 2013 17:27:45 +1000
+Subject: [PATCH] ubuntu lock on suspend
+
+---
+ panels/privacy/cc-privacy-panel.c |  5 +++++
+ 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)
+   g_settings_bind (self->priv->notification_settings, "show-in-lock-screen",
+                    w, "active",
+                    G_SETTINGS_BIND_DEFAULT);
++
++  w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "screen_lock_suspend"));
++  g_settings_bind (self->priv->lock_settings, "ubuntu-lock-on-suspend",
++                   w, "active",
++                   G_SETTINGS_BIND_DEFAULT);
+ }
+ 
+ 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 @@
+                 <property name="height">1</property>
+               </packing>
+             </child>
++            <child>
++              <object class="GtkLabel" id="label8">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="hexpand">True</property>
++                <property name="label" translatable="yes">Lock Screen on Suspend</property>
++                <property name="use_underline">True</property>
++                <property name="mnemonic_widget">screen_lock_suspend</property>
++              </object>
++              <packing>
++                <property name="left_attach">0</property>
++                <property name="top_attach">3</property>
++                <property name="width">1</property>
++                <property name="height">1</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkSwitch" id="screen_lock_suspend">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="halign">end</property>
++                <property name="valign">center</property>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="top_attach">3</property>
++                <property name="width">1</property>
++                <property name="height">1</property>
++              </packing>
++            </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-- 
+1.8.1.2
+

=== removed file 'debian/patches/99_add_lock-on-suspend.patch'
--- debian/patches/99_add_lock-on-suspend.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/99_add_lock-on-suspend.patch	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-Description: Add a new preference to lock the screen when the system suspends.
-Author: Marc Deslauriers <[e-mail]>
-Forwarded: no, likely a Ubuntu-specific preference
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076
-
-Index: b/panels/screen/cc-screen-panel.c
-===================================================================
---- a/panels/screen/cc-screen-panel.c
-+++ b/panels/screen/cc-screen-panel.c
-@@ -540,6 +540,13 @@
- 
-   update_lock_screen_sensitivity (self);
- 
-+  /* bind the screen lock suspend checkbutton */
-+  widget = WID ("screen_lock_suspend_checkbutton");
-+  g_settings_bind (self->priv->lock_settings,
-+                   "ubuntu-lock-on-suspend",
-+                   widget, "active",
-+                   G_SETTINGS_BIND_DEFAULT);
-+
-   widget = WID ("screen_vbox");
-   gtk_widget_reparent (widget, (GtkWidget *) self);
-   g_object_set (self, "valign", GTK_ALIGN_START, NULL);
-Index: b/panels/screen/screen.ui
-===================================================================
---- a/panels/screen/screen.ui
-+++ b/panels/screen/screen.ui
-@@ -299,6 +299,31 @@
-                           </packing>
-                         </child>
-                         <child>
-+                          <object class="GtkHBox" id="screen_suspend_hbox">
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">False</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <object class="GtkCheckButton" id="screen_lock_suspend_checkbutton">
-+                                <property name="label" translatable="yes">Require my password when waking from suspend</property>
-+                                <property name="use_action_appearance">False</property>
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
-+                          </object>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                            <property name="position">2</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-                           <object class="GtkHBox" id="hbox2">
-                             <property name="can_focus">False</property>
-                             <property name="no_show_all">True</property>
-@@ -340,7 +365,7 @@
-                           <packing>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
--                            <property name="position">2</property>
-+                            <property name="position">3</property>
-                           </packing>
-                         </child>
-                         <child>
-@@ -357,7 +382,7 @@
-                           <packing>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
--                            <property name="position">3</property>
-+                            <property name="position">4</property>
-                           </packing>
-                         </child>
-                       </object>

=== removed file 'debian/patches/accounts_fix_unsetting_icon.patch'
--- debian/patches/accounts_fix_unsetting_icon.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/accounts_fix_unsetting_icon.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=673841
-# Ubuntu: https://launchpad.net/bugs/978049
-#
-Index: gnome-control-center-3.6.2/panels/user-accounts/um-user.c
-===================================================================
---- gnome-control-center-3.6.2.orig/panels/user-accounts/um-user.c	2012-11-01 20:44:03.426070880 -0400
-+++ gnome-control-center-3.6.2/panels/user-accounts/um-user.c	2012-11-01 20:44:03.442070879 -0400
-@@ -730,7 +730,7 @@
-         GVariant *result;
-         GError *error = NULL;
- 
--        result = g_dbus_proxy_call_sync (user->proxy, "SetIconFile", g_variant_new ("(s)", icon_file), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
-+        result = g_dbus_proxy_call_sync (user->proxy, "SetIconFile", g_variant_new ("(s)", icon_file ? icon_file : ""), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
-         if (!result) {
-                 g_warning ("SetIconFile call failed: %s", error->message);
-                 g_error_free (error);

=== removed file 'debian/patches/classic_use_sound_indicator.patch'
--- debian/patches/classic_use_sound_indicator.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/classic_use_sound_indicator.patch	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-Index: b/panels/sound/data/gnome-sound-applet.desktop.in
-===================================================================
---- a/panels/sound/data/gnome-sound-applet.desktop.in
-+++ b/panels/sound/data/gnome-sound-applet.desktop.in
-@@ -14,4 +14,4 @@
- #X-GNOME-Autostart-Phase=Panel
- X-GNOME-Autostart-Notify=true
- AutostartCondition=GNOME3 if-session gnome-fallback
--OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=;

=== removed file 'debian/patches/deal_with_null_ssid.patch'
--- debian/patches/deal_with_null_ssid.patch	2012-11-01 09:53:43 +0000
+++ debian/patches/deal_with_null_ssid.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-From: Dan Williams <[e-mail]>
-Subject: Avoid crashing when SSIDs are NULL.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/908670
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672922
-
----
- panels/network/cc-network-panel.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: gnome-control-center-3.5.2/panels/network/cc-network-panel.c
-===================================================================
---- gnome-control-center-3.5.2.orig/panels/network/cc-network-panel.c	2012-06-08 16:49:24.888332382 +1200
-+++ gnome-control-center-3.5.2/panels/network/cc-network-panel.c	2012-06-08 17:00:13.600309923 +1200
-@@ -1128,13 +1128,19 @@
-         if (aps != NULL)
-                 for (i = 0; i < aps->len; i++) {
-                         ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i));
-+
-+                        /* Hidden SSIDs don't get shown in the list */
-                         ssid = nm_access_point_get_ssid (ap);
-+                        if (!ssid)
-+                                continue;
-+
-                         add_ap = TRUE;
- 
-                         /* get already added list */
-                         for (j=0; j<aps_unique->len; j++) {
-                                 ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, j));
-                                 ssid_tmp = nm_access_point_get_ssid (ap_tmp);
-+                                g_assert (ssid_tmp);
-         
-                                 /* is this the same type and data? */
-                                 if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) {

=== removed file 'debian/patches/dont_download_local_image.patch'
--- debian/patches/dont_download_local_image.patch	2013-07-05 13:31:20 +0000
+++ debian/patches/dont_download_local_image.patch	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-From 7b7f35b172e8c604aa723a3cd414088563a7d490 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <[e-mail]>
-Date: Mon, 19 Mar 2012 12:55:31 -0400
-Subject: [PATCH] background: don't 'download' image files
-
-The code for downloading files from remote uris was being triggered in
-the case of adding a background image file via the file chooser.  Don't
-set the 'source-url' attribute on the image in this case in order to
-avoid the problem.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=672405
----
- panels/background/bg-pictures-source.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: b/panels/background/bg-pictures-source.c
-===================================================================
---- a/panels/background/bg-pictures-source.c
-+++ b/panels/background/bg-pictures-source.c
-@@ -335,7 +335,7 @@
- 		"shading", G_DESKTOP_BACKGROUND_SHADING_SOLID,
- 		"placement", G_DESKTOP_BACKGROUND_STYLE_ZOOM,
- 		NULL);
--  if (source_uri != NULL)
-+  if (source_uri != NULL && !g_file_is_native (file))
-     g_object_set (G_OBJECT (item), "source-url", source_uri, NULL);
- 
-   g_object_set_data (G_OBJECT (file), "item", item);

=== modified file 'debian/patches/gcc_not_in_unity.patch'
--- debian/patches/gcc_not_in_unity.patch	2014-03-04 18:20:22 +0000
+++ debian/patches/gcc_not_in_unity.patch	2014-05-06 09:05:46 +0000
@@ -1,7 +1,5 @@
-Index: gnome-control-center-3.6.3/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in	2014-03-04 19:17:38.322473754 +0100
+--- 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
@@ -11,23 +9,19 @@
  StartupNotify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-bluetooth
-Index: gnome-control-center-3.6.3/panels/color/gnome-color-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/color/gnome-color-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/color/gnome-color-panel.desktop.in.in	2014-03-04 19:17:38.322473754 +0100
+--- 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
+ Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;
 -OnlyShowIn=GNOME;Unity;
-+OnlyShowIn=GNOME;
++OnlyShowIn=GNOME
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=color
-Index: gnome-control-center-3.6.3/panels/display/gnome-display-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/display/gnome-display-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/display/gnome-display-panel.desktop.in.in	2014-03-04 19:17:38.322473754 +0100
+--- 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
@@ -37,10 +31,8 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=Screen resolution
-Index: gnome-control-center-3.6.3/panels/info/gnome-info-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/info/gnome-info-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/info/gnome-info-panel.desktop.in.in	2014-03-04 19:17:38.326473755 +0100
+--- 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
@@ -50,10 +42,8 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=info
-Index: gnome-control-center-3.6.3/panels/keyboard/gnome-keyboard-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/keyboard/gnome-keyboard-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/keyboard/gnome-keyboard-panel.desktop.in.in	2014-03-04 19:17:38.326473755 +0100
+--- 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
@@ -63,10 +53,8 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=keyboard
-Index: gnome-control-center-3.6.3/panels/mouse/gnome-mouse-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/mouse/gnome-mouse-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/mouse/gnome-mouse-panel.desktop.in.in	2014-03-04 19:17:38.326473755 +0100
+--- 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
@@ -76,10 +64,8 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=mouse
-Index: gnome-control-center-3.6.3/panels/network/gnome-network-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/network/gnome-network-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/network/gnome-network-panel.desktop.in.in	2014-03-04 19:17:38.326473755 +0100
+--- 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
@@ -89,36 +75,19 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=network
-Index: gnome-control-center-3.6.3/panels/power/gnome-power-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/power/gnome-power-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/power/gnome-power-panel.desktop.in.in	2014-03-04 19:17:38.326473755 +0100
+--- 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
+ 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
-Index: gnome-control-center-3.6.3/panels/screen/gnome-screen-panel.desktop.in.in
-===================================================================
---- gnome-control-center-3.6.3.orig/panels/screen/gnome-screen-panel.desktop.in.in	2014-03-04 19:17:38.334473755 +0100
-+++ gnome-control-center-3.6.3/panels/screen/gnome-screen-panel.desktop.in.in	2014-03-04 19:17:38.326473755 +0100
-@@ -7,7 +7,7 @@
- Type=Application