Merge lp:~gunnarhj/gnome-settings-daemon/drop-patch-43 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Gunnar Hjalmarsson]

* debian/patches/43_disable_locale_settings.patch:
  - Dropped since it's covered by
    48_register_client_before_idle_callbacks.patch

[James Page (james-page)]

Hi Gunnar

I think that this is a good bit of housekeeping and makes sense to me.

However as we are late in the quantal cycle and this does not fix a bug lets defer this until next release opens.

review: Approve

Unmerged revisions

358. By Gunnar Hjalmarsson on 2012-10-07

* debian/patches/43_disable_locale_settings.patch:
  - Dropped since it's covered by
    48_register_client_before_idle_callbacks.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-29 01:04:42 +0000
+++ debian/changelog	2012-10-07 00:59:32 +0000
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.4.2-0ubuntu15) UNRELEASED; urgency=low
+
+  * debian/patches/43_disable_locale_settings.patch:
+    - Dropped since it's covered by
+      48_register_client_before_idle_callbacks.patch
+
+ -- Gunnar Hjalmarsson <[e-mail]>  Sun, 07 Oct 2012 02:48:00 +0200
+
 gnome-settings-daemon (3.4.2-0ubuntu14) quantal; urgency=low
 
   * debian/patches/git_power_dbus_path.patch:
 
=== removed file 'debian/patches/43_disable_locale_settings.patch'
--- debian/patches/43_disable_locale_settings.patch	2012-03-07 01:31:28 +0000
+++ debian/patches/43_disable_locale_settings.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Description: Make sure that no locales are set, even if the gsettings "region" key has
- been assigned a value in the past, since they are set in Ubuntu via ~/.pam_environment.
-Forwarded: not-needed
-Author: Gunnar Hjalmarsson <[e-mail]>
-
-*
-* The set_locale() function is questionable anyhow, since it's called after ~/.profile
-* is sourced by e.g. lightdm or gdm, which prevents users from fine tuning the locale
-* settings by editing ~/.profile.
-*
-
-Index: gnome-settings-daemon-3.3.91/gnome-settings-daemon/main.c
-===================================================================
---- gnome-settings-daemon-3.3.91.orig/gnome-settings-daemon/main.c	2012-02-08 17:59:31.000000000 +0100
-+++ gnome-settings-daemon-3.3.91/gnome-settings-daemon/main.c	2012-03-05 21:04:22.481981528 +0100
-@@ -234,10 +234,6 @@
-         } else {
-                 const char *startup_id;
- 
--                /* Always call this first, as Setenv can only be called before
--                   any client registers */
--                set_locale (proxy);
--
-                 /* Register the daemon with gnome-session */
-                 g_signal_connect (G_OBJECT (proxy), "g-signal",
-                                   G_CALLBACK (on_session_over), NULL);
 
=== modified file 'debian/patches/48_register_client_before_idle_callbacks.patch'
--- debian/patches/48_register_client_before_idle_callbacks.patch	2012-03-05 20:17:31 +0000
+++ debian/patches/48_register_client_before_idle_callbacks.patch	2012-10-07 00:59:32 +0000
@@ -1,8 +1,8 @@
 Index: gnome-settings-daemon-3.3.91/gnome-settings-daemon/main.c
 ===================================================================
 --- gnome-settings-daemon-3.3.91.orig/gnome-settings-daemon/main.c	2012-03-05 21:04:12.757981058 +0100
-+++ gnome-settings-daemon-3.3.91/gnome-settings-daemon/main.c	2012-03-05 21:04:12.817981061 +0100
-@@ -219,36 +219,6 @@
++++ gnome-settings-daemon-3.3.91/gnome-settings-daemon/main.c	2012-10-07 02:31:00.000000000 +0200
+@@ -219,40 +219,6 @@
          g_object_unref (locale_settings);
  }
  
@@ -21,6 +21,10 @@
 -        } else {
 -                const char *startup_id;
 -
+-                /* Always call this first, as Setenv can only be called before
+-                   any client registers */
+-                set_locale (proxy);
+-
 -                /* Register the daemon with gnome-session */
 -                g_signal_connect (G_OBJECT (proxy), "g-signal",
 -                                  G_CALLBACK (on_session_over), NULL);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-29 01:04:33 +0000
+++ debian/patches/series	2012-10-07 00:59:32 +0000
@@ -3,7 +3,6 @@
 16_use_synchronous_notifications.patch
 20_migrate_background_uri.patch
 40_xres_lcddefault.patch
-43_disable_locale_settings.patch
 45_suppress-printer-may-not-be-connected-notification.patch
 47_delay_pa_connect_to_idle.patch
 48_register_client_before_idle_callbacks.patch