[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 3b18513a830288a684254c7684123cb7c61e9881..dabe0757cc25ecb54ee1aa2fcd7f11b1f27cc858 100644 (file)
--- a/mod_dock/dock.c
+++ b/mod_dock/dock.c
@@ -2,7 +2,7 @@
  * Ion dock module
  * Copyright (C) 2003 Tom Payne
  * Copyright (C) 2003 Per Olofsson
- * Copyright (C) 2004-2006 Tuomo Valkonen
+ * Copyright (C) 2004-2007 Tuomo Valkonen
  *
  * by Tom Payne <ion@tompayne.org>
  * based on code by Per Olofsson <pelle@dsv.su.se>
@@ -905,7 +905,7 @@ static void dock_draw(WDock *dock, bool complete)
         {
             WRectangle geom=REGION_GEOM(dock);
             geom.x=geom.y=0;
-            grbrush_draw_border(dock->brush, &geom, "dock");
+            grbrush_draw_border(dock->brush, &geom);
         }
         break;
     case DOCK_OUTLINE_STYLE_EACH:
@@ -913,8 +913,7 @@ static void dock_draw(WDock *dock, bool complete)
             WDockApp *dockapp;
             for(dockapp=dock->dockapps; dockapp!=NULL;
                 dockapp=dockapp->next){
-                grbrush_draw_border(dock->brush, &dockapp->tile_geom, 
-                                    "dock");
+                grbrush_draw_border(dock->brush, &dockapp->tile_geom);
             }
         }
         break;
@@ -1156,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)
 {
@@ -1450,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,
@@ -1596,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);
 }
 
 
@@ -1684,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,