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

[ion3.git] / mod_dock / dock.c

diff --git a/mod_dock/dock.c b/mod_dock/dock.c
index c67ce6d45c83ba16f13f2b9ec5c8d585ec83bbea..dabe0757cc25ecb54ee1aa2fcd7f11b1f27cc858 100644 (file)
--- a/mod_dock/dock.c
+++ b/mod_dock/dock.c
@@ -1155,18 +1155,6 @@ static void dock_deinit(WDock *dock)
 }
 
 
-bool dock_may_destroy(WDock *dock)
-{
-    if(dock->dockapps!=NULL){
-        warn_obj(modname, "Dock \"%s\" is still managing other objects "
-                " -- refusing to close.", region_name((WRegion*)dock));
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-
 EXTL_EXPORT
 WDock *mod_dock_create(ExtlTab tab)
 {
@@ -1449,9 +1437,9 @@ static WPHolder *dock_managed_get_pholder(WDock *dock, WRegion *mgd)
 
 static WPHolder *dock_prepare_manage(WDock *dock, const WClientWin *cwin,
                                      const WManageParams *param UNUSED,
-                                     int redir)
+                                     int priority)
 {
-    if(redir==MANAGE_REDIR_STRICT_YES)
+    if(!MANAGE_PRIORITY_OK(priority, MANAGE_PRIORITY_LOW))
         return NULL;
 
     return (WPHolder*)create_basicpholder((WRegion*)dock,
@@ -1595,7 +1583,7 @@ static bool clientwin_do_manage_hook(WClientWin *cwin, const WManageParams *para
     }
 
     return region_manage_clientwin((WRegion*)dock, cwin, param,
-                                   MANAGE_REDIR_PREFER_NO);
+                                   MANAGE_PRIORITY_NONE);
 }
 
 
@@ -1683,7 +1671,6 @@ static DynFunTab dock_dynfuntab[]={
     {region_size_hints, dock_size_hints},
     {(DynFun*)region_fitrep, (DynFun*)dock_fitrep},
     {(DynFun*)region_orientation, (DynFun*)dock_orientation},
-    {(DynFun*)region_may_destroy, (DynFun*)dock_may_destroy},
     {(DynFun*)region_handle_drop, (DynFun*)dock_handle_drop},
 
     {(DynFun*)region_managed_get_pholder,