*fix* valgrind invalid read/write and memleaks

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index 7f202bf95c64a7978759e04a4e1a1f4c1e2eb0ff..f35bb964c281113cf78f5b4cea151fb950a98418 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -38,6 +38,7 @@ void server_init_atoms ()
        server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
        server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False);
        server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False);
+       server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False);
        server.atom._NET_DESKTOP_GEOMETRY = XInternAtom (server.dsp, "_NET_DESKTOP_GEOMETRY", False);
        server.atom._NET_DESKTOP_VIEWPORT = XInternAtom (server.dsp, "_NET_DESKTOP_VIEWPORT", False);
        server.atom._NET_ACTIVE_WINDOW = XInternAtom (server.dsp, "_NET_ACTIVE_WINDOW", False);
@@ -171,7 +172,6 @@ void *server_get_property (Window win, Atom at, Atom type, int *num_results)
        result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
 
        // Send back resultcount
-       // it look some version of gcc doesn't do the cast. so we force it.
        if (num_results) *num_results = (int)nitems_ret;
 
        if (result == Success && prop_value) return prop_value;
@@ -303,7 +303,7 @@ void get_monitors()
                        i++;
                }
 next:
-               for (j=i; j<server.nb_monitor; ++j)
+               for (j=i; j<nbmonitor; ++j)
                        if (server.monitor[j].names)
                                g_strfreev(server.monitor[j].names);
                server.nb_monitor = i;