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

diff --git a/src/launcher/xsettings-client.c b/src/launcher/xsettings-client.c
index be569e6..a66c4b7 100644
--- a/src/launcher/xsettings-client.c
+++ b/src/launcher/xsettings-client.c
@@ -54,7 +54,7 @@ void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSet
 			if (icon_theme_name) {
 				if (strcmp(icon_theme_name, setting->data.v_string) == 0)
 					return;
-				g_free(icon_theme_name);
+				free(icon_theme_name);
 			}
 			icon_theme_name = strdup(setting->data.v_string);
 			
@@ -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;
 }