*fix* 2 memleaks

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index f84396319efbcaf0dfbcbe9285c02b386c225fd3..c1401aedcc603e56cb08f6448a5ac42c7d0b621a 100644 (file)
--- 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 ()
@@ -61,6 +59,7 @@ void server_init_atoms ()
        server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
        server.atom._NET_WM_STATE_SHADED = XInternAtom (server.dsp, "_NET_WM_STATE_SHADED", False);
        server.atom._NET_WM_STATE_BELOW = XInternAtom (server.dsp, "_NET_WM_STATE_BELOW", False);
+       server.atom._NET_WM_STATE_ABOVE = XInternAtom (server.dsp, "_NET_WM_STATE_ABOVE", False);
        server.atom._NET_WM_STATE_MODAL = XInternAtom (server.dsp, "_NET_WM_STATE_MODAL", False);
        server.atom._NET_CLIENT_LIST = XInternAtom (server.dsp, "_NET_CLIENT_LIST", False);
        server.atom._NET_WM_VISIBLE_NAME = XInternAtom (server.dsp, "_NET_WM_VISIBLE_NAME", False);
@@ -78,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);
@@ -86,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);
@@ -96,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);
 }
 
 
@@ -307,6 +306,7 @@ void get_desktops()
 
 void server_init_visual()
 {
+       // inspired by freedesktops fdclock ;)
        XVisualInfo *xvi;
        XVisualInfo templ = { .screen=server.screen, .depth=32, .class=TrueColor };
        int nvi;