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

[ion3.git] / mod_tiling / placement.c

diff --git a/mod_tiling/placement.c b/mod_tiling/placement.c
index 07de5f47d7db138837dec53db8c83732c41cecdd..7e45806830e4c285415ab32e31eb05a3a0582055 100644 (file)
--- a/mod_tiling/placement.c
+++ b/mod_tiling/placement.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 <ioncore/common.h>
@@ -72,16 +69,14 @@ static bool placement_mrsh_extl(ExtlFn fn, WTilingPlacementParams *param)
 
 
 WPHolder *tiling_prepare_manage(WTiling *ws, const WClientWin *cwin,
-                               const WManageParams *mp, int redir)
+                                const WManageParams *mp, int priority)
 {
+    int cpriority=MANAGE_PRIORITY_SUBX(priority, MANAGE_PRIORITY_NORMAL);
     WRegion *target=NULL;
     WTilingPlacementParams param;
     WPHolder *ph;
     bool ret;
-
-    if(redir==MANAGE_REDIR_STRICT_NO)
-        return NULL;
-
+    
     param.ws=ws;
     param.reg=(WRegion*)cwin;
     param.mp=mp;
@@ -95,7 +90,7 @@ WPHolder *tiling_prepare_manage(WTiling *ws, const WClientWin *cwin,
         
         target=(WRegion*)param.res_frame;
         
-        ph=region_prepare_manage(target, cwin, mp, redir);
+        ph=region_prepare_manage(target, cwin, mp, cpriority);
         if(ph!=NULL)
             return ph;
     }
@@ -108,6 +103,6 @@ WPHolder *tiling_prepare_manage(WTiling *ws, const WClientWin *cwin,
         return NULL;
     }
     
-    return region_prepare_manage(target, cwin, mp, redir);
+    return region_prepare_manage(target, cwin, mp, cpriority);
 }