Merge lp:~darkxst/gnome-control-center/vanilla into lp:~robert-ancell/gnome-control-center/vanilla

[Tim Lunn]

[Robert Ancell (robert-ancell)]

This branch is not being maintained - you can make changes to g-c-c once u-c-c is the default.

Unmerged revisions

10. By Tim Lunn on 2014-02-10

uncomment buildflags

9. By Tim Lunn on 2014-01-18

[ Tim Lunn ]
* debian/control.in:
  - Add back libgnome-control-center packages
* debian/patches/52_region_language.patch:
  - Adapt region panel to use Ubuntu style regions and UTF-8
* 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:
  - Being 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

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 21:27:37 +0000
+++ debian/changelog	2014-01-18 01:26:36 +0000
@@ -1,5 +1,6 @@
-gnome-control-center (1:3.8.6-0ubuntu1+unity) UNRELEASED; urgency=low
+gnome-control-center (1:3.8.6-0ubuntu1+unity) UNRELEASED; urgency=medium
 
+  [ Robert Ancell ]
   * New upstream release
   * Drop all Unity customizations
   * debian/control:
@@ -15,6 +16,29 @@
   * debian/patches/git_iconview_columns.patch:
     - Set the number of columns, that seems needed with new GTK versions
 
+  [ Tim Lunn ]
+  * debian/control.in:
+    - Add back libgnome-control-center packages
+  * debian/patches/52_region_language.patch:
+    - Adapt region panel to use Ubuntu style regions and UTF-8 
+  * 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:
+    - Being 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
+
  -- Robert Ancell <[e-mail]>  Wed, 04 Dec 2013 11:03:26 +1300
 
 gnome-control-center (1:3.6.3-0ubuntu48) trusty; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-12-13 01:57:54 +0000
+++ debian/control	2014-01-18 01:26:36 +0000
@@ -140,3 +140,19 @@
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
+
+Package: libgnome-control-center-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libgnome-control-center1 (= ${binary:Version})
+Description: utilities to configure the GNOME desktop
+ This package contains the files needed to build Control Center panels
+
+Package: libgnome-control-center1
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: utilities to configure the GNOME desktop
+ This package contains the library used by Control Center panels

=== modified file 'debian/control.in'
--- debian/control.in	2013-12-13 01:57:54 +0000
+++ debian/control.in	2014-01-18 01:26:36 +0000
@@ -136,3 +136,19 @@
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
+
+Package: libgnome-control-center-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libgnome-control-center1 (= ${binary:Version})
+Description: utilities to configure the GNOME desktop
+ This package contains the files needed to build Control Center panels
+
+Package: libgnome-control-center1
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: utilities to configure the GNOME desktop
+ This package contains the library used by Control Center panels

=== modified file 'debian/libgnome-control-center1.symbols'
--- debian/libgnome-control-center1.symbols	2013-11-29 07:00:27 +0000
+++ debian/libgnome-control-center1.symbols	2014-01-18 01:26:36 +0000
@@ -1,18 +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_panel_get_display_name@Base 1:3.6.3-0ubuntu32
+ 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

=== 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-01-18 01:26:36 +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);

=== 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-01-18 01:26:36 +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"/>

=== 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-01-18 01:26:36 +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>

=== 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-01-18 01:26:36 +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
+

=== added file 'debian/patches/git-background-lock-screen.patch'
--- debian/patches/git-background-lock-screen.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-background-lock-screen.patch	2014-01-18 01:26:36 +0000
@@ -0,0 +1,862 @@
+From 5e7afdf89c5722f494ecaac6179e2aed256d1976 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <[e-mail]>
+Date: Mon, 19 Aug 2013 21:00:48 +0200
+Subject: [PATCH] background: Add support for lock screen background
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696166
+---
+ panels/background/background.ui         | 289 +++++++++++++++++++++++++-------
+ panels/background/cc-background-panel.c | 208 ++++++++++++++++-------
+ 2 files changed, 375 insertions(+), 122 deletions(-)
+
+diff --git a/panels/background/background.ui b/panels/background/background.ui
+index 77e9968..2b72502 100644
+--- a/panels/background/background.ui
++++ b/panels/background/background.ui
+@@ -4,115 +4,286 @@
+   <object class="GtkHBox" id="background-panel">
+     <property name="visible">True</property>
+     <property name="can_focus">False</property>
++    <property name="margin_left">6</property>
++    <property name="margin_right">6</property>
++    <property name="margin_top">6</property>
++    <property name="margin_bottom">6</property>
+     <property name="border_width">10</property>
+     <property name="spacing">12</property>
+-    <property name="margin-left">6</property>
+-    <property name="margin-right">6</property>
+-    <property name="margin-top">6</property>
+-    <property name="margin-bottom">6</property>
+     <child>
+-      <object class="GtkVBox" id="vbox3">
++      <object class="GtkBox" id="box1">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+-        <property name="spacing">6</property>
++        <property name="margin_top">100</property>
++        <property name="margin_bottom">100</property>
+         <child>
+-          <object class="GtkAspectFrame" id="aspectframe1">
++          <object class="GtkVBox" id="vbox3">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="margin_left">12</property>
+-            <property name="label_xalign">0</property>
+-            <property name="shadow_type">none</property>
+             <child>
+-              <object class="GtkButton" id="background-set-button">
+-                <property name="use_action_appearance">False</property>
++              <object class="GtkAspectFrame" id="aspectframe1">
+                 <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="valign">center</property>
++                <property name="can_focus">False</property>
++                <property name="margin_right">12</property>
++                <property name="label_xalign">0</property>
++                <property name="shadow_type">none</property>
+                 <child>
+-                  <object class="GtkDrawingArea" id="background-desktop-drawingarea">
+-                    <property name="width_request">417</property>
+-                    <property name="height_request">250</property>
++                  <object class="GtkButton" id="background-set-button">
+                     <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">True</property>
+                     <property name="valign">center</property>
+-                    <property name="margin_left">6</property>
+-                    <property name="margin_right">6</property>
+-                    <property name="margin_top">6</property>
+-                    <property name="margin_bottom">6</property>
+-                    <property name="hexpand">True</property>
+-                    <property name="vexpand">True</property>
++                    <child>
++                      <object class="GtkBox" id="box2">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="orientation">vertical</property>
++                        <child>
++                          <object class="GtkDrawingArea" id="background-desktop-drawingarea">
++                            <property name="width_request">310</property>
++                            <property name="height_request">170</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="valign">center</property>
++                            <property name="margin_left">6</property>
++                            <property name="margin_right">6</property>
++                            <property name="margin_top">6</property>
++                            <property name="margin_bottom">6</property>
++                            <property name="hexpand">True</property>
++                            <property name="vexpand">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkLabel" id="label1">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="label" translatable="yes">Background</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </object>
++                    </child>
+                   </object>
+                 </child>
+               </object>
++              <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+-          </object>
+-          <packing>
+-            <property name="expand">True</property>
+-            <property name="fill">True</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <object class="GtkHBox" id="bottom-hbox">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="spacing">12</property>
+             <child>
+-              <object class="GtkHBox" id="hbox2">
++              <object class="GtkHBox" id="bottom-hbox">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="halign">center</property>
+-                <property name="spacing">2</property>
++                <property name="spacing">12</property>
+                 <child>
+-                  <object class="GtkImage" id="slide_image">
++                  <object class="GtkHBox" id="hbox2">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="icon_name">slideshow-symbolic</property>
++                    <property name="halign">center</property>
++                    <property name="margin_top">12</property>
++                    <property name="spacing">2</property>
++                    <child>
++                      <object class="GtkImage" id="slide_image">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="icon_name">slideshow-symbolic</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="strut">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label"> </property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="slide-label">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="xalign">0</property>
++                        <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
+                   </object>
+                   <packing>
+-                    <property name="expand">False</property>
++                    <property name="expand">True</property>
+                     <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">2</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkVBox" id="vbox1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <child>
++              <object class="GtkAspectFrame" id="aspectframe2">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="margin_left">12</property>
++                <property name="label_xalign">0</property>
++                <property name="shadow_type">none</property>
+                 <child>
+-                  <object class="GtkLabel" id="strut">
++                  <object class="GtkButton" id="background-lock-set-button">
+                     <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="label"> </property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">True</property>
++                    <property name="valign">center</property>
++                    <child>
++                      <object class="GtkBox" id="box3">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="orientation">vertical</property>
++                        <child>
++                          <object class="GtkDrawingArea" id="background-lock-drawingarea">
++                            <property name="width_request">310</property>
++                            <property name="height_request">170</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="valign">center</property>
++                            <property name="margin_left">6</property>
++                            <property name="margin_right">6</property>
++                            <property name="margin_top">6</property>
++                            <property name="margin_bottom">6</property>
++                            <property name="hexpand">True</property>
++                            <property name="vexpand">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkLabel" id="label2">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="label" translatable="yes">Lock Screen</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </object>
++                    </child>
+                   </object>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">1</property>
+-                  </packing>
+                 </child>
++              </object>
++              <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkHBox" id="bottom-hbox1">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="spacing">12</property>
+                 <child>
+-                  <object class="GtkLabel" id="slide-label">
++                  <object class="GtkHBox" id="hbox1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="xalign">0</property>
+-                    <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
++                    <property name="halign">center</property>
++                    <property name="margin_top">12</property>
++                    <property name="spacing">2</property>
++                    <child>
++                      <object class="GtkImage" id="slide_image1">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="icon_name">slideshow-symbolic</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="strut1">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label"> </property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="slide-label1">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="xalign">0</property>
++                        <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
+                   </object>
+                   <packing>
+-                    <property name="expand">False</property>
++                    <property name="expand">True</property>
+                     <property name="fill">True</property>
+-                    <property name="position">1</property>
++                    <property name="position">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="expand">True</property>
++                <property name="expand">False</property>
+                 <property name="fill">True</property>
+-                <property name="position">0</property>
++                <property name="position">2</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
+-            <property name="position">2</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
+index 14fa244..8de6e23 100644
+--- a/panels/background/cc-background-panel.c
++++ b/panels/background/cc-background-panel.c
+@@ -38,6 +38,7 @@
+ #include "bg-pictures-source.h"
+ 
+ #define WP_PATH_ID "org.gnome.desktop.background"
++#define WP_LOCK_PATH_ID "org.gnome.desktop.screensaver"
+ #define WP_URI_KEY "picture-uri"
+ #define WP_OPTIONS_KEY "picture-options"
+ #define WP_SHADING_KEY "color-shading-type"
+@@ -55,10 +56,12 @@ struct _CcBackgroundPanelPrivate
+   GDBusConnection *connection;
+ 
+   GSettings *settings;
++  GSettings *lock_settings;
+ 
+   GnomeDesktopThumbnailFactory *thumb_factory;
+ 
+   CcBackgroundItem *current_background;
++  CcBackgroundItem *current_lock_background;
+ 
+   GCancellable *copy_cancellable;
+   GCancellable *capture_cancellable;
+@@ -71,6 +74,8 @@ struct _CcBackgroundPanelPrivate
+ };
+ 
+ #define WID(y) (GtkWidget *) gtk_builder_get_object (priv->builder, y)
++#define CURRENT_BG (settings == priv->settings ? priv->current_background : priv->current_lock_background)
++#define SAVE_PATH (settings == priv->settings ? "last-edited.xml" : "last-edited-lock.xml")
+ 
+ static const char *
+ cc_background_panel_get_help_uri (CcPanel *panel)
+@@ -89,6 +94,7 @@ cc_background_panel_dispose (GObject *object)
+   priv->spinner = NULL;
+ 
+   g_clear_object (&priv->settings);
++  g_clear_object (&priv->lock_settings);
+ 
+   if (priv->copy_cancellable)
+     {
+@@ -131,6 +137,7 @@ cc_background_panel_finalize (GObject *object)
+   CcBackgroundPanelPrivate *priv = CC_BACKGROUND_PANEL (object)->priv;
+ 
+   g_clear_object (&priv->current_background);
++  g_clear_object (&priv->current_lock_background);
+ 
+   G_OBJECT_CLASS (cc_background_panel_parent_class)->finalize (object);
+ }
+@@ -151,59 +158,77 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
+ 
+ static void
+ update_preview (CcBackgroundPanelPrivate *priv,
++                GSettings                *settings,
+                 CcBackgroundItem         *item)
+ {
+   gboolean changes_with_time;
++  CcBackgroundItem *current_background;
++
++  current_background = CURRENT_BG;
+ 
+-  if (item && priv->current_background)
++  if (item && current_background)
+     {
+-      g_object_unref (priv->current_background);
+-      priv->current_background = cc_background_item_copy (item);
+-      cc_background_item_load (priv->current_background, NULL);
++      g_object_unref (current_background);
++      current_background = cc_background_item_copy (item);
++      if (settings == priv->settings)
++        priv->current_background = current_background;
++      else
++        priv->current_lock_background = current_background;
++      cc_background_item_load (current_background, NULL);
+     }
+ 
+   changes_with_time = FALSE;
+ 
+-  if (priv->current_background)
++  if (current_background)
+     {
+-      changes_with_time = cc_background_item_changes_with_time (priv->current_background);
++      changes_with_time = cc_background_item_changes_with_time (current_background);
+     }
+ 
+-  gtk_widget_set_visible (WID ("slide_image"), changes_with_time);
+-  gtk_widget_set_visible (WID ("slide-label"), changes_with_time);
++  if (settings == priv->settings)
++    {
++      gtk_widget_set_visible (WID ("slide_image"), changes_with_time);
++      gtk_widget_set_visible (WID ("slide-label"), changes_with_time);
++
++      gtk_widget_queue_draw (WID ("background-desktop-drawingarea"));
++    }
++  else
++    {
++      gtk_widget_set_visible (WID ("slide_image1"), changes_with_time);
++      gtk_widget_set_visible (WID ("slide-label1"), changes_with_time);
+ 
+-  gtk_widget_queue_draw (WID ("background-desktop-drawingarea"));
++      gtk_widget_queue_draw (WID ("background-lock-drawingarea"));
++    }
+ }
+ 
+ static char *
+-get_save_path (void)
++get_save_path (const char *filename)
+ {
+   return g_build_filename (g_get_user_config_dir (),
+                            "gnome-control-center",
+                            "backgrounds",
+-                           "last-edited.xml",
++                           filename,
+                            NULL);
+ }
+ 
+ static void
+-update_display_preview (CcBackgroundPanel *panel)
++update_display_preview (CcBackgroundPanel *panel,
++                        GtkWidget         *widget,
++                        CcBackgroundItem  *current_background)
+ {
+   CcBackgroundPanelPrivate *priv = panel->priv;
+-  GtkWidget *widget;
+   GtkAllocation allocation;
+-  const gint preview_width = 416;
+-  const gint preview_height = 248;
++  const gint preview_width = 309;
++  const gint preview_height = 168;
+   GdkPixbuf *pixbuf;
+   GIcon *icon;
+   cairo_t *cr;
+ 
+-  widget = WID ("background-desktop-drawingarea");
+   gtk_widget_get_allocation (widget, &allocation);
+ 
+-  if (!priv->current_background)
++  if (!current_background)
+     return;
+ 
+-  icon = cc_background_item_get_frame_thumbnail (priv->current_background,
++  icon = cc_background_item_get_frame_thumbnail (current_background,
+                                                  priv->thumb_factory,
+                                                  preview_width,
+                                                  preview_height,
+@@ -218,11 +243,14 @@ update_display_preview (CcBackgroundPanel *panel)
+   g_object_unref (pixbuf);
+ 
+   pixbuf = NULL;
+-  if (panel->priv->display_screenshot != NULL)
+-    pixbuf = gdk_pixbuf_scale_simple (panel->priv->display_screenshot,
+-                                      preview_width,
+-                                      preview_height,
+-                                      GDK_INTERP_BILINEAR);
++  if (current_background == priv->current_background &&
++      panel->priv->display_screenshot != NULL)
++    {
++      pixbuf = gdk_pixbuf_scale_simple (panel->priv->display_screenshot,
++                                        preview_width,
++                                        preview_height,
++                                        GDK_INTERP_BILINEAR);
++    }
+ 
+   if (pixbuf)
+     {
+@@ -271,6 +299,7 @@ on_screenshot_finished (GObject *source,
+              error->message);
+     g_error_free (error);
+     /* fallback? */
++    priv = panel->priv;
+     goto out;
+   }
+   g_variant_unref (result);
+@@ -322,7 +351,7 @@ on_screenshot_finished (GObject *source,
+   cairo_surface_destroy (surface);
+ 
+  out:
+-  update_display_preview (panel);
++  update_display_preview (panel, WID ("background-desktop-drawingarea"), priv->current_background);
+ }
+ 
+ static gboolean
+@@ -407,6 +436,7 @@ on_preview_draw (GtkWidget         *widget,
+                  cairo_t           *cr,
+                  CcBackgroundPanel *panel)
+ {
++  CcBackgroundPanelPrivate *priv = panel->priv;
+   /* we have another shot in flight or an existing cache */
+   if (panel->priv->display_screenshot == NULL
+       && panel->priv->screenshot_path == NULL)
+@@ -414,13 +444,24 @@ on_preview_draw (GtkWidget         *widget,
+       get_screenshot_async (panel);
+     }
+   else
+-    update_display_preview (panel);
++    update_display_preview (panel, widget, priv->current_background);
++
++  return TRUE;
++}
+ 
++static gboolean
++on_lock_preview_draw (GtkWidget         *widget,
++                      cairo_t           *cr,
++                      CcBackgroundPanel *panel)
++{
++  CcBackgroundPanelPrivate *priv = panel->priv;
++  update_display_preview (panel, widget, priv->current_lock_background);
+   return TRUE;
+ }
+ 
+ static void
+-reload_current_bg (CcBackgroundPanel *self)
++reload_current_bg (CcBackgroundPanel *self,
++                   GSettings         *settings)
+ {
+   CcBackgroundPanelPrivate *priv;
+   CcBackgroundItem *saved, *configured;
+@@ -429,12 +470,12 @@ reload_current_bg (CcBackgroundPanel *self)
+   priv = self->priv;
+ 
+   /* Load the saved configuration */
+-  uri = get_save_path ();
++  uri = get_save_path (SAVE_PATH);
+   saved = cc_background_xml_get_item (uri);
+   g_free (uri);
+ 
+   /* initalise the current background information from settings */
+-  uri = g_settings_get_string (priv->settings, WP_URI_KEY);
++  uri = g_settings_get_string (settings, WP_URI_KEY);
+   if (uri && *uri == '\0')
+     {
+       g_free (uri);
+@@ -450,12 +491,12 @@ reload_current_bg (CcBackgroundPanel *self)
+   configured = cc_background_item_new (uri);
+   g_free (uri);
+ 
+-  pcolor = g_settings_get_string (priv->settings, WP_PCOLOR_KEY);
+-  scolor = g_settings_get_string (priv->settings, WP_SCOLOR_KEY);
++  pcolor = g_settings_get_string (settings, WP_PCOLOR_KEY);
++  scolor = g_settings_get_string (settings, WP_SCOLOR_KEY);
+   g_object_set (G_OBJECT (configured),
+                 "name", _("Current background"),
+-                "placement", g_settings_get_enum (priv->settings, WP_OPTIONS_KEY),
+-                "shading", g_settings_get_enum (priv->settings, WP_SHADING_KEY),
++                "placement", g_settings_get_enum (settings, WP_OPTIONS_KEY),
++                "shading", g_settings_get_enum (settings, WP_SHADING_KEY),
+                 "primary-color", pcolor,
+                 "secondary-color", scolor,
+                 NULL);
+@@ -479,9 +520,17 @@ reload_current_bg (CcBackgroundPanel *self)
+   if (saved != NULL)
+     g_object_unref (saved);
+ 
+-  g_clear_object (&priv->current_background);
+-  priv->current_background = configured;
+-  cc_background_item_load (priv->current_background, NULL);
++  if (settings == priv->settings)
++    {
++      g_clear_object (&priv->current_background);
++      priv->current_background = configured;
++    }
++  else
++    {
++      g_clear_object (&priv->current_lock_background);
++      priv->current_lock_background = configured;
++    }
++  cc_background_item_load (configured, NULL);
+ }
+ 
+ static gboolean
+@@ -512,6 +561,8 @@ copy_finished_cb (GObject      *source_object,
+   CcBackgroundPanel *panel = (CcBackgroundPanel *) pointer;
+   CcBackgroundPanelPrivate *priv = panel->priv;
+   CcBackgroundItem *item;
++  CcBackgroundItem *current_background;
++  GSettings *settings;
+ 
+   if (!g_file_copy_finish (G_FILE (source_object), result, &err))
+     {
+@@ -523,8 +574,10 @@ copy_finished_cb (GObject      *source_object,
+       g_error_free (err);
+     }
+   item = g_object_get_data (source_object, "item");
++  settings = g_object_get_data (source_object, "settings");
++  current_background = CURRENT_BG;
+ 
+-  g_settings_apply (priv->settings);
++  g_settings_apply (settings);
+ 
+   /* the panel may have been destroyed before the callback is run, so be sure
+    * to check the widgets are not NULL */
+@@ -535,19 +588,19 @@ copy_finished_cb (GObject      *source_object,
+       priv->spinner = NULL;
+     }
+ 
+-  if (priv->current_background)
+-    cc_background_item_load (priv->current_background, NULL);
++  if (current_background)
++    cc_background_item_load (current_background, NULL);
+ 
+   if (priv->builder)
+     {
+       char *filename;
+ 
+-      update_preview (priv, item);
++      update_preview (priv, settings, item);
+ 
+       /* Save the source XML if there is one */
+-      filename = get_save_path ();
++      filename = get_save_path (SAVE_PATH);
+       if (create_save_dir ())
+-        cc_background_xml_save (priv->current_background, filename);
++        cc_background_xml_save (current_background, filename);
+     }
+ 
+   /* remove the reference taken when the copy was set up */
+@@ -556,6 +609,7 @@ copy_finished_cb (GObject      *source_object,
+ 
+ static void
+ set_background (CcBackgroundPanel *panel,
++                GSettings         *settings,
+                 CcBackgroundItem  *item)
+ {
+   CcBackgroundPanelPrivate *priv = panel->priv;
+@@ -573,8 +627,8 @@ set_background (CcBackgroundPanel *panel,
+ 
+   if ((flags & CC_BACKGROUND_ITEM_HAS_URI) && uri == NULL)
+     {
+-      g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, G_DESKTOP_BACKGROUND_STYLE_NONE);
+-      g_settings_set_string (priv->settings, WP_URI_KEY, "");
++      g_settings_set_enum (settings, WP_OPTIONS_KEY, G_DESKTOP_BACKGROUND_STYLE_NONE);
++      g_settings_set_string (settings, WP_URI_KEY, "");
+     }
+   else if (cc_background_item_get_source_url (item) != NULL &&
+            cc_background_item_get_needs_download (item))
+@@ -631,6 +685,7 @@ set_background (CcBackgroundPanel *panel,
+        * finished */
+       g_object_ref (panel);
+       g_object_set_data_full (G_OBJECT (source), "item", g_object_ref (item), g_object_unref);
++      g_object_set_data (G_OBJECT (source), "settings", settings);
+       g_file_copy_async (source, dest, G_FILE_COPY_OVERWRITE,
+                          G_PRIORITY_DEFAULT, priv->copy_cancellable,
+                          NULL, NULL,
+@@ -639,7 +694,7 @@ set_background (CcBackgroundPanel *panel,
+       dest_uri = g_file_get_uri (dest);
+       g_object_unref (dest);
+ 
+-      g_settings_set_string (priv->settings, WP_URI_KEY, dest_uri);
++      g_settings_set_string (settings, WP_URI_KEY, dest_uri);
+       g_object_set (G_OBJECT (item),
+                     "uri", dest_uri,
+                     "needs-download", FALSE,
+@@ -653,37 +708,37 @@ set_background (CcBackgroundPanel *panel,
+     }
+   else
+     {
+-      g_settings_set_string (priv->settings, WP_URI_KEY, uri);
++      g_settings_set_string (settings, WP_URI_KEY, uri);
+     }
+ 
+   /* Also set the placement if we have a URI and the previous value was none */
+   if (flags & CC_BACKGROUND_ITEM_HAS_PLACEMENT)
+     {
+-      g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
++      g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
+     }
+   else if (uri != NULL)
+     {
+-      style = g_settings_get_enum (priv->settings, WP_OPTIONS_KEY);
++      style = g_settings_get_enum (settings, WP_OPTIONS_KEY);
+       if (style == G_DESKTOP_BACKGROUND_STYLE_NONE)
+-        g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
++        g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
+     }
+ 
+   if (flags & CC_BACKGROUND_ITEM_HAS_SHADING)
+-    g_settings_set_enum (priv->settings, WP_SHADING_KEY, cc_background_item_get_shading (item));
++    g_settings_set_enum (settings, WP_SHADING_KEY, cc_background_item_get_shading (item));
+ 
+-  g_settings_set_string (priv->settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item));
+-  g_settings_set_string (priv->settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item));
++  g_settings_set_string (settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item));
++  g_settings_set_string (settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item));
+ 
+   /* update the preview information */
+   if (save_settings != FALSE)
+     {
+       /* Apply all changes */
+-      g_settings_apply (priv->settings);
++      g_settings_apply (settings);
+ 
+       /* Save the source XML if there is one */
+-      filename = get_save_path ();
++      filename = get_save_path (SAVE_PATH);
+       if (create_save_dir ())
+-        cc_background_xml_save (priv->current_background, filename);
++        cc_background_xml_save (CURRENT_BG, filename);
+     }
+ }
+ 
+@@ -699,7 +754,7 @@ on_chooser_dialog_response (GtkDialog         *dialog,
+       item = cc_background_chooser_dialog_get_item (CC_BACKGROUND_CHOOSER_DIALOG (dialog));
+       if (item != NULL)
+         {
+-          set_background (self, item);
++          set_background (self, g_object_get_data (G_OBJECT (dialog), "settings"), item);
+           g_object_unref (item);
+         }
+     }
+@@ -708,13 +763,14 @@ on_chooser_dialog_response (GtkDialog         *dialog,
+ }
+ 
+ static void
+-on_background_button_clicked (GtkButton         *button,
+-                              CcBackgroundPanel *self)
++launch_chooser (CcBackgroundPanel *self,
++                GSettings         *settings)
+ {
+   CcBackgroundPanelPrivate *priv = self->priv;
+   GtkWidget *dialog;
+ 
+   dialog = cc_background_chooser_dialog_new ();
++  g_object_set_data (G_OBJECT (dialog), "settings", settings);
+   gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                 GTK_WINDOW (gtk_widget_get_toplevel (WID ("background-panel"))));
+   gtk_widget_show (dialog);
+@@ -724,12 +780,26 @@ on_background_button_clicked (GtkButton         *button,
+ }
+ 
+ static void
++on_background_button_clicked (GtkButton         *button,
++                              CcBackgroundPanel *self)
++{
++  launch_chooser (self, self->priv->settings);
++}
++
++static void
++on_lock_button_clicked (GtkButton         *button,
++                        CcBackgroundPanel *self)
++{
++  launch_chooser (self, self->priv->lock_settings);
++}
++
++static void
+ on_settings_changed (GSettings         *settings,
+                      gchar             *key,
+                      CcBackgroundPanel *self)
+ {
+-  reload_current_bg (self);
+-  update_preview (self->priv, NULL);
++  reload_current_bg (self, settings);
++  update_preview (self->priv, settings, NULL);
+ }
+ 
+ static void
+@@ -760,6 +830,9 @@ cc_background_panel_init (CcBackgroundPanel *self)
+   priv->settings = g_settings_new (WP_PATH_ID);
+   g_settings_delay (priv->settings);
+ 
++  priv->lock_settings = g_settings_new (WP_LOCK_PATH_ID);
++  g_settings_delay (priv->lock_settings);
++
+   /* add the top level widget */
+   widget = WID ("background-panel");
+ 
+@@ -768,19 +841,28 @@ cc_background_panel_init (CcBackgroundPanel *self)
+ 
+   /* setup preview area */
+   widget = WID ("background-desktop-drawingarea");
+-  g_signal_connect (widget, "draw", G_CALLBACK (on_preview_draw),
+-                    self);
++  g_signal_connect (widget, "draw", G_CALLBACK (on_preview_draw), self);
++  widget = WID ("background-lock-drawingarea");
++  g_signal_connect (widget, "draw", G_CALLBACK (on_lock_preview_draw), self);
+ 
+   priv->copy_cancellable = g_cancellable_new ();
+   priv->capture_cancellable = g_cancellable_new ();
+ 
+   priv->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+ 
+-  reload_current_bg (self);
+-  update_preview (priv, NULL);
++  /* Load the backgrounds */
++  reload_current_bg (self, priv->settings);
++  update_preview (priv, priv->settings, NULL);
++  reload_current_bg (self, priv->lock_settings);
++  update_preview (priv, priv->lock_settings, NULL);
+ 
++  /* Background settings */
+   g_signal_connect (priv->settings, "changed", G_CALLBACK (on_settings_changed), self);
++  g_signal_connect (priv->lock_settings, "changed", G_CALLBACK (on_settings_changed), self);
+ 
++  /* Background buttons */
+   widget = WID ("background-set-button");
+   g_signal_connect (widget, "clicked", G_CALLBACK (on_background_button_clicked), self);
++  widget = WID ("background-lock-set-button");
++  g_signal_connect (widget, "clicked", G_CALLBACK (on_lock_button_clicked), self);
+ }
+-- 
+1.8.3.1

=== added file 'debian/patches/git-background-remove-unused-widget.patch'
--- debian/patches/git-background-remove-unused-widget.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-background-remove-unused-widget.patch	2014-01-18 01:26:36 +0000
@@ -0,0 +1,111 @@
+From dd56de9653361d17a300aeb7872f152a7e2de356 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <[e-mail]>
+Date: Mon, 19 Aug 2013 20:55:29 +0200
+Subject: [PATCH] background: Remove unused "lock" preview widgets
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696166
+---
+ panels/background/background.ui | 60 ++++++++++-------------------------------
+ 1 file changed, 14 insertions(+), 46 deletions(-)
+
+diff --git a/panels/background/background.ui b/panels/background/background.ui
+index 651cf69..77e9968 100644
+--- a/panels/background/background.ui
++++ b/panels/background/background.ui
+@@ -30,48 +30,18 @@
+                 <property name="receives_default">True</property>
+                 <property name="valign">center</property>
+                 <child>
+-                  <object class="GtkBox" id="box1">
++                  <object class="GtkDrawingArea" id="background-desktop-drawingarea">
++                    <property name="width_request">417</property>
++                    <property name="height_request">250</property>
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
++                    <property name="valign">center</property>
++                    <property name="margin_left">6</property>
++                    <property name="margin_right">6</property>
++                    <property name="margin_top">6</property>
++                    <property name="margin_bottom">6</property>
+                     <property name="hexpand">True</property>
+-                    <property name="spacing">18</property>
+-                    <child>
+-                      <object class="GtkDrawingArea" id="background-desktop-drawingarea">
+-                        <property name="width_request">417</property>
+-                        <property name="height_request">250</property>
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="valign">center</property>
+-                        <property name="margin_left">6</property>
+-                        <property name="margin_right">6</property>
+-                        <property name="margin_top">6</property>
+-                        <property name="margin_bottom">6</property>
+-                        <property name="hexpand">True</property>
+-                        <property name="vexpand">True</property>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkDrawingArea" id="background-lock-drawingarea">
+-                        <property name="can_focus">False</property>
+-                        <property name="no_show_all">True</property>
+-                        <property name="valign">center</property>
+-                        <property name="margin_left">6</property>
+-                        <property name="margin_right">6</property>
+-                        <property name="margin_top">6</property>
+-                        <property name="hexpand">True</property>
+-                        <property name="vexpand">True</property>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">1</property>
+-                      </packing>
+-                    </child>
++                    <property name="vexpand">True</property>
+                   </object>
+                 </child>
+               </object>
+@@ -107,11 +77,10 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkLabel" id="slide-label">
++                  <object class="GtkLabel" id="strut">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="xalign">0</property>
+-                    <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
++                    <property name="label"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -120,10 +89,11 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkLabel" id="strut">
++                  <object class="GtkLabel" id="slide-label">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="label"> </property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -200,8 +170,6 @@
+   <object class="GtkSizeGroup" id="sizegroup">
+     <property name="mode">vertical</property>
+     <widgets>
+-      <widget name="sources-combobox"/>
+-      <widget name="heading-hbox"/>
+       <widget name="slide-label"/>
+       <widget name="strut"/>
+     </widgets>
+-- 
+1.8.3.1

=== added file 'debian/patches/git_rename_natural_scrolling.patch'
--- debian/patches/git_rename_natural_scrolling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_rename_natural_scrolling.patch	2014-01-18 01:26:36 +0000
@@ -0,0 +1,26 @@
+From 92148a4be791614eaf4582ea540cff82e27134de Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <[e-mail]>
+Date: Tue, 11 Jun 2013 12:58:28 +0000
+Subject: mouse: Rename "Content sticks to fingers"
+
+...to "Natural scrolling". The previous name was a little bit
+disgusting, and people didn't understand its purpose. Using the
+same name as OSX means that people will either know it, or be less
+afraid of testing it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=689128
+---
+diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
+index cd77080..3735903 100644
+--- a/panels/mouse/gnome-mouse-properties.ui
++++ b/panels/mouse/gnome-mouse-properties.ui
+@@ -655,7 +655,7 @@
+                                 </child>
+                                 <child>
+                                   <object class="GtkCheckButton" id="natural_scroll_toggle">
+-                                    <property name="label" translatable="yes">C_ontent sticks to fingers</property>
++                                    <property name="label" translatable="yes" comments="Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. ">_Natural scrolling</property>
+                                     <property name="use_action_appearance">False</property>
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+

=== added file 'debian/patches/revert_git_dont_hide_zoom.patch'
--- debian/patches/revert_git_dont_hide_zoom.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert_git_dont_hide_zoom.patch	2014-01-18 01:26:36 +0000
@@ -0,0 +1,78 @@
+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
+---
+Index: gnome-control-center-3.8.3/panels/universal-access/cc-ua-panel.c
+===================================================================
+--- gnome-control-center-3.8.3.orig/panels/universal-access/cc-ua-panel.c	2013-06-11 20:04:34.087380775 -0400
++++ gnome-control-center-3.8.3/panels/universal-access/cc-ua-panel.c	2013-06-11 20:04:34.083380775 -0400
+@@ -60,6 +60,7 @@
+   GSettings *mediakeys_settings;
+ 
+   ZoomOptions *zoom_options;
++  guint shell_watch_id;
+ };
+ 
+ 
+@@ -94,6 +95,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;
++    }
++
+   if (priv->builder)
+     {
+       g_object_unref (priv->builder);
+@@ -300,6 +307,29 @@
+ 	g_free (text);
+ }
+ 
++static void
++shell_vanished_cb (GDBusConnection *connection,
++		   const gchar *name,
++		   CcUaPanel   *self)
++{
++  CcUaPanelPrivate *priv = self->priv;
++
++  gtk_widget_hide (WID (priv->builder, "zoom_label_box"));
++  gtk_widget_hide (WID (priv->builder, "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 (priv->builder, "zoom_label_box"));
++  gtk_widget_show (WID (priv->builder, "zoom_value_box"));
++}
++
+ static gboolean
+ get_large_text_mapping (GValue   *value,
+                         GVariant *variant,
+@@ -401,6 +431,13 @@
+                    WID (priv->builder, "seeing_toggle_keys_switch"), "active",
+                    G_SETTINGS_BIND_DEFAULT);
+ 
++  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_signal_connect (WID (priv->builder, "seeing_zoom_preferences_button"),
+                     "clicked",
+                     G_CALLBACK (zoom_options_launch_cb), self);

=== added file 'debian/patches/revert_git_drop_library.patch'
--- debian/patches/revert_git_drop_library.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert_git_drop_library.patch	2014-01-18 01:26:36 +0000
@@ -0,0 +1,170 @@
+From bf89fe818409d237dd2af14bc33326aed8edcaea Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Sun, 28 Apr 2013 15:10:00 +1000
+Subject: [PATCH 1/2] revert git drop library
+
+---
+ configure.ac                        | 15 +++++++++++-
+ panels/common/Makefile.am           |  3 +++
+ shell/Makefile.am                   | 47 ++++++++++++++++++++++++++++++-------
+ shell/libgnome-control-center.pc.in | 12 ++++++++++
+ 4 files changed, 68 insertions(+), 9 deletions(-)
+ create mode 100644 shell/libgnome-control-center.pc.in
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@
+ LT_PREREQ([2.2])
+ LT_INIT
+ 
++# .so version for libgnome-control-center
++LIBGNOMECONTROLCENTER_CURRENT=1
++LIBGNOMECONTROLCENTER_REVISION=0
++LIBGNOMECONTROLCENTER_AGE=0
++AC_SUBST(LIBGNOMECONTROLCENTER_CURRENT)
++AC_SUBST(LIBGNOMECONTROLCENTER_REVISION)
++AC_SUBST(LIBGNOMECONTROLCENTER_AGE)
++
++
+ # Internationalization support
+ 
+ IT_PROG_INTLTOOL([0.40.1])
+@@ -326,9 +335,12 @@
+ PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\""
+ AC_SUBST(PANEL_CFLAGS)
+ 
+-PANEL_LIBS=""
++PANEL_LIBS="\$(top_builddir)/shell/libgnome-control-center.la"
+ AC_SUBST(PANEL_LIBS)
+ 
++PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
++AC_SUBST(PANEL_LDFLAGS)
++
+ dnl ==============================================
+ dnl libsocialweb
+ dnl ==============================================
+@@ -426,6 +438,7 @@
+ 
+ AC_CONFIG_FILES([
+ Makefile
++shell/libgnome-control-center.pc
+ panels/Makefile
+ panels/common/Makefile
+ panels/background/Makefile
+--- a/panels/common/Makefile.am
++++ b/panels/common/Makefile.am
+@@ -21,8 +21,11 @@
+ 	cc-language-chooser.h
+ 
+ liblanguage_la_LIBADD = 		\
++	$(PANEL_LIBS)			    \
+ 	$(LIBLANGUAGE_LIBS)
+ 
++liblanguage_la_LDFLAGS = $(PANEL_LDFLAGS)
++
+ resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/common.gresource.xml)
+ cc-common-resources.c: common.gresource.xml $(resource_files)
+ 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_common $<
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -28,14 +28,8 @@
+ 	cc-shell-category-view.h		\
+ 	cc-shell-item-view.c			\
+ 	cc-shell-item-view.h			\
+-	cc-editable-entry.c			\
+-	cc-editable-entry.h			\
+-	cc-panel-loader.c			\
+-	cc-panel-loader.h			\
+-	cc-panel.c				\
+-	cc-panel.h				\
+-	cc-shell.c				\
+-	cc-shell.h				\
++        cc-panel-loader.c                       \
++        cc-panel-loader.h                       \
+ 	hostname-helper.c			\
+ 	hostname-helper.h			\
+ 	cc-hostname-entry.c			\
+@@ -44,8 +38,43 @@
+ 
+ gnome_control_center_LDFLAGS = -export-dynamic
+ 
++lib_LTLIBRARIES = libgnome-control-center.la
++
++libgnome_control_center_include_HEADERS =      \
++	cc-panel.h                              \
++	cc-shell.h                              \
++	cc-editable-entry.h			\
++	$(NULL)
++
++libgnome_control_center_la_SOURCES =		\
++	cc-panel.c				\
++	cc-panel.h				\
++	cc-shell.c				\
++	cc-shell.h				\
++	cc-editable-entry.c			\
++	cc-editable-entry.h			\
++	$(NULL)
++
++libgnome_control_center_la_LDFLAGS =		\
++	-no-undefined				\
++	-version-info $(LIBGNOMECONTROLCENTER_CURRENT):$(LIBGNOMECONTROLCENTER_REVISION):$(LIBGNOMECONTROLCENTER_AGE) \
++        $(LIBGD_LIBS)                           \
++	$(NULL)
++
++libgnome_control_center_la_LIBADD = 		\
++	$(LIBGNOME_CONTROL_CENTER_LIBS)		\
++	$(NULL)
++
++libgnome_control_center_la_LIBTOOLFLAGS = --tag=disable-static
++
++libgnome_control_center_includedir = $(includedir)/gnome-control-center-1/libgnome-control-center
++
++pkgconfigdir=$(libdir)/pkgconfig
++pkgconfig_DATA=libgnome-control-center.pc
++
+ gnome_control_center_LDADD =						\
+ 	libshell.la							\
++	libgnome-control-center.la					\
+ 	$(SHELL_LIBS)							\
+ 	$(CHEESE_LIBS)							\
+ 	$(top_builddir)/libgd/libgd.la					\
+@@ -99,6 +128,8 @@
+ 
+ EXTRA_DIST =					\
+ 	gnome-control-center.desktop.in.in	\
++	libgnome-control-center.pc.in  		\
++	$(servicefile_in_files)                 \
+ 	$(completion_in_files)			\
+ 	list-panel.sh
+ 
+--- /dev/null
++++ b/shell/libgnome-control-center.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++extensiondir=@libdir@/control-center-1/panels
++
++Name: libgnome-control-center
++Description: A library to create GNOME Control Center extensions
++Version: @VERSION@
++Requires: glib-2.0 gio-2.0 gtk+-3.0
++Libs: -L${libdir} -lgnome-control-center
++Cflags: -I${includedir}/gnome-control-center-1
+\ No newline at end of file
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,6 +34,12 @@
+ 
+ -include $(top_srcdir)/git.mk
+ 
++libgnome-control-center.la:
++	cd shell && $(MAKE) $(AM_MAKEFLAGS) libgnome-control-center.la
++
++BUILT_SOURCES = libgnome-control-center.la
++
++
+ dist-hook:
+ 	@if test -d "$(srcdir)/.git"; \
+ 	then \

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 21:27:37 +0000
+++ debian/patches/series	2014-01-18 01:26:36 +0000
@@ -2,3 +2,14 @@
 git_iconview_columns.patch
 01_hide_in_unity.patch
 02_new_goa.patch
+52_region_language.patch
+64_restore_terminal_keyboard_shortcut.patch
+92_ubuntu_system_proxy.patch
+99_add_lock-on-suspend.patch
+revert_git_dont_hide_zoom.patch
+git-background-remove-unused-widget.patch
+git-background-lock-screen.patch
+git_rename_natural_scrolling.patch
+revert_git_drop_library.patch
+ubuntu_external_panels.patch
+

=== added file 'debian/patches/ubuntu_external_panels.patch'
--- debian/patches/ubuntu_external_panels.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_external_panels.patch	2014-01-18 01:26:36 +0000
@@ -0,0 +1,372 @@
+From 740aa2c73a11501a1059f1715a9618fcced42ee9 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Sun, 28 Apr 2013 11:59:58 +1000
+Subject: [PATCH] Reimplement support for loading external panels
+
+Also brings back support for hiding icons based on XDG_CURRENT_DESKTOP
+and the ShowIn values in desktop files.
+
+This does not re-implement the gmenu loading code. So for now we
+just look for a desktop file in the following format
+gnome-'panelname'-panel.desktop or 'panelname'-ccpanel.desktop.
+launchers (that are not actual modules) are loaded from the static
+list all_launchers, hard-coded into the patch.
+
+Any external module that use the following macro will need to change
+CC_PANEL_REGISTER() -> CC_PANEL_REGISTER_EXTERNAL()
+---
+ configure.ac            |   3 ++
+ shell/Makefile.am       |   3 +-
+ shell/cc-panel-loader.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++-
+ shell/cc-panel-loader.h |   1 +
+ shell/cc-panel.h        |   8 ++++
+ shell/cc-window.c       |  95 ++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 220 insertions(+), 2 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -341,6 +341,9 @@
+ dnl Panels
+ dnl =======================================
+ 
++PANELS_DIR="${libdir}/control-center-1/panels"
++AC_SUBST(PANELS_DIR)
++
+ PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\""
+ AC_SUBST(PANEL_CFLAGS)
+ 
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -113,7 +113,8 @@
+ 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)\""
+ 
+ sysdir = $(datadir)/applications
+ sys_in_files = gnome-control-center.desktop.in
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -26,6 +26,19 @@
+ 
+ #include "cc-panel-loader.h"
+ 
++/* This is a list of desktop file launchers that should be loaded
++where they are available */
++static struct {
++  const char *name;
++} all_launchers[] = {
++  {"gufw"},
++  {"landscape-client-settings"},
++  {"language-selector"},
++  {"software-properties-gtk"},
++  {"system-config-printer"},
++  {"ubuntuone-installer"},
++};
++
+ #ifndef CC_PANEL_LOADER_NO_GTYPES
+ 
+ /* Extension points */
+@@ -149,6 +162,37 @@
+   return retval;
+ }
+ 
++static gboolean
++parse_show_in (GDesktopAppInfo *app)
++{
++  const char *env;
++  gboolean result;
++
++  env = g_getenv ("XDG_CURRENT_DESKTOP");
++  result = g_desktop_app_info_get_show_in (app, env);
++
++  return result;
++}
++
++static gboolean
++cc_panel_loader_add_item (CcShellModel *model, const char *name, GDesktopAppInfo *app )
++{
++  int category;
++  gboolean show;
++
++  category = parse_categories (app);
++  if (G_UNLIKELY (category < 0))
++    return FALSE;
++
++  show = parse_show_in (app);
++  if (!show)
++    return FALSE;
++
++  cc_shell_model_add_item (model, category, G_APP_INFO (app), name);
++
++  return TRUE;
++}
++
+ void
+ cc_panel_loader_fill_model (CcShellModel *model)
+ {
+@@ -159,6 +203,7 @@
+       GDesktopAppInfo *app;
+       char *desktop_name;
+       int category;
++      gboolean show;
+ 
+       desktop_name = g_strconcat ("gnome-", all_panels[i].name,
+                                   "-panel.desktop", NULL);
+@@ -176,11 +221,80 @@
+       if (G_UNLIKELY (category < 0))
+         continue;
+ 
++      show = parse_show_in (app);
++      if (!show)
++        continue;
++
+       cc_shell_model_add_item (model, category, G_APP_INFO (app), all_panels[i].name);
+       g_object_unref (app);
+     }
+ }
+ 
++void
++cc_panel_loader_external_fill_model (CcShellModel *model, GIOExtensionPoint *extension_point)
++{
++  GList *panels, *l;
++  /* Load native panel modules/plugins */
++  panels = g_io_extension_point_get_extensions (extension_point);
++
++  for (l = panels; l != NULL; l = l->next)
++    {
++      GIOExtension *extension;
++      const gchar *name;
++
++      GDesktopAppInfo *app;
++      char *desktop_name;
++
++      extension = l->data;
++
++      name = g_io_extension_get_name (extension);
++
++      desktop_name = g_strconcat ("gnome-", name, "-panel.desktop", NULL);
++      app = g_desktop_app_info_new (desktop_name);
++      g_free (desktop_name);
++
++      if (app == NULL) {
++        desktop_name = g_strconcat (name, "-ccpanel.desktop", NULL);
++        app = g_desktop_app_info_new (desktop_name);
++        g_free (desktop_name);
++      }
++
++      if (app == NULL)
++        {
++          g_warning ("Ignoring broken panel %s (missing desktop file)",
++                     name);
++          continue;
++        }
++      cc_panel_loader_add_item(model, name, app);
++      g_object_unref (app);
++
++  }
++  g_list_free (l);
++
++  /* Load desktop launchers */
++  int i;
++
++  for (i = 0; i < G_N_ELEMENTS (all_launchers); i++)
++    {
++      GDesktopAppInfo *app;
++      char *desktop_name;
++
++      desktop_name = g_strconcat (all_launchers[i].name, ".desktop", NULL);
++      app = g_desktop_app_info_new (desktop_name);
++      g_free (desktop_name);
++
++      if (app == NULL)
++        {
++          g_warning ("Ignoring launcher %s (missing desktop file)",
++                     all_launchers[i].name);
++          continue;
++        }
++      cc_panel_loader_add_item(model, all_launchers[i].name, app);
++      g_object_unref (app);
++    }
++
++}
++
+ #ifndef CC_PANEL_LOADER_NO_GTYPES
+ 
+ static GHashTable *panel_types;
+@@ -208,7 +322,8 @@
+   ensure_panel_types ();
+ 
+   get_type = g_hash_table_lookup (panel_types, name);
+-  g_return_val_if_fail (get_type != NULL, NULL);
++  if (get_type == NULL)
++    return NULL;
+ 
+   return g_object_new (get_type (),
+                        "shell", shell,
+--- a/shell/cc-panel-loader.h
++++ b/shell/cc-panel-loader.h
+@@ -29,6 +29,7 @@
+ G_BEGIN_DECLS
+ 
+ void     cc_panel_loader_fill_model     (CcShellModel  *model);
++void     cc_panel_loader_external_fill_model     (CcShellModel  *model, GIOExtensionPoint *extension_point);
+ GList   *cc_panel_loader_get_panels     (void);
+ CcPanel *cc_panel_loader_load_by_name   (CcShell       *shell,
+                                          const char    *name,
+--- a/shell/cc-panel.h
++++ b/shell/cc-panel.h
+@@ -46,6 +46,14 @@
+ #define CC_PANEL_REGISTER(PluginName, plugin_name)                      \
+   G_DEFINE_TYPE (PluginName, plugin_name, CC_TYPE_PANEL)
+ 
++#define CC_PANEL_REGISTER_EXTERNAL(PluginName, plugin_name)             \
++  G_DEFINE_TYPE_WITH_CODE (PluginName, plugin_name, CC_TYPE_PANEL,      \
++  GIOExtensionPoint *ep;                                                \
++  ep = g_io_extension_point_register ("CcPanel");                       \
++  g_io_extension_point_set_required_type (ep, CC_TYPE_PANEL);           \
++  g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,       \
++  g_define_type_id, PANEL_ID, 0))
++
+ typedef struct CcPanelPrivate CcPanelPrivate;
+ 
+ typedef struct _CcPanel       CcPanel;
+--- a/shell/cc-window.c
++++ b/shell/cc-window.c
+@@ -97,6 +97,8 @@
+ 
+   CcPanel *active_panel;
+ 
++  GIOExtensionPoint *extension_point;
++
+   int monitor_num;
+   CcSmallScreen small_screen;
+ };
+@@ -136,6 +138,53 @@
+   return NULL;
+ }
+ 
++static CcPanel *
++external_load_by_id (CcWindow     *self,
++                     const char   *name,
++                     const gchar **argv)
++{
++  CcWindowPrivate *priv = self->priv;
++  GIOExtension *extension;
++  GType panel_type = G_TYPE_INVALID;
++
++  /* check if there is an plugin that implements this panel */
++  extension = g_io_extension_point_get_extension_by_name (priv->extension_point, name);
++  if (extension)
++    panel_type = g_io_extension_get_type (extension);
++
++  if (panel_type == G_TYPE_INVALID)
++    {
++      g_warning ("Could not find the loadable module for panel '%s'", name);
++      return NULL;
++    }
++
++  return g_object_new (panel_type,
++                       "shell", CC_SHELL (self),
++                       "argv", argv,
++                       NULL);
++}
++
++static void
++external_launch_by_id (const char *name)
++{
++  GDesktopAppInfo *app;
++  char *desktop_name;
++  const char *command;
++
++  desktop_name = g_strconcat (name, ".desktop", NULL);
++  app = g_desktop_app_info_new (desktop_name);
++  g_free (desktop_name);
++
++  command = g_app_info_get_executable ( G_APP_INFO (app));
++
++  if (command && command[0])
++    {
++      g_spawn_command_line_async (command, NULL);
++    }
++  g_object_unref (app);
++
++}
++
+ static gboolean
+ activate_panel (CcWindow           *self,
+                 const gchar        *id,
+@@ -151,6 +200,17 @@
+     return FALSE;
+ 
+   priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, argv));
++  if (!priv->current_panel)
++    {
++      priv->current_panel = GTK_WIDGET (external_load_by_id(self, id, argv));
++      if (!priv->current_panel)
++        {
++          external_launch_by_id (id);
++          return FALSE;
++        }
++    }
++
++
+   cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel));
+   gtk_widget_show (priv->current_panel);
+ 
+@@ -863,8 +923,43 @@
+   add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System"));
+ 
+   cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->priv->store));
++  cc_panel_loader_external_fill_model (CC_SHELL_MODEL (shell->priv->store),shell->priv->extension_point);
++}
++
++static void
++load_panel_plugins (CcWindow *shell)
++{
++  GList *modules;
++  GList *panels, *l;
++
++  /* only allow this function to be run once to prevent modules being loaded
++   * twice
++   */
++
++  if (shell->priv->extension_point)
++    return;
++
++  /* make sure the base type is registered */
++  g_type_from_name ("CcPanel");
++
++  shell->priv->extension_point
++    = g_io_extension_point_register (CC_SHELL_PANEL_EXTENSION_POINT);
++
++  /* load all the plugins in the panels directory */
++  modules = g_io_modules_load_all_in_directory (PANELS_DIR);
++
++  panels = g_io_extension_point_get_extensions (shell->priv->extension_point);
++
++  for (l = panels; l != NULL; l= l->next)
++    {
++       g_debug ("modules %s", g_io_extension_get_name (l->data));
++    }
++  g_list_free (l);
++  g_list_free (modules);
+ }
+ 
++
++
+ static void
+ previous_button_clicked_cb (GtkButton *button,
+                             CcWindow  *shell)
+@@ -1398,6 +1493,9 @@
+ 
+   gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);
+ 
++  /* load the panels that are implemented as plugins */
++  load_panel_plugins (self);
++
+   /* load the available settings panels */
+   setup_model (self);
+ }