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

[ion3.git] / ioncore / bindmaps.c

diff --git a/ioncore/bindmaps.c b/ioncore/bindmaps.c
index dd4a1d041f3c3c991fa2dc61db196f68fd943259..9c6bd4689b0483cd7de598508b9049a899c0c616 100644 (file)
--- a/ioncore/bindmaps.c
+++ b/ioncore/bindmaps.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/bindmaps.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * 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
@@ -23,7 +23,7 @@
  */
 
 
-WBindmap *ioncore_rootwin_bindmap=NULL;
+WBindmap *ioncore_screen_bindmap=NULL;
 WBindmap *ioncore_mplex_bindmap=NULL;
 WBindmap *ioncore_mplex_toplevel_bindmap=NULL;
 WBindmap *ioncore_frame_bindmap=NULL;
@@ -56,7 +56,7 @@ static StringIntMap frame_areas[]={
 
 void ioncore_deinit_bindmaps()
 {
-    DO_FREE(rootwin, "WScreen");
+    DO_FREE(screen, "WScreen");
     DO_FREE(mplex, "WMPlex");
     DO_FREE(mplex_toplevel, "WMPlex.toplevel");
     DO_FREE(frame, "WFrame");
@@ -86,7 +86,7 @@ bool ioncore_init_bindmaps()
     if(known_bindmaps==NULL)
         return FALSE;
     
-    DO_ALLOC(rootwin, "WScreen", NULL);
+    DO_ALLOC(screen, "WScreen", NULL);
     DO_ALLOC(mplex, "WMPlex", NULL);
     DO_ALLOC(mplex_toplevel, "WMPlex.toplevel", NULL);
     DO_ALLOC(frame, "WFrame", frame_areas);