X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Flauncher%2Fxsettings-client.c;h=e888dc989faaa8a1b5ec9d67b14e4fa808462adc;hp=be569e6d2d339aa7597f58782e481ab87af8901e;hb=c929b4afa0049f43fd31927680303d3516f6e84f;hpb=90eae1e7be4621a84a0253c3048790523f0c8375

diff --git a/src/launcher/xsettings-client.c b/src/launcher/xsettings-client.c
index be569e6..e888dc9 100644
--- a/src/launcher/xsettings-client.c
+++ b/src/launcher/xsettings-client.c
@@ -412,25 +412,18 @@ XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNo
 	client->manager_window = None;
 	client->settings = NULL;
 
-	XGrabServer (server.dsp);
-	client->manager_window = XGetSelectionOwner (server.dsp, server.atom._XSETTINGS_SCREEN);
-	if (client->manager_window != None)
-		XSelectInput (server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask);
-	XUngrabServer (client->display);
-	XFlush (client->display);
-	
-	if (client->manager_window == None) {
-		printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n");
-		free (client);
-		return NULL;
-	}
-
 	if (client->watch)
 		client->watch (RootWindow (display, screen), True, StructureNotifyMask,	client->cb_data);
 
 	check_manager_window (client);
 
-	return client;
+	if (client->manager_window == None) {
+		printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n");
+		free (client);
+		return NULL;
+	}
+	else
+		return client;
 }