fix warnings

[chaz/openbox] / tools / kdetrayproxy / kdetrayproxy.c

diff --git a/tools/kdetrayproxy/kdetrayproxy.c b/tools/kdetrayproxy/kdetrayproxy.c
index 31a4d97488de9e75ff11ba75095d124b62fe240a..d2de3017432e7c4198414c7e1001fed5974de004 100644 (file)
--- a/tools/kdetrayproxy/kdetrayproxy.c
+++ b/tools/kdetrayproxy/kdetrayproxy.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   kdetrayproxy.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <stdio.h>
@@ -5,6 +23,7 @@
 #include <string.h>
 #include <sys/select.h>
 #include <unistd.h>
+#include <sys/time.h>
 
 typedef struct IList {
     Window win;
@@ -132,7 +151,7 @@ void addicon(Window win)
 void removeicon(Window win, int unmap)
 {
     IList *it, *last = NULL;
-    void *old;
+    int (*old)(Display *, XErrorEvent *);
 
     for (it = list; it; last = it, it = it->next)
         if (it->win == win) {
@@ -180,7 +199,8 @@ void updatehint()
         wins = malloc(sizeof(int) * n);
         for (it = list, i = 0; it; it = it->next, ++i)
             wins[i] = it->win;
-    }
+    } else
+        wins = NULL;
     XChangeProperty(display, root, roothint, XA_WINDOW, 32, PropModeReplace,
                     (unsigned char*) wins, n);
 }