[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / ioncore / rootwin.c

diff --git a/ioncore/rootwin.c b/ioncore/rootwin.c
index 6e75ee3b5de1ed3a33000a7b3fe7bbe8da6dd1ff..f9b6905f29787db44c07e361812ecc8430825f69 100644 (file)
--- a/ioncore/rootwin.c
+++ b/ioncore/rootwin.c
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #include <unistd.h>
@@ -252,12 +249,7 @@ static bool rootwin_init(WRootWin *rootwin, int xscr)
     net_virtual_roots=XInternAtom(ioncore_g.dpy, "_NET_VIRTUAL_ROOTS", False);
     XDeleteProperty(ioncore_g.dpy, root, net_virtual_roots);
 
-    /* */ {
-        /* TODO: typed LINK_ITEM */
-        WRegion *tmp=(WRegion*)ioncore_g.rootwins;
-        LINK_ITEM(tmp, (WRegion*)rootwin, p_next, p_prev);
-        ioncore_g.rootwins=(WRootWin*)tmp;
-    }
+    LINK_ITEM(*(WRegion**)&ioncore_g.rootwins, (WRegion*)rootwin, p_next, p_prev);
 
     xwindow_set_cursor(root, IONCORE_CURSOR_DEFAULT);
     
@@ -280,11 +272,7 @@ void rootwin_deinit(WRootWin *rw)
             destroy_obj((Obj*)scr);
     }
     
-    /* */ {
-        WRegion *tmp=(WRegion*)ioncore_g.rootwins;
-        UNLINK_ITEM(tmp, (WRegion*)rw, p_next, p_prev);
-        ioncore_g.rootwins=(WRootWin*)tmp;
-    }
+    UNLINK_ITEM(*(WRegion**)&ioncore_g.rootwins, (WRegion*)rw, p_next, p_prev);
     
     XSelectInput(ioncore_g.dpy, WROOTWIN_ROOT(rw), 0);