X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fserver.c;h=c1401aedcc603e56cb08f6448a5ac42c7d0b621a;hb=462228f2e82c6e5f61baeb49b6358273728baa90;hp=202af942c4274815219f9d65014c0c1d86729424;hpb=21dcd195642692401f855ef07b239364b5ef0c1b;p=chaz%2Ftint2

diff --git a/src/server.c b/src/server.c
index 202af94..c1401ae 100644
--- a/src/server.c
+++ b/src/server.c
@@ -30,8 +30,6 @@
 
 void server_catch_error (Display *d, XErrorEvent *ev){}
 
-static char *name_trayer = 0;
-
 int real_transparency = 0;
 
 void server_init_atoms ()
@@ -79,7 +77,7 @@ void server_init_atoms ()
 	server.atom.WM_HINTS = XInternAtom(server.dsp, "WM_HINTS", False);
 
 	// systray protocol
-	name_trayer = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
+	char *name_trayer = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
 	server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.dsp, name_trayer, False);
 	server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_OPCODE", False);
 	server.atom.MANAGER = XInternAtom(server.dsp, "MANAGER", False);
@@ -87,6 +85,7 @@ void server_init_atoms ()
 	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
 	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
 	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
+	g_free(name_trayer);
 
 	// drag 'n' drop
 	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
@@ -97,10 +96,9 @@ void server_init_atoms ()
 
 void cleanup_server()
 {
-	if (name_trayer) free(name_trayer);
-	XFreeColormap(server.dsp, server.colormap);
-	free(server.monitor);
-	XFreeGC(server.dsp, server.gc);
+	if (server.colormap) XFreeColormap(server.dsp, server.colormap);
+	if (server.monitor) free(server.monitor);
+	if (server.gc) XFreeGC(server.dsp, server.gc);
 }