Merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-649809 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-23 17:42:53 +0000
+++ debian/changelog	2011-03-29 14:18:37 +0000
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.32.1-0ubuntu12) natty; urgency=low
+
+  * debian/patches/93_wait_for_xsettings.patch:
+    - Add patch to avoid race condition between gdm's gnome-settings-daemon
+      and user's (LP: #649809)
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 29 Mar 2011 10:26:47 +0200
+
 gnome-settings-daemon (2.32.1-0ubuntu11) natty; urgency=low
 
   * debian/patches/92_datetime_fixups.patch:

=== added file 'debian/patches/93_wait_for_xsettings.patch'
--- debian/patches/93_wait_for_xsettings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/93_wait_for_xsettings.patch	2011-03-29 14:18:37 +0000
@@ -0,0 +1,27 @@
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
+index 709d9f8..fdad93c 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -583,12 +583,20 @@ setup_xsettings_managers (GnomeXSettingsManager *manager)
+         int         n_screens;
+         gboolean    res;
+         gboolean    terminated;
++        gint        tries = 0;
+ 
+         display = gdk_display_get_default ();
+         n_screens = gdk_display_get_n_screens (display);
+ 
+-        res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
+-                                               gdk_screen_get_number (gdk_screen_get_default ()));
++        do {
++                res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
++                                                       gdk_screen_get_number (gdk_screen_get_default ()));
++                if (res) {
++                        g_usleep (100000);
++                        tries++;
++                }
++        } while (res && tries <= 20);
++
+         if (res) {
+                 g_warning ("You can only run one xsettings manager at a time; exiting");
+                 return FALSE;

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-23 17:42:53 +0000
+++ debian/patches/series	2011-03-29 14:18:37 +0000
@@ -15,4 +15,4 @@
 45_support_new_video_key.patch
 91_update_gvc_source.patch
 92_datetime_fixups.patch
-
+93_wait_for_xsettings.patch