Merge lp:~noskcaj/gnome-control-center/3.14 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Jackson Doak]

Merge version 3.14 from debian.

[lp:~noskcaj/gnome-control-center/3.14]

655. By Jackson Doak on 2014-12-20

Drop our revert_git_dont_hide_zoom.patch, no longer needed.

[Tim Lunn (darkxst)]

Thanks Jackson, Looks good.
Can confirm no changes to shared data

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-30 11:17:40 +0000
+++ debian/changelog	2014-12-20 20:42:39 +0000
@@ -1,3 +1,105 @@
+gnome-control-center (1:3.14.2-2ubuntu1) vivid; urgency=low
+
+  * Merge with Debian, remaining changes: LP: #1399047
+    + debian/patches:
+      - revert_git_new_bluetooth_panel.patch,
+        revert_new_bluetooth.patch,
+        revert-bluetooth-BlueZ5-interface.patch:
+         Revert bluetooth back to Bluez4
+      - 52_region_language.patch
+        Adapt region panel to use Ubuntu style regions and UTF-8
+      - 56_use_ubuntu_info_branding.patch,
+        ubuntu-gnome-version.patch
+         Use Ubuntu GNOME branding
+      - 64_restore_terminal_keyboard_shortcut.patch
+         Bring back terminal shortcut
+      - 92_ubuntu_system_proxy.patch
+         Add system proxy support
+      - 99_add_lock-on-suspend.patch
+         Add option to lock on suspend
+      - revert_git_drop_library.patch,
+        ubuntu_external_panels.patch
+         Reimplement support for external panels
+    + debian/control.in:
+      - Relax build-deps on gnome-bluetooth
+      - Drop Recommends for packages not in main
+      - Various other Ubuntu specific changes
+    + debian/libgnome-control-center1.symbols: 
+      - Add new symbols from external panel patch
+    + debian/gnome-control-center-data.install:
+      - don't install the pkla yet
+    + Split out shared data that is used by unity-control-center
+    + Add a wrapper to run unity-control-center in Unity
+    + Install apport hook
+  * Drop our revert_git_dont_hide_zoom.patch, no longer needed.
+
+ -- Jackson Doak <[e-mail]>  Sun, 30 Nov 2014 21:44:23 +0000
+
+gnome-control-center (1:3.14.2-2) unstable; urgency=medium
+
+  * Remove system-config-printer recommendation.
+
+ -- Josselin Mouette <[e-mail]>  Sun, 30 Nov 2014 14:38:52 +0100
+
+gnome-control-center (1:3.14.2-1) unstable; urgency=medium
+
+  * New upstream translation and bugfix release.
+    + Disables SSLv3 because POODLE.
+  * 30_stack_overflow.patch: patch from upstream git. Prevents stack 
+    overflow in sharing panel.
+  * 31_printers_border.patch: patch from upstream git. Removes unwanted 
+    border around printer model name.
+
+ -- Josselin Mouette <[e-mail]>  Sun, 30 Nov 2014 11:08:12 +0100
+
+gnome-control-center (1:3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+
+ -- Laurent Bigonville <[e-mail]>  Sat, 18 Oct 2014 01:35:32 +0200
+
+gnome-control-center (1:3.14.0-1) unstable; urgency=medium
+
+  * Bump gnome-settings-daemon dependency
+    - 'org.gnome.settings-daemon.plugins.media-keys' key 'control-center'
+      added during 3.13 and needed by gnome-control-center keyboard panel.
+  * Drop Recommends on ntp since we now rely on systemd-timesyncd for
+    automatic time (and AIUI ntp integration in gnome never really worked
+    anyway because of the default configuration the debian package shipped).
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 22 Sep 2014 19:49:03 +0200
+
+gnome-control-center (1:3.13.91-1) experimental; urgency=medium
+
+  [ Jordi Mallach ]
+  * Add cracklib-runtime to Recommends, it's needed for password changing.
+
+  [ Andreas Henriksson ]
+  * New upstream development release.
+  * Update build-dependencies according to configure.ac changes:
+    - Bump gsettings-desktop-schemas-dev to (>= 3.13.91)
+    - Drop libgnome-menu-3-dev
+    - Bump libgtk-3-dev to (>= 3.13.0)
+  * Update dependencies:
+    - Drop gnome-menus
+    - Bump gsettings-desktop-schemas to (>= 3.13.91)
+
+  [ Laurent Bigonville ]
+  * Add debian/patches/07_polkit_wheel_sudo_group.patch: The "wheel" group is
+    not existing on debian, check if the user is member of the "sudo" group
+    instead (Closes: #760722)
+
+  [ Andreas Henriksson ]
+  * Update debian/gnome-control-center.pkla with what is currently listed
+    in upstreams panels/common/gnome-control-center.rules since we don't yet
+    have/depend-on policykit-1 >= 0.106 which means the rules file is still
+    unused. This fixes automatic time/timezone, etc.
+
+ -- Andreas Henriksson <[e-mail]>  Sun, 07 Sep 2014 11:34:18 +0200
+
 gnome-control-center (1:3.12.1-5ubuntu3) vivid; urgency=medium
 
   * Drop power-panel-3.10.patch and bump upower build dep to >= 0.99.
@@ -4178,4 +4280,3 @@
 
  -- Jim Pick <[e-mail]>  Mon, 16 Mar 1998 15:27:43 -0800
 
-

=== modified file 'debian/control'
--- debian/control	2014-10-30 11:09:09 +0000
+++ debian/control	2014-12-20 20:42:39 +0000
@@ -7,8 +7,8 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>, Sjoerd Simons <[e-mail]>
-Standards-Version: 3.9.5
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>, Laurent Bigonville <[e-mail]>
+Standards-Version: 3.9.6
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
@@ -19,7 +19,7 @@
                gnome-common,
                gnome-pkg-tools (>= 0.10),
                gnome-settings-daemon-dev (>= 3.7.3),
-               gsettings-desktop-schemas-dev (>= 3.9.91),
+               gsettings-desktop-schemas-dev (>= 3.13.91),
                gtk-doc-tools,
                intltool (>= 0.37.1),
                libcanberra-gtk3-dev,
@@ -33,13 +33,12 @@
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.37.7),
                libgnome-desktop-3-dev (>= 3.11.3),
-               libgnome-menu-3-dev,
                libgnomekbd-dev (>= 2.91.91),
                libgnome-bluetooth-dev (>= 3.3.4) [linux-any],
                libibus-1.0-dev (>= 1.5.2),
                libgoa-1.0-dev (>= 3.9.90),
                libgrilo-0.2-dev (>= 0.2.6),
-               libgtk-3-dev (>= 3.11.1),
+               libgtk-3-dev (>= 3.13.0),
                libgtop2-dev,
                libkrb5-dev,
                libnm-glib-dev (>= 0.9.8) [linux-any],
@@ -81,9 +80,8 @@
          gnome-desktop3-data,
          gnome-icon-theme (>= 3.7),
          gnome-icon-theme-symbolic (>= 3.7),
-         gnome-menus (>= 3.7.90),
-         gnome-settings-daemon (>= 3.7.91),
-         gsettings-desktop-schemas (>= 3.9.91),
+         gnome-settings-daemon (>= 3.13.91),
+         gsettings-desktop-schemas (>= 3.13.91),
 Recommends: cups-pk-helper,
             gnome-control-center-shared-data,
 #            gnome-session-bin,
@@ -93,7 +91,6 @@
             iso-codes,
             libcanberra-pulse,
             mousetweaks,
-            ntp,
             policykit-1-gnome,
             system-config-printer-gnome,
             cracklib-runtime,

=== modified file 'debian/control.in'
--- debian/control.in	2014-10-30 11:09:09 +0000
+++ debian/control.in	2014-12-20 20:42:39 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
@@ -15,7 +15,7 @@
                gnome-common,
                gnome-pkg-tools (>= 0.10),
                gnome-settings-daemon-dev (>= 3.7.3),
-               gsettings-desktop-schemas-dev (>= 3.9.91),
+               gsettings-desktop-schemas-dev (>= 3.13.91),
                gtk-doc-tools,
                intltool (>= 0.37.1),
                libcanberra-gtk3-dev,
@@ -29,13 +29,12 @@
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.37.7),
                libgnome-desktop-3-dev (>= 3.11.3),
-               libgnome-menu-3-dev,
                libgnomekbd-dev (>= 2.91.91),
                libgnome-bluetooth-dev (>= 3.3.4) [linux-any],
                libibus-1.0-dev (>= 1.5.2),
                libgoa-1.0-dev (>= 3.9.90),
                libgrilo-0.2-dev (>= 0.2.6),
-               libgtk-3-dev (>= 3.11.1),
+               libgtk-3-dev (>= 3.13.0),
                libgtop2-dev,
                libkrb5-dev,
                libnm-glib-dev (>= 0.9.8) [linux-any],
@@ -77,9 +76,8 @@
          gnome-desktop3-data,
          gnome-icon-theme (>= 3.7),
          gnome-icon-theme-symbolic (>= 3.7),
-         gnome-menus (>= 3.7.90),
-         gnome-settings-daemon (>= 3.7.91),
-         gsettings-desktop-schemas (>= 3.9.91),
+         gnome-settings-daemon (>= 3.13.91),
+         gsettings-desktop-schemas (>= 3.13.91),
 Recommends: cups-pk-helper,
             gnome-control-center-shared-data,
 #            gnome-session-bin,
@@ -89,7 +87,6 @@
             iso-codes,
             libcanberra-pulse,
             mousetweaks,
-            ntp,
             policykit-1-gnome,
             system-config-printer-gnome,
             cracklib-runtime,

=== added file 'debian/patches/30_stack_overflow.patch'
--- debian/patches/30_stack_overflow.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/30_stack_overflow.patch	2014-12-20 20:42:39 +0000
@@ -0,0 +1,30 @@
+From f5be9cccd8e78970d25fa3559128e827f9924651 Mon Sep 17 00:00:00 2001
+From: Rui Matos <[e-mail]>
+Date: Mon, 10 Nov 2014 15:06:52 +0100
+Subject: sharing: Prevent an endless loop and resulting stack overflow
+
+We need to block ourselves around the gtk_switch_set_active() call in
+the error path, when we can't speak to the sharing dbus service, or we
+end up in an endless loop since we're the ::state-set handler.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739886
+
+diff --git a/panels/sharing/cc-sharing-networks.c b/panels/sharing/cc-sharing-networks.c
+index 181ed99..10920de 100644
+--- a/panels/sharing/cc-sharing-networks.c
++++ b/panels/sharing/cc-sharing-networks.c
+@@ -190,7 +190,11 @@ cc_sharing_networks_enable_network (GtkSwitch *widget,
+     g_warning ("Failed to %s service %s: %s", state ? "enable" : "disable",
+ 	       self->priv->service_name, error->message);
+     g_error_free (error);
++    g_signal_handlers_block_by_func (widget,
++                                     cc_sharing_networks_enable_network, self);
+     gtk_switch_set_active (widget, !state);
++    g_signal_handlers_unblock_by_func (widget,
++                                       cc_sharing_networks_enable_network, self);
+   }
+ 
+   cc_sharing_update_networks (self);
+-- 
+cgit v0.10.1
+

=== added file 'debian/patches/31_printers_border.patch'
--- debian/patches/31_printers_border.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/31_printers_border.patch	2014-12-20 20:42:39 +0000
@@ -0,0 +1,25 @@
+From cc0ce5f2c6d52f799707a612832f3715572eeab9 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <[e-mail]>
+Date: Thu, 27 Nov 2014 15:06:47 +0100
+Subject: printers: Remove border around model name
+
+The border was not there in 3.10 and it is not
+intended to be there in 3.14.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740811
+
+diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
+index ecb545f..3891c35 100644
+--- a/panels/printers/printers.ui
++++ b/panels/printers/printers.ui
+@@ -332,6 +332,7 @@
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="show_tabs">False</property>
++                        <property name="show_border">False</property>
+                         <child>
+                           <object class="GtkButton" id="printer-model-button">
+                             <property name="use_action_appearance">False</property>
+-- 
+cgit v0.10.1
+

=== modified file 'debian/patches/52_region_language.patch'
--- debian/patches/52_region_language.patch	2014-09-23 23:45:16 +0000
+++ debian/patches/52_region_language.patch	2014-12-20 20:42:39 +0000
@@ -52,18 +52,18 @@
 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(-)
+ panels/common/cc-common-language.c   |  112 +++++++++++++++++++++++++++---
+ 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     |    6 -
+ panels/region/cc-region-panel.c      |  129 ++++++++++++++++++++++++++---------
+ panels/user-accounts/um-user-panel.c |    7 +
+ 7 files changed, 218 insertions(+), 46 deletions(-)
 
 --- a/panels/common/cc-common-language.c
 +++ b/panels/common/cc-common-language.c
-@@ -321,6 +321,67 @@
+@@ -320,6 +320,67 @@ cc_common_language_get_current_language
          return language;
  }
  
@@ -131,7 +131,7 @@
  typedef struct {
  	GtkListStore *store;
  	gboolean      user_lang;
-@@ -428,7 +489,7 @@
+@@ -427,7 +488,7 @@ cc_common_language_select_current_langua
  	char *lang;
  	gboolean found;
  
@@ -140,7 +140,7 @@
  	g_debug ("Trying to select lang '%s' in treeview", lang);
  	model = gtk_tree_view_get_model (treeview);
  	found = FALSE;
-@@ -518,6 +579,7 @@
+@@ -517,6 +578,7 @@ get_lang_for_user_object_path (const cha
  	return lang;
  }
  
@@ -148,7 +148,7 @@
  static void
  add_other_users_language (GHashTable *ht)
  {
-@@ -578,6 +640,7 @@
+@@ -577,6 +639,7 @@ add_other_users_language (GHashTable *ht
  
          g_object_unref (proxy);
  }
@@ -156,7 +156,7 @@
  
  static void
  insert_language (GHashTable *ht,
-@@ -601,10 +664,10 @@
+@@ -600,10 +663,10 @@ insert_language (GHashTable *ht,
  
          g_debug ("We have translations for %s", lang);
  
@@ -169,7 +169,7 @@
  
          label_own_lang = gnome_get_language_from_locale (key, key);
          label_current_lang = gnome_get_language_from_locale (key, NULL);
-@@ -630,9 +693,18 @@
+@@ -629,9 +692,18 @@ GHashTable *
  cc_common_language_get_initial_languages (void)
  {
          GHashTable *ht;
@@ -188,7 +188,7 @@
          insert_language (ht, "en_US");
          insert_language (ht, "en_GB");
          insert_language (ht, "de_DE");
-@@ -642,7 +714,7 @@
+@@ -641,7 +713,7 @@ cc_common_language_get_initial_languages
          insert_language (ht, "ja_JP");
          insert_language (ht, "ru_RU");
          insert_language (ht, "ar_EG");
@@ -197,7 +197,7 @@
          return ht;
  }
  
-@@ -656,10 +728,10 @@
+@@ -655,10 +727,10 @@ cc_common_language_get_user_languages (v
          ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
  
          /* Add the languages used by other users on the system */
@@ -210,7 +210,7 @@
          if (g_hash_table_lookup (ht, name) == NULL) {
                  language = gnome_get_language_from_locale (name, NULL);
                  g_hash_table_insert (ht, name, language);
-@@ -708,6 +780,28 @@
+@@ -707,6 +779,28 @@ cc_common_language_get_initial_regions (
          return ht;
  }
  
@@ -239,7 +239,7 @@
  static void
  foreach_user_lang_cb (gpointer key,
                        gpointer value,
-@@ -739,7 +833,7 @@
+@@ -738,7 +832,7 @@ cc_common_language_add_user_languages (G
          user_langs = cc_common_language_get_initial_languages ();
  
          /* Add the current locale first */
@@ -248,7 +248,7 @@
          display = g_hash_table_lookup (user_langs, name);
          if (!display) {
                  insert_language (user_langs, name);
-@@ -755,8 +849,8 @@
+@@ -754,8 +848,8 @@ cc_common_language_add_user_languages (G
          g_hash_table_foreach (user_langs, (GHFunc) foreach_user_lang_cb, store);
  
          /* And now the "Other…" selection */
@@ -261,7 +261,7 @@
  }
 --- a/panels/common/cc-common-language.h
 +++ b/panels/common/cc-common-language.h
-@@ -45,6 +45,7 @@
+@@ -44,6 +44,7 @@ guint    cc_common_language_add_availabl
                                                       GHashTable       *user_langs);
  gboolean cc_common_language_has_font                (const gchar  *locale);
  gchar   *cc_common_language_get_current_language    (void);
@@ -269,7 +269,7 @@
  
  GHashTable *cc_common_language_get_initial_languages   (void);
  GHashTable *cc_common_language_get_user_languages      (void);
-@@ -57,6 +58,8 @@
+@@ -56,6 +57,8 @@ void     cc_common_language_select_curre
  
  void     cc_common_language_add_user_languages (GtkTreeModel *model);
  
@@ -287,7 +287,7 @@
   * Copyright (C) 2013 Red Hat, Inc
   *
   * This program is free software; you can redistribute it and/or modify
-@@ -335,7 +334,9 @@
+@@ -334,7 +333,9 @@ set_locale_id (GtkDialog *chooser,
                                  gtk_list_box_invalidate_filter (GTK_LIST_BOX (priv->language_list));
                          }
                  } else {
@@ -299,7 +299,7 @@
          g_list_free (children);
 --- a/panels/region/cc-format-chooser.c
 +++ b/panels/region/cc-format-chooser.c
-@@ -168,7 +168,9 @@
+@@ -167,7 +167,9 @@ set_locale_id (GtkDialog   *chooser,
  
                  } else {
                          /* mark as unselected */
@@ -311,7 +311,7 @@
          g_list_free (children);
 --- a/panels/region/cc-input-chooser.c
 +++ b/panels/region/cc-input-chooser.c
-@@ -891,7 +891,7 @@
+@@ -897,7 +897,7 @@ get_ibus_locale_infos (GtkWidget *choose
            lang_code != NULL &&
            country_code != NULL)
          {
@@ -320,18 +320,21 @@
  
            info = g_hash_table_lookup (priv->locales, locale);
            if (info)
-@@ -1016,7 +1016,7 @@
-       if (!gnome_parse_locale (*locale, &lang_code, &country_code, NULL, NULL))
+@@ -1023,9 +1023,9 @@ get_locale_infos (GtkWidget *chooser)
          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 (country_code != NULL)
+-	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);
+       else
+-	simple_locale = g_strdup_printf ("%s.utf8", lang_code);
++	simple_locale = g_strdup_printf ("%s.UTF-8", lang_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
-@@ -424,6 +424,47 @@
+@@ -406,6 +406,47 @@ set_system_region (CcRegionPanel *self,
  }
  
  static void
@@ -379,7 +382,7 @@
  update_region (CcRegionPanel *self,
                 const gchar   *region)
  {
-@@ -434,6 +475,7 @@
+@@ -416,6 +457,7 @@ update_region (CcRegionPanel *self,
          } else {
                  if (g_strcmp0 (region, priv->region) == 0)
                          return;
@@ -387,7 +390,7 @@
                  g_settings_set_string (priv->locale_settings, KEY_REGION, region);
                  if (priv->login_auto_apply)
                          set_system_region (self, region);
-@@ -595,7 +637,7 @@
+@@ -577,7 +619,7 @@ update_region_from_setting (CcRegionPane
          CcRegionPanelPrivate *priv = self->priv;
  
          g_free (priv->region);
@@ -396,7 +399,7 @@
          update_region_label (self);
  }
  
-@@ -628,15 +670,17 @@
+@@ -610,15 +652,17 @@ static void
  update_language_from_user (CcRegionPanel *self)
  {
  	CcRegionPanelPrivate *priv = self->priv;
@@ -418,7 +421,7 @@
          update_language_label (self);
  }
  
-@@ -1484,6 +1528,16 @@
+@@ -1442,6 +1486,16 @@ setup_input_section (CcRegionPanel *self
          update_buttons (self);
  }
  
@@ -435,7 +438,7 @@
  static void
  on_localed_properties_changed (GDBusProxy     *proxy,
                                 GVariant       *changed_properties,
-@@ -1498,34 +1552,50 @@
+@@ -1456,34 +1510,50 @@ on_localed_properties_changed (GDBusProx
                  const gchar **strv;
                  gsize len;
                  gint i;
@@ -496,7 +499,7 @@
  
                  update_language_label (self);
          }
-@@ -1595,29 +1665,28 @@
+@@ -1553,29 +1623,28 @@ set_localed_locale (CcRegionPanel *self)
  	CcRegionPanelPrivate *priv = self->priv;
          GVariantBuilder *b;
          gchar *s;
@@ -542,45 +545,34 @@
                             g_variant_new ("(asb)", b, TRUE),
 --- a/panels/user-accounts/um-user-panel.c
 +++ b/panels/user-accounts/um-user-panel.c
-@@ -701,8 +701,9 @@
+@@ -704,8 +704,9 @@ show_user (ActUser *user, CcUserPanelPri
          cc_common_language_add_user_languages (model);
  
          lang = g_strdup (act_user_get_language (user));
 +        cc_common_language_get_locale (lang, &lang);
-         if (!lang)
+         if ((!lang || *lang == '\0') && act_user_get_uid (user) == getuid ()) {
 -                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);
-@@ -828,8 +829,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);
-@@ -849,6 +851,7 @@
+                 act_user_set_language (user, lang);
+         }
+ 
+@@ -925,6 +926,7 @@ language_changed (UmEditableCombo    *co
          GtkTreeModel *model;
          GtkTreeIter iter;
          gchar *lang;
 +        gchar *locale;
+         const gchar *current_language;
          ActUser *user;
- 
-         if (!um_editable_combo_get_active_iter (combo, &iter))
-@@ -859,8 +862,10 @@
+         gboolean self_selected;
+@@ -939,9 +941,10 @@ language_changed (UmEditableCombo    *co
          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, current_language) != 0) {
 +                if (g_strcmp0 (lang, locale) != 0) {
                          act_user_set_language (user, lang);
-                 }
-                 g_free (lang);
+ 
+                         if (self_selected)

=== modified file 'debian/patches/56_use_ubuntu_info_branding.patch'
--- debian/patches/56_use_ubuntu_info_branding.patch	2014-05-06 09:05:08 +0000
+++ debian/patches/56_use_ubuntu_info_branding.patch	2014-12-20 20:42:39 +0000
@@ -1,6 +1,8 @@
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -1561,6 +1561,8 @@
+Index: gnome-control-center/panels/info/cc-info-panel.c
+===================================================================
+--- gnome-control-center.orig/panels/info/cc-info-panel.c
++++ gnome-control-center/panels/info/cc-info-panel.c
+@@ -1481,6 +1481,8 @@ info_panel_setup_overview (CcInfoPanel
        g_free (text);
      }
  
@@ -9,19 +11,23 @@
    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 @@
+Index: gnome-control-center/panels/info/info.ui
+===================================================================
+--- gnome-control-center.orig/panels/info/info.ui
++++ gnome-control-center/panels/info/info.ui
+@@ -205,7 +205,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="resource">/org/gnome/control-center/info/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
+Index: gnome-control-center/panels/info/info.gresource.xml
+===================================================================
+--- gnome-control-center.orig/panels/info/info.gresource.xml
++++ gnome-control-center/panels/info/info.gresource.xml
 @@ -3,5 +3,6 @@
    <gresource prefix="/org/gnome/control-center/info">
      <file preprocess="xml-stripblanks">info.ui</file>

=== added file 'debian/patches/gcc_not_in_unity.patch'
--- debian/patches/gcc_not_in_unity.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/gcc_not_in_unity.patch	2014-12-20 20:42:39 +0000
@@ -0,0 +1,182 @@
+Index: gnome-control-center/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
++++ gnome-control-center/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
+@@ -7,7 +7,7 @@ Terminal=false
+ Type=Application
+ NoDisplay=true
+ Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-bluetooth
+Index: gnome-control-center/panels/color/gnome-color-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/color/gnome-color-panel.desktop.in.in
++++ gnome-control-center/panels/color/gnome-color-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=color
+Index: gnome-control-center/panels/display/gnome-display-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/display/gnome-display-panel.desktop.in.in
++++ gnome-control-center/panels/display/gnome-display-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=Screen resolution
+Index: gnome-control-center/panels/info/gnome-info-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/info/gnome-info-panel.desktop.in.in
++++ gnome-control-center/panels/info/gnome-info-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=info
+Index: gnome-control-center/panels/keyboard/gnome-keyboard-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/keyboard/gnome-keyboard-panel.desktop.in.in
++++ gnome-control-center/panels/keyboard/gnome-keyboard-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=keyboard
+Index: gnome-control-center/panels/mouse/gnome-mouse-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/mouse/gnome-mouse-panel.desktop.in.in
++++ gnome-control-center/panels/mouse/gnome-mouse-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=mouse
+Index: gnome-control-center/panels/network/gnome-network-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/network/gnome-network-panel.desktop.in.in
++++ gnome-control-center/panels/network/gnome-network-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=network
+Index: gnome-control-center/panels/power/gnome-power-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/power/gnome-power-panel.desktop.in.in
++++ gnome-control-center/panels/power/gnome-power-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;HardwareSettings;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=power
+Index: gnome-control-center/panels/universal-access/gnome-universal-access-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/universal-access/gnome-universal-access-panel.desktop.in.in
++++ gnome-control-center/panels/universal-access/gnome-universal-access-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=Universal Access
+Index: gnome-control-center/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
++++ gnome-control-center/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=user-accounts
+Index: gnome-control-center/panels/wacom/gnome-wacom-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/wacom/gnome-wacom-panel.desktop.in.in
++++ gnome-control-center/panels/wacom/gnome-wacom-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=wacom
+Index: gnome-control-center/shell/gnome-control-center.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/shell/gnome-control-center.desktop.in.in
++++ gnome-control-center/shell/gnome-control-center.desktop.in.in
+@@ -6,7 +6,7 @@ Terminal=false
+ Type=Application
+ StartupNotify=true
+ Categories=GNOME;GTK;System;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=shell
+Index: gnome-control-center/panels/region/gnome-region-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/region/gnome-region-panel.desktop.in.in
++++ gnome-control-center/panels/region/gnome-region-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=region
+Index: gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in
+===================================================================
+--- gnome-control-center.orig/panels/sound/data/gnome-sound-panel.desktop.in.in
++++ gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in
+@@ -8,7 +8,7 @@ Type=Application
+ NoDisplay=true
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
+-OnlyShowIn=GNOME;Unity;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=sound

=== removed file 'debian/patches/revert_automatic_timezone.patch'
--- debian/patches/revert_automatic_timezone.patch	2014-09-30 23:17:03 +0000
+++ debian/patches/revert_automatic_timezone.patch	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-From 6f07b9014326e3234af305743c94018117a6001b Mon Sep 17 00:00:00 2001
-From: Tim Lunn <[e-mail]>
-Date: Wed, 1 Oct 2014 08:04:06 +1000
-Subject: [PATCH] Revert "datetime: Show the automatic timezone switch"
-
-This reverts commit c68f9eca501b662fd819bab1ae021098a7cdaf9b.
----
- panels/datetime/cc-datetime-panel.c | 25 ++-----------------------
- panels/datetime/datetime.ui         |  1 -
- 2 files changed, 2 insertions(+), 24 deletions(-)
-
-diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
-index ec76d22..ec3cf0c 100644
---- a/panels/datetime/cc-datetime-panel.c
-+++ b/panels/datetime/cc-datetime-panel.c
-@@ -64,9 +64,6 @@ enum {
- 
- #define FILECHOOSER_SCHEMA "org.gtk.Settings.FileChooser"
- 
--#define DATETIME_SCHEMA "org.gnome.desktop.datetime"
--#define AUTO_TIMEZONE_KEY "automatic-timezone"
--
- struct _CcDateTimePanelPrivate
- {
-   GtkBuilder *builder;
-@@ -83,7 +80,6 @@ struct _CcDateTimePanelPrivate
-   GDateTime *date;
- 
-   GSettings *clock_settings;
--  GSettings *datetime_settings;
-   GSettings *filechooser_settings;
-   GDesktopClockFormat clock_format;
-   gboolean ampm_available;
-@@ -133,7 +129,6 @@ cc_date_time_panel_dispose (GObject *object)
-   g_clear_object (&priv->dtm);
-   g_clear_object (&priv->permission);
-   g_clear_object (&priv->clock_settings);
--  g_clear_object (&priv->datetime_settings);
-   g_clear_object (&priv->filechooser_settings);
- 
-   g_clear_pointer (&priv->date, g_date_time_unref);
-@@ -752,17 +747,15 @@ on_permission_changed (GPermission *permission,
-                        gpointer     data)
- {
-   CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv;
--  gboolean allowed, auto_timezone, using_ntp;
-+  gboolean allowed, using_ntp;
- 
-   allowed = (priv->permission == NULL || g_permission_get_allowed (priv->permission));
-   using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch")));
--  auto_timezone = gtk_switch_get_active (GTK_SWITCH (W("auto_timezone_switch")));
- 
-   /* All the widgets but the lock button and the 24h setting */
-   gtk_widget_set_sensitive (W("auto-datetime-row"), allowed);
--  gtk_widget_set_sensitive (W("auto-timezone-row"), allowed);
-   gtk_widget_set_sensitive (W("datetime-button"), allowed && !using_ntp);
--  gtk_widget_set_sensitive (W("timezone-button"), allowed && !auto_timezone);
-+  gtk_widget_set_sensitive (W("timezone-button"), allowed);
- 
-   /* Hide the subdialogs if we no longer have permissions */
-   if (!allowed)
-@@ -953,10 +946,6 @@ list_box_row_activated (GtkListBox      *listbox,
-     {
-       toggle_switch (W ("network_time_switch"));
-     }
--  else if (!g_strcmp0 (widget_name, "auto-timezone-row"))
--    {
--      toggle_switch (W ("auto_timezone_switch"));
--    }
-   else if ((found = g_strrstr (widget_name, "button")))
-     {
-       /* replace "button" with "dialog" */
-@@ -1292,16 +1281,6 @@ cc_date_time_panel_init (CcDateTimePanel *self)
-   g_signal_connect (W("network_time_switch"), "notify::active",
-                     G_CALLBACK (change_ntp), self);
- 
--  /* Timezone settings */
--  bind_switch_to_row (self,
--                      W ("auto_timezone_switch"),
--                      W ("timezone-button"));
--
--  priv->datetime_settings = g_settings_new (DATETIME_SCHEMA);
--  g_settings_bind (priv->datetime_settings, AUTO_TIMEZONE_KEY,
--                   W ("auto_timezone_switch"), "active",
--                   G_SETTINGS_BIND_DEFAULT);
--
-   /* Clock settings */
-   priv->clock_settings = g_settings_new (CLOCK_SCHEMA);
- 
-diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
-index c7cdcf2..0c01db6 100644
---- a/panels/datetime/datetime.ui
-+++ b/panels/datetime/datetime.ui
-@@ -548,7 +548,6 @@
-                 <property name="can_focus">True</property>
-                 <child>
-                   <object class="GtkBox" id="box3">
--                    <property name="visible">True</property>
-                     <property name="can_focus">False</property>
-                     <property name="spacing">50</property>
-                     <child>
--- 
-2.1.0
-
-

=== removed file 'debian/patches/revert_git_dont_hide_zoom.patch'
--- debian/patches/revert_git_dont_hide_zoom.patch	2014-09-23 23:45:16 +0000
+++ debian/patches/revert_git_dont_hide_zoom.patch	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-From c384570bace7055e5fb6b7e9208086e749fd325d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[e-mail]>
-Date: Fri, 09 Nov 2012 13:30:39 +0000
-Subject: universal-access: Always show the zoom options
-
-Now that the fallback mode is gone. #fallback
-
-https://bugzilla.gnome.org/show_bug.cgi?id=682862
----
---- a/panels/universal-access/cc-ua-panel.c
-+++ b/panels/universal-access/cc-ua-panel.c
-@@ -102,6 +102,7 @@
-   GSettings *application_settings;
- 
-   ZoomOptions *zoom_options;
-+  guint shell_watch_id;
- 
-   GtkAdjustment *focus_adjustment;
- 
-@@ -116,6 +117,12 @@
- {
-   CcUaPanelPrivate *priv = CC_UA_PANEL (object)->priv;
- 
-+  if (priv->shell_watch_id)
-+    {
-+      g_bus_unwatch_name (priv->shell_watch_id);
-+      priv->shell_watch_id = 0;
-+    }
-+
-   g_clear_object (&priv->builder);
-   g_slist_free_full (priv->toplevels, (GDestroyNotify)gtk_widget_destroy);
-   priv->toplevels = NULL;
-@@ -177,6 +184,29 @@
-   return (factor > DPI_FACTOR_NORMAL);
- }
- 
-+static void
-+shell_vanished_cb (GDBusConnection *connection,
-+		   const gchar *name,
-+		   CcUaPanel   *self)
-+{
-+  CcUaPanelPrivate *priv = self->priv;
-+
-+  gtk_widget_hide (WID ("zoom_label_box"));
-+  gtk_widget_hide (WID ("zoom_value_box"));
-+}
-+
-+static void
-+shell_appeared_cb (GDBusConnection *connection,
-+		   const gchar *name,
-+		   const gchar *name_owner,
-+		   CcUaPanel   *self)
-+{
-+  CcUaPanelPrivate *priv = self->priv;
-+
-+  gtk_widget_show (WID ("zoom_label_box"));
-+  gtk_widget_show (WID ("zoom_value_box"));
-+}
-+
- static gboolean
- get_large_text_mapping (GValue   *value,
-                         GVariant *variant,
-@@ -445,6 +475,13 @@
-                                 NULL);
- 
-   /* zoom */
-+  priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-+					   "org.gnome.Shell",
-+					   G_BUS_NAME_WATCHER_FLAGS_NONE,
-+					   (GBusNameAppearedCallback) shell_appeared_cb,
-+					   (GBusNameVanishedCallback) shell_vanished_cb,
-+					   self,
-+					   NULL);
- 
-   g_settings_bind_with_mapping (priv->application_settings, "screen-magnifier-enabled",
-                                 WID ("value_zoom"),

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-30 11:09:09 +0000
+++ debian/patches/series	2014-12-20 20:42:39 +0000
@@ -2,15 +2,15 @@
 #01_menu_category.patch
 06_handle_passwd_with_ldap.patch
 07_polkit_wheel_sudo_group.patch
+30_stack_overflow.patch
+31_printers_border.patch
 52_region_language.patch
 56_use_ubuntu_info_branding.patch
 64_restore_terminal_keyboard_shortcut.patch
 92_ubuntu_system_proxy.patch
 99_add_lock-on-suspend.patch
-revert_git_dont_hide_zoom.patch
 revert_git_drop_library.patch
 ubuntu_external_panels.patch
 ubuntu-gnome-version.patch
 revert_new_bluetooth.patch
 revert-bluetooth-BlueZ5-interface.patch
-revert_automatic_timezone.patch

=== modified file 'debian/patches/ubuntu_external_panels.patch'
--- debian/patches/ubuntu_external_panels.patch	2014-09-23 23:45:16 +0000
+++ debian/patches/ubuntu_external_panels.patch	2014-12-20 20:42:39 +0000
@@ -23,10 +23,10 @@
  shell/cc-window.c       |  95 ++++++++++++++++++++++++++++++++++++++++
  6 files changed, 220 insertions(+), 2 deletions(-)
 
-Index: gnome-control-center-3.12.1/configure.ac
+Index: gnome-control-center/configure.ac
 ===================================================================
---- gnome-control-center-3.12.1.orig/configure.ac
-+++ gnome-control-center-3.12.1/configure.ac
+--- gnome-control-center.orig/configure.ac
++++ gnome-control-center/configure.ac
 @@ -339,6 +339,9 @@ dnl ====================================
  dnl Panels
  dnl =======================================
@@ -37,24 +37,21 @@
  PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\""
  AC_SUBST(PANEL_CFLAGS)
  
-Index: gnome-control-center-3.12.1/shell/Makefile.am
-===================================================================
---- gnome-control-center-3.12.1.orig/shell/Makefile.am
-+++ gnome-control-center-3.12.1/shell/Makefile.am
-@@ -114,7 +114,8 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
- 
--AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
-+AM_CPPFLAGS =  -DGNOMELOCALEDIR="\"$(datadir)/locale\""    \
-+   -DPANELS_DIR="\"$(PANELS_DIR)\""
- 
- # Dbus service file
- servicefiledir = $(datadir)/dbus-1/services
-Index: gnome-control-center-3.12.1/shell/cc-panel-loader.c
-===================================================================
---- gnome-control-center-3.12.1.orig/shell/cc-panel-loader.c
-+++ gnome-control-center-3.12.1/shell/cc-panel-loader.c
+Index: gnome-control-center/shell/Makefile.am
+===================================================================
+--- gnome-control-center.orig/shell/Makefile.am
++++ gnome-control-center/shell/Makefile.am
+@@ -1,5 +1,6 @@
+ AM_CPPFLAGS =					\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
++    -DPANELS_DIR="\"$(PANELS_DIR)\"" \
+ 	-I$(top_srcdir)				\
+ 	$(SHELL_CFLAGS)				\
+ 	$(CHEESE_CFLAGS)			\
+Index: gnome-control-center/shell/cc-panel-loader.c
+===================================================================
+--- gnome-control-center.orig/shell/cc-panel-loader.c
++++ gnome-control-center/shell/cc-panel-loader.c
 @@ -26,6 +26,19 @@
  
  #include "cc-panel-loader.h"
@@ -212,10 +209,10 @@
  
    return g_object_new (get_type (),
                         "shell", shell,
-Index: gnome-control-center-3.12.1/shell/cc-panel-loader.h
+Index: gnome-control-center/shell/cc-panel-loader.h
 ===================================================================
---- gnome-control-center-3.12.1.orig/shell/cc-panel-loader.h
-+++ gnome-control-center-3.12.1/shell/cc-panel-loader.h
+--- gnome-control-center.orig/shell/cc-panel-loader.h
++++ gnome-control-center/shell/cc-panel-loader.h
 @@ -29,6 +29,7 @@
  G_BEGIN_DECLS
  
@@ -224,10 +221,10 @@
  GList   *cc_panel_loader_get_panels     (void);
  void     cc_panel_loader_add_option_groups (GOptionContext  *context,
                                              GVariantBuilder *builder);
-Index: gnome-control-center-3.12.1/shell/cc-panel.h
+Index: gnome-control-center/shell/cc-panel.h
 ===================================================================
---- gnome-control-center-3.12.1.orig/shell/cc-panel.h
-+++ gnome-control-center-3.12.1/shell/cc-panel.h
+--- gnome-control-center.orig/shell/cc-panel.h
++++ gnome-control-center/shell/cc-panel.h
 @@ -45,6 +45,14 @@ G_BEGIN_DECLS
  #define CC_PANEL_REGISTER(PluginName, plugin_name)                      \
    G_DEFINE_TYPE (PluginName, plugin_name, CC_TYPE_PANEL)
@@ -243,11 +240,11 @@
  typedef struct CcPanelPrivate CcPanelPrivate;
  
  typedef struct _CcPanel       CcPanel;
-Index: gnome-control-center-3.12.1/shell/cc-window.c
+Index: gnome-control-center/shell/cc-window.c
 ===================================================================
---- gnome-control-center-3.12.1.orig/shell/cc-window.c
-+++ gnome-control-center-3.12.1/shell/cc-window.c
-@@ -100,6 +100,8 @@ struct _CcWindowPrivate
+--- gnome-control-center.orig/shell/cc-window.c
++++ gnome-control-center/shell/cc-window.c
+@@ -101,6 +101,8 @@ struct _CcWindowPrivate
  
    CcPanel *active_panel;
  
@@ -256,7 +253,7 @@
    int monitor_num;
    CcSmallScreen small_screen;
  };
-@@ -139,6 +141,53 @@ get_icon_name_from_g_icon (GIcon *gicon)
+@@ -140,6 +142,53 @@ get_icon_name_from_g_icon (GIcon *gicon)
    return NULL;
  }
  
@@ -310,7 +307,7 @@
  static gboolean
  activate_panel (CcWindow           *self,
                  const gchar        *id,
-@@ -154,6 +203,16 @@ activate_panel (CcWindow           *self
+@@ -155,6 +204,16 @@ activate_panel (CcWindow           *self
      return FALSE;
  
    priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters));
@@ -327,7 +324,7 @@
    cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel));
    gtk_widget_show (priv->current_panel);
  
-@@ -874,9 +933,44 @@ setup_model (CcWindow *shell)
+@@ -878,9 +937,44 @@ setup_model (CcWindow *shell)
    add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System"));
  
    cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->priv->store));
@@ -372,7 +369,7 @@
  previous_button_clicked_cb (GtkButton *button,
                              CcWindow  *shell)
  {
-@@ -1447,6 +1541,9 @@ create_main_page (CcWindow *self)
+@@ -1452,6 +1546,9 @@ create_main_page (CcWindow *self)
  
    gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);