gnome-base/gnome-settings-daemon: 3.2.0 → 3.2.1

Bump with numerous fixes all over the place. Lots of patches were applied
upstream. Drop the DPMS failure patch since with recent changes to
gnome-desktop it should no longer be needed.

17 files changed, 21 insertions, 963 deletions

diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0001-power-Don-t-restore-the-brightness-if-it-s-never-bee.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0001-power-Don-t-restore-the-brightness-if-it-s-never-bee.patch
deleted file mode 100644
index 5eafa269..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0001-power-Don-t-restore-the-brightness-if-it-s-never-bee.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7e9ff82377c6ada10554037c873f53b0fd8fe949 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 23 Sep 2011 12:21:51 +0100
-Subject: [PATCH 01/10] power: Don't restore the brightness if it's never been
- set
-
----
- plugins/power/gsd-power-manager.c |   23 +++++++++++++----------
- 1 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index b528a97..f118642 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -2743,15 +2743,18 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
-                         g_clear_error (&error);
-                 }
- 
--                ret = backlight_set_abs (manager,
--                                         manager->priv->pre_dim_brightness,
--                                         &error);
--                if (!ret) {
--                        g_warning ("failed to restore backlight to %i: %s",
--                                   manager->priv->pre_dim_brightness,
--                                   error->message);
--                        g_error_free (error);
--                        return;
-+                /* reset brightness if we dimmed */
-+                if (manager->priv->pre_dim_brightness >= 0) {
-+                        ret = backlight_set_abs (manager,
-+                                                 manager->priv->pre_dim_brightness,
-+                                                 &error);
-+                        if (!ret) {
-+                                g_warning ("failed to restore backlight to %i: %s",
-+                                           manager->priv->pre_dim_brightness,
-+                                           error->message);
-+                                g_error_free (error);
-+                                return;
-+                        }
-                 }
-         }
- }
-@@ -3298,7 +3301,7 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           manager);
- 
-         manager->priv->kbd_brightness_old = -1;
--        manager->priv->pre_dim_brightness = 100;
-+        manager->priv->pre_dim_brightness = -1;
-         manager->priv->settings = g_settings_new (GSD_POWER_SETTINGS_SCHEMA);
-         g_signal_connect (manager->priv->settings, "changed",
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0002-power-Fix-two-small-reference-leaks-when-using-the-D.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0002-power-Fix-two-small-reference-leaks-when-using-the-D.patch
deleted file mode 100644
index 4ef7b20a..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0002-power-Fix-two-small-reference-leaks-when-using-the-D.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f24306a2fa496b6f6f2e7c00173834030882d7d5 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 26 Sep 2011 10:06:13 +0100
-Subject: [PATCH 02/10] power: Fix two small reference leaks when using the
- D-Bus interface
-
-Resolves: https://bugzilla.gnome.org/show_bug.cgi?id=660079
----
- plugins/power/gsd-power-manager.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index f118642..d786977 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -3726,6 +3726,7 @@ handle_method_call_main (GsdPowerManager *manager,
-                 value = device_to_variant_blob (device);
-                 tuple = g_variant_new_tuple (&value, 1);
-                 g_dbus_method_invocation_return_value (invocation, tuple);
-+                g_object_unref (device);
-                 return;
-         }
- 
-@@ -3736,7 +3737,7 @@ handle_method_call_main (GsdPowerManager *manager,
-                 builder = g_variant_builder_new (G_VARIANT_TYPE("a(susdut)"));
- 
-                 /* add each tuple to the array */
--                array = g_ptr_array_ref (manager->priv->devices_array);
-+                array = manager->priv->devices_array;
-                 for (i=0; i<array->len; i++) {
-                         device = g_ptr_array_index (array, i);
-                         value = device_to_variant_blob (device);
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0003-common-Remove-left-over-debug.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0003-common-Remove-left-over-debug.patch
deleted file mode 100644
index 545d69fe..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0003-common-Remove-left-over-debug.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 15d30558108fcdfe4c688b38a06214427801be78 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 27 Sep 2011 10:20:21 +0100
-Subject: [PATCH 05/10] common: Remove left-over debug
-
-Spotted by Matthias Clasen <mclasen@redhat.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660073
----
- plugins/common/gsd-input-helper.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
-index a2a0451..7b605bf 100644
---- a/plugins/common/gsd-input-helper.c
-+++ b/plugins/common/gsd-input-helper.c
-@@ -345,7 +345,6 @@ get_disabled_devices (GdkDeviceManager *manager)
- 
-                 /* Check whether the device is actually available */
-                 device = gdk_x11_device_manager_lookup (manager, device_info[i].id);
--                g_message ("checking whether we have a device for %d: %s", device_info[i].id, device ? "yes" : "no");
-                 if (device != NULL)
-                         continue;
- 
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0004-power-media-keys-xrandr-Use-a-GCancellable-for-g_bus.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0004-power-media-keys-xrandr-Use-a-GCancellable-for-g_bus.patch
deleted file mode 100644
index 82c74721..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0004-power-media-keys-xrandr-Use-a-GCancellable-for-g_bus.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 573889e0be2f39f894dfaebedf72b6ae4b626554 Mon Sep 17 00:00:00 2001
-From: Rodrigo Moya <rodrigo@gnome-db.org>
-Date: Thu, 29 Sep 2011 11:57:12 +0200
-Subject: [PATCH 07/10] power, media-keys, xrandr: Use a GCancellable for
- g_bus_get calls so that they can be cancelled
-
----
- plugins/media-keys/gsd-media-keys-manager.c |   16 +++++++++++++++-
- plugins/power/gsd-power-manager.c           |   16 +++++++++++++++-
- plugins/xrandr/gsd-xrandr-manager.c         |   16 +++++++++++++++-
- 3 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index c2ddf96..522bf1e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -130,6 +130,7 @@ struct GsdMediaKeysManagerPrivate
- 
-         GDBusNodeInfo   *introspection_data;
-         GDBusConnection *connection;
-+        GCancellable    *bus_cancellable;
-         GDBusProxy      *xrandr_proxy;
-         GCancellable    *cancellable;
- 
-@@ -1753,6 +1754,12 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
- 
-         g_debug ("Stopping media_keys manager");
- 
-+        if (priv->bus_cancellable != NULL) {
-+                g_cancellable_cancel (priv->bus_cancellable);
-+                g_object_unref (priv->bus_cancellable);
-+                priv->bus_cancellable = NULL;
-+        }
-+
-         for (ls = priv->screens; ls != NULL; ls = ls->next) {
-                 gdk_window_remove_filter (gdk_screen_get_root_window (ls->data),
-                                           (GdkFilterFunc) acme_filter_events,
-@@ -1980,6 +1987,12 @@ on_bus_gotten (GObject             *source_object,
-         GDBusConnection *connection;
-         GError *error = NULL;
- 
-+        if (manager->priv->bus_cancellable == NULL ||
-+            g_cancellable_is_cancelled (manager->priv->bus_cancellable)) {
-+                g_warning ("Operation has been cancelled, so not retrieving session bus");
-+                return;
-+        }
-+
-         connection = g_bus_get_finish (res, &error);
-         if (connection == NULL) {
-                 g_warning ("Could not get session bus: %s", error->message);
-@@ -2031,10 +2044,11 @@ static void
- register_manager (GsdMediaKeysManager *manager)
- {
-         manager->priv->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
-+        manager->priv->bus_cancellable = g_cancellable_new ();
-         g_assert (manager->priv->introspection_data != NULL);
- 
-         g_bus_get (G_BUS_TYPE_SESSION,
--                   NULL,
-+                   manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
- }
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index d786977..370d90d 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -157,6 +157,7 @@ struct GsdPowerManagerPrivate
-         UpClient                *up_client;
-         GDBusNodeInfo           *introspection_data;
-         GDBusConnection         *connection;
-+        GCancellable            *bus_cancellable;
-         GDBusProxy              *upower_proxy;
-         GDBusProxy              *upower_kdb_proxy;
-         gint                     kbd_brightness_now;
-@@ -3454,6 +3455,12 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->bus_cancellable != NULL) {
-+                g_cancellable_cancel (manager->priv->bus_cancellable);
-+                g_object_unref (manager->priv->bus_cancellable);
-+                manager->priv->bus_cancellable = NULL;
-+        }
-+
-         if (manager->priv->introspection_data) {
-                 g_dbus_node_info_unref (manager->priv->introspection_data);
-                 manager->priv->introspection_data = NULL;
-@@ -3842,6 +3849,12 @@ on_bus_gotten (GObject             *source_object,
-         GError *error = NULL;
-         guint i;
- 
-+        if (manager->priv->bus_cancellable == NULL ||
-+            g_cancellable_is_cancelled (manager->priv->bus_cancellable)) {
-+                g_warning ("Operation has been cancelled, so not retrieving session bus");
-+                return;
-+        }
-+
-         connection = g_bus_get_finish (res, &error);
-         if (connection == NULL) {
-                 g_warning ("Could not get session bus: %s", error->message);
-@@ -3865,10 +3878,11 @@ static void
- register_manager_dbus (GsdPowerManager *manager)
- {
-         manager->priv->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
-+        manager->priv->bus_cancellable = g_cancellable_new ();
-         g_assert (manager->priv->introspection_data != NULL);
- 
-         g_bus_get (G_BUS_TYPE_SESSION,
--                   NULL,
-+                   manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
- }
-diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 4ccf5d1..8b12ddd 100644
---- a/plugins/xrandr/gsd-xrandr-manager.c
-+++ b/plugins/xrandr/gsd-xrandr-manager.c
-@@ -104,6 +104,7 @@ struct GsdXrandrManagerPrivate
-         GSettings       *settings;
-         GDBusNodeInfo   *introspection_data;
-         GDBusConnection *connection;
-+        GCancellable    *bus_cancellable;
- 
-         /* fn-F7 status */
-         int             current_fn_f7_config;             /* -1 if no configs */
-@@ -1899,6 +1900,12 @@ gsd_xrandr_manager_stop (GsdXrandrManager *manager)
- 
-         manager->priv->running = FALSE;
- 
-+        if (manager->priv->bus_cancellable != NULL) {
-+                g_cancellable_cancel (manager->priv->bus_cancellable);
-+                g_object_unref (manager->priv->bus_cancellable);
-+                manager->priv->bus_cancellable = NULL;
-+        }
-+
-         if (manager->priv->settings != NULL) {
-                 g_object_unref (manager->priv->settings);
-                 manager->priv->settings = NULL;
-@@ -2066,6 +2073,12 @@ on_bus_gotten (GObject             *source_object,
-         GDBusConnection *connection;
-         GError *error = NULL;
- 
-+        if (manager->priv->bus_cancellable == NULL ||
-+            g_cancellable_is_cancelled (manager->priv->bus_cancellable)) {
-+                g_warning ("Operation has been cancelled, so not retrieving session bus");
-+                return;
-+        }
-+
-         connection = g_bus_get_finish (res, &error);
-         if (connection == NULL) {
-                 g_warning ("Could not get session bus: %s", error->message);
-@@ -2087,10 +2100,11 @@ static void
- register_manager_dbus (GsdXrandrManager *manager)
- {
-         manager->priv->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
-+        manager->priv->bus_cancellable = g_cancellable_new ();
-         g_assert (manager->priv->introspection_data != NULL);
- 
-         g_bus_get (G_BUS_TYPE_SESSION,
--                   NULL,
-+                   manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
- }
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0005-power-Do-not-sleep-on-idle-by-default.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0005-power-Do-not-sleep-on-idle-by-default.patch
deleted file mode 100644
index ffad009b..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0005-power-Do-not-sleep-on-idle-by-default.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 378e3037ac09b8851ad83261930295f3eceb590c Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Thu, 29 Sep 2011 15:04:22 +0100
-Subject: [PATCH 08/10] power: Do not sleep-on-idle by default
-
-We do not actually read the boolean keys in gnome-settings-daemon due to
-a mixup when the UI was re-designed. We can just change the default of
-the timeout key (that we do read...) to zero to change "never" to be
-the default.
-
-Note: we're not actually going to remove the unused keys from the schema
-like we did in master, otherwise upgrading the g-s-d package whilst
-the control center is open is going to make it explode.
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660395
----
- ...settings-daemon.plugins.power.gschema.xml.in.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-index 665192f..d2d4b48 100644
---- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-@@ -46,7 +46,7 @@
-       <description>Whether to put the computer to sleep when inactive on AC power.</description>
-     </key>
-     <key name="sleep-inactive-ac-timeout" type="i">
--      <default>1800</default>
-+      <default>0</default>
-       <summary>Sleep timeout computer when on AC</summary>
-       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep.</description>
-     </key>
-@@ -61,7 +61,7 @@
-       <description>Whether to put the computer to sleep when inactive on battery power.</description>
-     </key>
-     <key name="sleep-inactive-battery-timeout" type="i">
--      <default>1800</default>
-+      <default>0</default>
-       <summary>Sleep timeout computer when on battery</summary>
-       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</description>
-     </key>
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0006-media-keys-Don-t-assert-if-the-user-sets-the-button-.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0006-media-keys-Don-t-assert-if-the-user-sets-the-button-.patch
deleted file mode 100644
index f4a87751..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0006-media-keys-Don-t-assert-if-the-user-sets-the-button-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From df730ed9372fb74a0785afcf18df8da27af81280 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 30 Sep 2011 14:48:17 +0100
-Subject: [PATCH 09/10] media-keys: Don't assert if the user sets the
- 'button-power' action to 'shutdown'
-
-If the user sets the 'button-power' action to 'shutdown' then we want to show
-the interactive session shutdown window and not just assert.
-
-Actually doing the shutdown without warning is a recipe for disaster in case
-the user has _accidentally_ pressed the button...
----
- plugins/media-keys/gsd-media-keys-manager.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 522bf1e..b97207a 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -1283,6 +1283,7 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                 }
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-+        case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
-@@ -1294,7 +1295,6 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                         g_error_free (error);
-                 }
-                 break;
--        case GSD_POWER_ACTION_SHUTDOWN:
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-                 /* these actions cannot be handled by media-keys and
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0007-media-keys-Don-t-assert-if-the-user-sets-the-button-.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0007-media-keys-Don-t-assert-if-the-user-sets-the-button-.patch
deleted file mode 100644
index ad65c4f1..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0007-media-keys-Don-t-assert-if-the-user-sets-the-button-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2630585238a2fce1725d9d74bbdb95dd743d78fc Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 30 Sep 2011 14:50:35 +0100
-Subject: [PATCH 10/10] media-keys: Don't assert if the user sets the
- 'button-power' action to 'nothing'
-
-Afterall, it's a valid action.
----
- plugins/media-keys/gsd-media-keys-manager.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index b97207a..3a4d5c5 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -1299,7 +1299,6 @@ do_config_power_action (GsdMediaKeysManager *manager,
-         case GSD_POWER_ACTION_NOTHING:
-                 /* these actions cannot be handled by media-keys and
-                  * are not used in this context */
--                g_assert_not_reached ();
-                 break;
-         }
- }
--- 
-1.7.6.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0008-printers-Fix-build-on-systems-without-LC_PAPER.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0008-printers-Fix-build-on-systems-without-LC_PAPER.patch
deleted file mode 100644
index b936a006..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0008-printers-Fix-build-on-systems-without-LC_PAPER.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 512bac5200ad439083348ce447bf6106b9d78ca1 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 3 Oct 2011 11:28:28 +0100
-Subject: [PATCH 1/8] printers: Fix build on systems without LC_PAPER
-
-By using gtk_paper_size_get_default() directly to do all
-the hard work for us.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660626
----
- plugins/print-notifications/gsd-printer.c |   29 +++++++++--------------------
- 1 files changed, 9 insertions(+), 20 deletions(-)
-
-diff --git a/plugins/print-notifications/gsd-printer.c b/plugins/print-notifications/gsd-printer.c
-index 70676d4..aa405bc 100644
---- a/plugins/print-notifications/gsd-printer.c
-+++ b/plugins/print-notifications/gsd-printer.c
-@@ -24,6 +24,7 @@
- #include <libnotify/notify.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-+#include <gtk/gtk.h>
- #include <cups/cups.h>
- #include <cups/ppd.h>
- 
-@@ -751,9 +752,8 @@ set_default_paper_size (const gchar *printer_name,
-         GVariant    *output;
-         GError      *error = NULL;
-         gchar      **value = NULL;
--        gchar       *paper_size;
--        char        *locale;
-         gint         i, j, k;
-+        const gchar *paper_size;
- 
-         proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                G_DBUS_PROXY_FLAGS_NONE,
-@@ -770,24 +770,14 @@ set_default_paper_size (const gchar *printer_name,
-                 return;
-         }
- 
--        /* Set default PaperSize according to the locale */
--        locale = setlocale (LC_PAPER, NULL);
--        if (!locale)
--                locale = setlocale (LC_MESSAGES, NULL);
--
--        if (!locale) {
--                g_object_unref (proxy);
--                return;
--        }
--
--        /* CLDR 2.0 alpha
--         * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/territory_language_information.html
--         */
--        if (g_regex_match_simple ("[^_.@]{2,3}_(BZ|CA|CL|CO|CR|GT|MX|NI|PA|PH|PR|SV|US|VE)",
--                                  locale, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED))
--                paper_size = g_strdup ("Letter");
-+        /* Set default PaperSize according to the locale
-+         * FIXME: Handle more than A4 and Letter:
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=660769 */
-+        paper_size = gtk_paper_size_get_default ();
-+        if (g_str_equal (paper_size, GTK_PAPER_NAME_LETTER))
-+                paper_size = "Letter";
-         else
--                paper_size = g_strdup ("A4");
-+                paper_size = "A4";
- 
-         if (ppd_file_name) {
-                 ppd_file = ppdOpenFile (ppd_file_name);
-@@ -842,7 +832,6 @@ set_default_paper_size (const gchar *printer_name,
-                 g_strfreev (value);
-         }
- 
--        g_free (paper_size);
-         g_object_unref (proxy);
- }
- 
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0009-power-Do-not-revert-to-the-pre-idle-brightness-if-id.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0009-power-Do-not-revert-to-the-pre-idle-brightness-if-id.patch
deleted file mode 100644
index 81e28b42..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0009-power-Do-not-revert-to-the-pre-idle-brightness-if-id.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27bf0e2901e2281143f144324b151a40654f6a5b Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Thu, 29 Sep 2011 14:32:17 +0100
-Subject: [PATCH 2/8] power: Do not revert to the pre-idle brightness if idle
- dimming is disabled
-
-We want to set manager->priv->pre_dim_brightness = -1 to indicate that we're
-restored the value and that no further restoration is required, as the user may
-have already altered the level.
-
-This will only happen if you disable dimming at runtime after having dimmed at
-least once.
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660434
----
- plugins/power/gsd-power-manager.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 370d90d..a1bc213 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -2756,6 +2756,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
-                                 g_error_free (error);
-                                 return;
-                         }
-+                        manager->priv->pre_dim_brightness = -1;
-                 }
-         }
- }
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0010-color-Do-not-load-all-the-color-devices-twice-at-sta.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0010-color-Do-not-load-all-the-color-devices-twice-at-sta.patch
deleted file mode 100644
index 6160d643..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0010-color-Do-not-load-all-the-color-devices-twice-at-sta.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 46347223c475eb6ca1a4d4caa3f63b9302cfe8d9 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 30 Sep 2011 12:21:54 +0100
-Subject: [PATCH 3/8] color: Do not load all the color devices twice at
- startup
-
-If the color plugin was the first thing to use GnomeSettingsSession then we'll
-get an unknown->active transision when starting up, and we'll try to re-assign
-all the devices again.
-
-This speeds up loading of the color plugin typically by ~250ms, or quite a bit
-more if you have lots of devices like me.
----
- plugins/color/gsd-color-manager.c |   24 +++++++++++++++++-------
- 1 files changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
-index 14a4576..b4b6b3b 100644
---- a/plugins/color/gsd-color-manager.c
-+++ b/plugins/color/gsd-color-manager.c
-@@ -58,6 +58,7 @@ struct GsdColorManagerPrivate
-         GnomeRRScreen   *x11_screen;
-         GHashTable      *edid_cache;
-         GdkWindow       *gdk_window;
-+        GnomeSettingsSessionState session_state;
- };
- 
- enum {
-@@ -1950,21 +1951,29 @@ gcm_session_active_changed_cb (GnomeSettingsSession *session,
-                                GParamSpec *pspec,
-                                GsdColorManager *manager)
- {
--        GnomeSettingsSessionState state;
-+        GnomeSettingsSessionState state_new;
-+        GsdColorManagerPrivate *priv = manager->priv;
- 
-         /* not yet connected to the daemon */
--        if (!cd_client_get_connected (manager->priv->client))
-+        if (!cd_client_get_connected (priv->client))
-                 return;
- 
--        /* when doing the fast-user-switch into a new account, load the
--         * new users chosen profiles */
--        state = gnome_settings_session_get_state (session);
--        if (state == GNOME_SETTINGS_SESSION_STATE_ACTIVE) {
--                g_debug ("Done switch to new account, reload devices");
-+        /* When doing the fast-user-switch into a new account, load the
-+         * new users chosen profiles.
-+         *
-+         * If this is the first time the GnomeSettingsSession has been
-+         * loaded, then we'll get a change from unknown to active
-+         * and we want to avoid reprobing the devices for that.
-+         */
-+        state_new = gnome_settings_session_get_state (session);
-+        if (priv->session_state != GNOME_SETTINGS_SESSION_STATE_UNKNOWN &&
-+            state_new == GNOME_SETTINGS_SESSION_STATE_ACTIVE) {
-+                g_warning ("Done switch to new account, reload devices");
-                 cd_client_get_devices (manager->priv->client, NULL,
-                                        gcm_session_get_devices_cb,
-                                        manager);
-         }
-+        priv->session_state = state_new;
- }
- 
- static void
-@@ -2020,6 +2029,7 @@ gsd_color_manager_init (GsdColorManager *manager)
- 
-         /* track the active session */
-         priv->session = gnome_settings_session_new ();
-+        priv->session_state = gnome_settings_session_get_state (priv->session);
-         g_signal_connect (priv->session, "notify::state",
-                           G_CALLBACK (gcm_session_active_changed_cb),
-                           manager);
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0011-color-Don-t-assign-the-same-device-more-than-once-at.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0011-color-Don-t-assign-the-same-device-more-than-once-at.patch
deleted file mode 100644
index b381381b..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0011-color-Don-t-assign-the-same-device-more-than-once-at.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 9f14a09b2830fa4f7e6a88c656c8b991f93afae2 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 30 Sep 2011 14:05:45 +0100
-Subject: [PATCH 4/8] color: Don't assign the same device more than once at
- startup
-
-In the color plugin at startup there's a lot going on async, such as
-registering devices and monitoring profiles for changes. As it's all happening
-at the "same time", and possibly out-of-order we can't order things linearly in
-the startup phase.
-
-This could mean we connect to a device and then straight away get the device
-list (which also connects to the device) which means we're doing something twice
-we only really need to do once.
-
-Do solve this, use a simple hash table to keep track of what devices are being
-assigned at startup. A device gets removed from the cache as soon as it's been
-connected to, so we don't end up processing old data.
-
-This speeds up the color plugin start by ~280ms if you have two display devices.
----
- plugins/color/gsd-color-manager.c |   25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
-index b4b6b3b..4f5f8bc 100644
---- a/plugins/color/gsd-color-manager.c
-+++ b/plugins/color/gsd-color-manager.c
-@@ -59,6 +59,7 @@ struct GsdColorManagerPrivate
-         GHashTable      *edid_cache;
-         GdkWindow       *gdk_window;
-         GnomeSettingsSessionState session_state;
-+        GHashTable      *device_assign_hash;
- };
- 
- enum {
-@@ -1019,6 +1020,10 @@ gcm_session_device_assign_connect_cb (GObject *object,
-         GsdColorManager *manager = GSD_COLOR_MANAGER (user_data);
-         GsdColorManagerPrivate *priv = manager->priv;
- 
-+        /* remove from assign array */
-+        g_hash_table_remove (manager->priv->device_assign_hash,
-+                             cd_device_get_object_path (device));
-+
-         /* get properties */
-         ret = cd_device_connect_finish (device, res, &error);
-         if (!ret) {
-@@ -1129,6 +1134,19 @@ out:
- static void
- gcm_session_device_assign (GsdColorManager *manager, CdDevice *device)
- {
-+        const gchar *key;
-+        gpointer found;
-+
-+        /* are we already assigning this device */
-+        key = cd_device_get_object_path (device);
-+        found = g_hash_table_lookup (manager->priv->device_assign_hash, key);
-+        if (found != NULL) {
-+                g_debug ("assign for %s already in progress", key);
-+                return;
-+        }
-+        g_hash_table_insert (manager->priv->device_assign_hash,
-+                             g_strdup (key),
-+                             GINT_TO_POINTER (TRUE));
-         cd_device_connect (device,
-                            NULL,
-                            gcm_session_device_assign_connect_cb,
-@@ -2043,6 +2061,12 @@ gsd_color_manager_init (GsdColorManager *manager)
-                                                   g_free,
-                                                   g_object_unref);
- 
-+        /* we don't want to assign devices multiple times at startup */
-+        priv->device_assign_hash = g_hash_table_new_full (g_str_hash,
-+                                                          g_str_equal,
-+                                                          g_free,
-+                                                          NULL);
-+
-         /* use DMI data for internal panels */
-         priv->dmi = gcm_dmi_new ();
- 
-@@ -2086,6 +2110,7 @@ gsd_color_manager_finalize (GObject *object)
-         g_object_unref (manager->priv->dmi);
-         g_object_unref (manager->priv->session);
-         g_hash_table_destroy (manager->priv->edid_cache);
-+        g_hash_table_destroy (manager->priv->device_assign_hash);
-         if (manager->priv->x11_screen != NULL)
-                 g_object_unref (manager->priv->x11_screen);
- 
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0012-color-Fix-critical-warning-if-the-user-disables-the-.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0012-color-Fix-critical-warning-if-the-user-disables-the-.patch
deleted file mode 100644
index 9868d0ba..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0012-color-Fix-critical-warning-if-the-user-disables-the-.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dd465a1a294c9af476261dcba7bee11e9022e4eb Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 3 Oct 2011 15:09:15 +0100
-Subject: [PATCH 5/8] color: Fix critical warning if the user disables the
- internal LCD screen
-
-Note: this fix also applies to any output we've disabled but left connected.
----
- plugins/color/gsd-color-manager.c |   35 +++++++++++++++++++++++++++++++++--
- 1 files changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
-index 4f5f8bc..c2221e9 100644
---- a/plugins/color/gsd-color-manager.c
-+++ b/plugins/color/gsd-color-manager.c
-@@ -736,6 +736,10 @@ gcm_session_generate_vcgt (CdProfile *profile, guint size)
-         const gchar *filename;
-         cmsHPROFILE lcms_profile = NULL;
- 
-+        /* invalid size */
-+        if (size == 0)
-+                goto out;
-+
-         /* not an actual profile */
-         filename = cd_profile_get_filename (profile);
-         if (filename == NULL)
-@@ -776,6 +780,8 @@ gnome_rr_output_get_gamma_size (GnomeRROutput *output)
-         gint len = 0;
- 
-         crtc = gnome_rr_output_get_crtc (output);
-+        if (crtc == NULL)
-+                return 0;
-         gnome_rr_crtc_get_gamma (crtc,
-                                  &len,
-                                  NULL, NULL, NULL);
-@@ -818,6 +824,15 @@ gcm_session_output_set_gamma (GnomeRROutput *output,
- 
-         /* send to LUT */
-         crtc = gnome_rr_output_get_crtc (output);
-+        if (crtc == NULL) {
-+                ret = FALSE;
-+                g_set_error (error,
-+                             GSD_COLOR_MANAGER_ERROR,
-+                             GSD_COLOR_MANAGER_ERROR_FAILED,
-+                             "failed to get ctrc for %s",
-+                             gnome_rr_output_get_name (output));
-+                goto out;
-+        }
-         gnome_rr_crtc_set_gamma (crtc, array->len,
-                                  red, green, blue);
- out:
-@@ -833,11 +848,19 @@ gcm_session_device_set_gamma (GnomeRROutput *output,
-                               GError **error)
- {
-         gboolean ret = FALSE;
-+        guint size;
-         GPtrArray *clut = NULL;
- 
-         /* create a lookup table */
--        clut = gcm_session_generate_vcgt (profile,
--                                          gnome_rr_output_get_gamma_size (output));
-+        size = gnome_rr_output_get_gamma_size (output);
-+        if (size == 0) {
-+                g_set_error_literal (error,
-+                                     GSD_COLOR_MANAGER_ERROR,
-+                                     GSD_COLOR_MANAGER_ERROR_FAILED,
-+                                     "gamma size is zero");
-+                goto out;
-+        }
-+        clut = gcm_session_generate_vcgt (profile, size);
-         if (clut == NULL) {
-                 g_set_error_literal (error,
-                                      GSD_COLOR_MANAGER_ERROR,
-@@ -871,6 +894,14 @@ gcm_session_device_reset_gamma (GnomeRROutput *output,
-         g_debug ("falling back to dummy ramp");
-         clut = g_ptr_array_new_with_free_func (g_free);
-         size = gnome_rr_output_get_gamma_size (output);
-+        if (size == 0) {
-+                ret = FALSE;
-+                g_set_error_literal (error,
-+                                     GSD_COLOR_MANAGER_ERROR,
-+                                     GSD_COLOR_MANAGER_ERROR_FAILED,
-+                                     "gamma size is zero");
-+                goto out;
-+        }
-         for (i = 0; i < size; i++) {
-                 value = (i * 0xffff) / (size - 1);
-                 data = g_new0 (GnomeRROutputClutItem, 1);
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0013-color-Reset-the-gamma-tables-when-the-screen-configu.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0013-color-Reset-the-gamma-tables-when-the-screen-configu.patch
deleted file mode 100644
index 65e372be..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0013-color-Reset-the-gamma-tables-when-the-screen-configu.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From a837c01a6c0cbbb0a135b4d130ecec027b2dcb8a Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Tue, 27 Sep 2011 18:16:44 +0100
-Subject: [PATCH 6/8] color: Reset the gamma tables when the screen
- configuration changes
-
-We have to reset the gamma tables each time, as if the primary output
-has changed then different crtcs are going to be used.
-
-This prevents the profile VCGT being used on the wrong monitor.
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660164
----
- plugins/color/gsd-color-manager.c |   66 +++++++++++++++++++++++++++++++++++++
- 1 files changed, 66 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
-index c2221e9..6fe086e 100644
---- a/plugins/color/gsd-color-manager.c
-+++ b/plugins/color/gsd-color-manager.c
-@@ -1398,6 +1398,69 @@ out:
- }
- 
- static void
-+gcm_session_profile_gamma_find_device_cb (GObject *object,
-+                                          GAsyncResult *res,
-+                                          gpointer user_data)
-+{
-+        CdClient *client = CD_CLIENT (object);
-+        CdDevice *device = NULL;
-+        GError *error = NULL;
-+        GsdColorManager *manager = GSD_COLOR_MANAGER (user_data);
-+
-+        device = cd_client_find_device_by_property_finish (client,
-+                                                           res,
-+                                                           &error);
-+        if (device == NULL) {
-+                g_warning ("not found device %s: %s",
-+                           cd_device_get_id (device),
-+                           error->message);
-+                g_error_free (error);
-+                goto out;
-+        }
-+
-+        /* get properties */
-+        cd_device_connect (device,
-+                           NULL,
-+                           gcm_session_device_assign_connect_cb,
-+                           manager);
-+out:
-+        if (device != NULL)
-+                g_object_unref (device);
-+}
-+
-+/* We have to reset the gamma tables each time as if the primary output
-+ * has changed then different crtcs are going to be used.
-+ * See https://bugzilla.gnome.org/show_bug.cgi?id=660164 for an example */
-+static void
-+gnome_rr_screen_output_changed_cb (GnomeRRScreen *screen,
-+                                   GsdColorManager *manager)
-+{
-+        GnomeRROutput **outputs;
-+        GsdColorManagerPrivate *priv = manager->priv;
-+        guint i;
-+
-+        /* get X11 outputs */
-+        outputs = gnome_rr_screen_list_outputs (priv->x11_screen);
-+        if (outputs == NULL) {
-+                g_warning ("failed to get outputs");
-+                return;
-+        }
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (!gnome_rr_output_is_connected (outputs[i]))
-+                        continue;
-+
-+                /* get CdDevice for this output */
-+                cd_client_find_device_by_property (manager->priv->client,
-+                                                   CD_DEVICE_METADATA_XRANDR_NAME,
-+                                                   gnome_rr_output_get_name (outputs[i]),
-+                                                   NULL,
-+                                                   gcm_session_profile_gamma_find_device_cb,
-+                                                   manager);
-+        }
-+
-+}
-+
-+static void
- gcm_session_client_connect_cb (GObject *source_object,
-                                GAsyncResult *res,
-                                gpointer user_data)
-@@ -1456,6 +1519,9 @@ gcm_session_client_connect_cb (GObject *source_object,
-         g_signal_connect (priv->x11_screen, "output-disconnected",
-                           G_CALLBACK (gnome_rr_screen_output_removed_cb),
-                           manager);
-+        g_signal_connect (priv->x11_screen, "changed",
-+                          G_CALLBACK (gnome_rr_screen_output_changed_cb),
-+                          manager);
- 
-         g_signal_connect (priv->client, "profile-added",
-                           G_CALLBACK (gcm_session_profile_added_assign_cb),
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0014-power-Ensure-the-DPMS-state-is-on-at-startup.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0014-power-Ensure-the-DPMS-state-is-on-at-startup.patch
deleted file mode 100644
index 704729ad..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0014-power-Ensure-the-DPMS-state-is-on-at-startup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 47b210a74dc68917736730c11abc97a0650d4cb2 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 3 Oct 2011 16:31:07 +0100
-Subject: [PATCH 7/8] power: Ensure the DPMS state is 'on' at startup
-
-This also has the side-effect of disabling the default DPMS timeouts the session may have set.
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660482
----
- plugins/power/gsd-power-manager.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index a1bc213..ae7cfb3 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -3293,6 +3293,8 @@ gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
- {
-+        gboolean ret;
-+
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-@@ -3440,6 +3442,13 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         if (manager->priv->x11_screen == NULL)
-                 return FALSE;
- 
-+        /* ensure the default dpms timeouts are cleared */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             error);
-+        if (!ret)
-+                return FALSE;
-+
-         /* coldplug the engine */
-         engine_coldplug (manager);
-         idle_evaluate (manager);
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.2.0/0015-color-Fix-make-check-by-including-lm-for-powf.patch b/gnome-base/gnome-settings-daemon/files/3.2.0/0015-color-Fix-make-check-by-including-lm-for-powf.patch
deleted file mode 100644
index 32713983..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.2.0/0015-color-Fix-make-check-by-including-lm-for-powf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 153950e1a5d3ec61be5275c8286067561cfd3ffc Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 3 Oct 2011 17:53:49 +0100
-Subject: [PATCH 8/8] color: Fix 'make check' by including -lm for powf()
-
----
- plugins/color/Makefile.am |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
-index 6d80602..fd68ac0 100644
---- a/plugins/color/Makefile.am
-+++ b/plugins/color/Makefile.am
-@@ -69,7 +69,8 @@ gcm_self_test_SOURCES =			\
- gcm_self_test_LDADD =			\
- 	$(COLORD_LIBS)			\
- 	$(LCMS_LIBS)			\
--	$(SETTINGS_PLUGIN_LIBS)
-+	$(SETTINGS_PLUGIN_LIBS)		\
-+	-lm
- 
- TESTS = gcm-self-test
- 
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch
deleted file mode 100644
index 01bd0930..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a8d56d910350346008aca54b98e10c318f29050f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Tue, 4 Oct 2011 00:45:17 -0400
-Subject: [PATCH] Power: failing to clear DPMS timeouts should not be fatal
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660859
----
- plugins/power/gsd-power-manager.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index ae7cfb3..56934d5 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -3446,8 +3446,10 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-                                              GNOME_RR_DPMS_ON,
-                                              error);
--        if (!ret)
--                return FALSE;
-+        if (!ret) {
-+                g_warning ("Failed set DPMS mode: %s", (*error)->message);
-+                g_clear_error (error);
-+        }
- 
-         /* coldplug the engine */
-         engine_coldplug (manager);
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
new file mode 100644
index 00000000..2c3e59f6
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
@@ -0,0 +1,21 @@
+From 9b141728c889a6d2f88767655661318e3d8d82da Mon Sep 17 00:00:00 2001
+From: Malcolm Lewis <malcolmlewis@opensuse.org>
+Date: Mon, 17 Oct 2011 16:43:06 +0000
+Subject: power: Fix "undefined symbol: WEXITSTATUS" error.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662020
+---
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 010d14a..3f10c22 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <sys/wait.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <libupower-glib/upower.h>
+--
+cgit v0.9.0.2