*fix* 2 memleaks

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index 978266fb8497696862d497c3c19e74845d2c830d..c1401aedcc603e56cb08f6448a5ac42c7d0b621a 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -85,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);
@@ -95,9 +96,9 @@ void server_init_atoms ()
 
 void cleanup_server()
 {
-       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);
 }