r27325 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/11_retry-startup.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Apr  9 10:29:32 2011
New Revision: 27325

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27325
Log:
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.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/11_retry-startup.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=27325&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Sat Apr  9 10:29:32 2011
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.30.2-3) unstable; 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 at 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.

Added: desktop/unstable/gnome-settings-daemon/debian/patches/11_retry-startup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/11_retry-startup.patch?rev=27325&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/11_retry-startup.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/11_retry-startup.patch [utf-8] Sat Apr  9 10:29:32 2011
@@ -1,0 +1,44 @@
+From 81922b3de6547fe208f9197ace0aec418b35f1cb Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo at 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
+

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=27325&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Sat Apr  9 10:29:32 2011
@@ -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