*fix* valgrind invalid read/write and memleaks

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index db50445133a71426af8039df174c7121ba0bc747..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);
@@ -68,6 +69,7 @@ void server_init_atoms ()
        server.atom._NET_WM_NAME = XInternAtom (server.dsp, "_NET_WM_NAME", False);
        server.atom._NET_WM_STRUT = XInternAtom (server.dsp, "_NET_WM_STRUT", False);
        server.atom._NET_WM_ICON = XInternAtom (server.dsp, "_NET_WM_ICON", False);
+       server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.dsp, "_NET_WM_ICON_GEOMETRY", False );
        server.atom._NET_CLOSE_WINDOW = XInternAtom (server.dsp, "_NET_CLOSE_WINDOW", False);
        server.atom.UTF8_STRING = XInternAtom (server.dsp, "UTF8_STRING", False);
        server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_SUPPORTING_WM_CHECK", False);
@@ -94,6 +96,7 @@ void server_init_atoms ()
        server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
        server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
        server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
+       server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
 }
 
 
@@ -168,8 +171,8 @@ 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 */
-       if (num_results) *num_results = nitems_ret;
+       // Send back resultcount
+       if (num_results) *num_results = (int)nitems_ret;
 
        if (result == Success && prop_value) return prop_value;
        else return 0;
@@ -300,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;