[gnome-settings-daemon] xsettings: Remove workaround to deal with g-s-d not exiting correctly

[Rodrigo Moya <rodrigo src gnome org>]

commit 38c07febe26629a2cc6db57e066e7ee89a54a86c
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Oct 3 13:43:51 2011 +0200

    xsettings: Remove workaround to deal with g-s-d not exiting correctly
    
    We added this workaround to 3.0 with the intention to fix it in 3.1, but
    as no bug reports have shown, not sure if the problem is fixed or it's just the
    workaround. Hopefully we'll get the proper fix for 3.3.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=634988

 plugins/xsettings/gsd-xsettings-manager.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index 645d3c7..67d6901 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -603,22 +603,12 @@ 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);
 
-	/* FIXME: this is a temporary fix for https://bugzilla.gnome.org/show_bug.cgi?id=634988
-           Needs to be removed as soon as a proper fix lands in gdm
-	   (hopefully for 3.0.1 */
-        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);
+        res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
+                                               gdk_screen_get_number (gdk_screen_get_default ()));
 
         if (res) {
                 g_warning ("You can only run one xsettings manager at a time; exiting");