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

[ion3.git] / ioncore / region.c

diff --git a/ioncore/region.c b/ioncore/region.c
index aaec0f0b6f88d6880c12c449997dd6618d959e08..2a8e9feeadf7db31378f422a87ac63533993baf3 100644 (file)
--- a/ioncore/region.c
+++ b/ioncore/region.c
@@ -283,7 +283,9 @@ bool region_prepare_focus(WRegion *reg, int flags,
                           WPrepareFocusResult *res)
 {
 
-    if(!REGION_IS_ACTIVE(reg) || !REGION_IS_MAPPED(reg)){
+    if(TRUE /* !REGION_IS_ACTIVE(reg) || 
+       !REGION_IS_MAPPED(reg) ||
+       ioncore_g.focus_next!=NULL*/){
         WRegion *mgr=REGION_MANAGER(reg);
         WRegion *par=REGION_PARENT_REG(reg);
         
@@ -494,7 +496,7 @@ bool region_dispose_(WRegion *reg, bool not_simple)
     WPHolder *ph=NULL;
     
     if(rescue){
-        if(!region_rescue(reg, NULL)){
+        if(!region_rescue(reg, NULL, 0)){
             warn(TR("Failed to rescue some client windows - not closing."));
             return FALSE;
         }