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

[ion3.git] / ioncore / pholder.c

diff --git a/ioncore/pholder.c b/ioncore/pholder.c
index 5fdb7b8aae991f5520bf2515ae445e109b63eea4..f5f9aae4e1da034ae0c7b9cff63d6265decb7f61 100644 (file)
--- a/ioncore/pholder.c
+++ b/ioncore/pholder.c
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 2005-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 <libtu/objp.h>
@@ -40,18 +37,6 @@ WRegion *pholder_do_attach(WPHolder *ph, int flags,
 }
 
 
-static WRegion *add_fn_reparent(WWindow *par, const WFitParams *fp, 
-                                WRegion *reg)
-{
-    if(!region_fitrep(reg, par, fp)){
-        warn(TR("Unable to reparent."));
-        return NULL;
-    }
-    region_detach_manager(reg);
-    return reg;
-}
-
-
 WRegion *pholder_attach_(WPHolder *ph, int flags, WRegionAttachData *data)
 {
     WPHolder *root=pholder_root(ph);
@@ -111,10 +96,9 @@ static bool pholder_do_check_reparent_default(WPHolder *ph, WRegion *reg)
 {
     WRegion *target=pholder_do_target(ph);
     
-    if(target==NULL)
-        return FALSE;
-    else
-        return region_attach_reparent_check(target, reg);
+    return (target==NULL 
+            ? FALSE
+            : region_ancestor_check(target, reg));
 }