Hi, I have prepared an updated gnome-settings-daemon package for squeeze. It works around a race condition in the X server, triggered by the way gdm3 starts up the session. OK to upload? Cheers, -- .''`. Josselin Mouette : :' : `. `' “If you behave this way because you are blackmailed by someone, `- […] I will see what I can do for you.” -- Jörg Schilling
diff -Nru gnome-settings-daemon-2.30.2/debian/changelog gnome-settings-daemon-2.30.2/debian/changelog
--- gnome-settings-daemon-2.30.2/debian/changelog 2010-10-20 01:29:28.000000000 +0200
+++ gnome-settings-daemon-2.30.2/debian/changelog 2011-04-09 12:33:25.000000000 +0200
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.30.2-2+squeeze1) stable; urgency=low
+
+ * 11_retry-startup.patch: when starting the Xsettings manager, try
+ again several times because there is a race condition on the X side.
+ Closes: #614682.
+
+ -- Josselin Mouette <joss@debian.org> Sat, 09 Apr 2011 12:29:30 +0200
+
gnome-settings-daemon (2.30.2-2) unstable; urgency=low
* 13_monitor_kfreebsd.patch: new patch. Donâ??t monitor fdescfs.
diff -Nru gnome-settings-daemon-2.30.2/debian/control gnome-settings-daemon-2.30.2/debian/control
--- gnome-settings-daemon-2.30.2/debian/control 2010-10-20 01:29:38.000000000 +0200
+++ gnome-settings-daemon-2.30.2/debian/control 2011-04-09 12:34:56.000000000 +0200
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
autotools-dev,
diff -Nru gnome-settings-daemon-2.30.2/debian/patches/11_retry-startup.patch gnome-settings-daemon-2.30.2/debian/patches/11_retry-startup.patch
--- gnome-settings-daemon-2.30.2/debian/patches/11_retry-startup.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-settings-daemon-2.30.2/debian/patches/11_retry-startup.patch 2011-04-09 12:33:25.000000000 +0200
@@ -0,0 +1,44 @@
+From 81922b3de6547fe208f9197ace0aec418b35f1cb Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@gnome-db.org>
+Date: Tue, 29 Mar 2011 10:22:39 +0200
+Subject: [PATCH] xsettings: Try a few times to start the xsettings manager
+
+This is to avoid race conditions on very fast machines, where the gdm's
+gnome-settings-daemon might already be running before starting the user's
+one
+
+https://bugzilla.gnome.org/show_bug.cgi?id=634988
+---
+ plugins/xsettings/gsd-xsettings-manager.c | 12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+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;
+--
+1.7.2.3
+
diff -Nru gnome-settings-daemon-2.30.2/debian/patches/series gnome-settings-daemon-2.30.2/debian/patches/series
--- gnome-settings-daemon-2.30.2/debian/patches/series 2010-10-20 01:24:46.000000000 +0200
+++ gnome-settings-daemon-2.30.2/debian/patches/series 2011-04-09 12:33:25.000000000 +0200
@@ -2,6 +2,7 @@
02_missing_libs.patch
03_maintainer_mode.patch
10_clipboard_crash.patch
+11_retry-startup.patch
12_monitor_network_fs.patch
13_monitor_kfreebsd.patch
20_gstreamer.patch
Attachment:
signature.asc
Description: This is a digitally signed message part