X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ioncore%2Fbasicpholder.c;h=9689ec49b82e00701e6789bca2124c7a328fbe60;hb=bab1a29cb81b48fe5f1f79349db31363e52143c1;hp=b8b2e964dffb491d818a85e3af04475a98fb73bd;hpb=8366314611bf30a0f31d25bf5f5023186fa87692;p=ion3.git diff --git a/ioncore/basicpholder.c b/ioncore/basicpholder.c index b8b2e96..9689ec4 100644 --- a/ioncore/basicpholder.c +++ b/ioncore/basicpholder.c @@ -1,12 +1,9 @@ /* * ion/ioncore/basicpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2006. + * Copyright (c) Tuomo Valkonen 2005-2009. * - * 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 @@ -19,13 +16,6 @@ /*{{{ Init/deinit */ -static void basicpholder_watch_handler(Watch *watch, Obj *reg) -{ - WBasicPHolder *ph=FIELD_TO_STRUCT(WBasicPHolder, reg_watch, watch); - pholder_redirect(&(ph->ph), (WRegion*)reg); -} - - bool basicpholder_init(WBasicPHolder *ph, WRegion *reg, WBasicPHolderHandler *hnd) { @@ -35,7 +25,7 @@ bool basicpholder_init(WBasicPHolder *ph, WRegion *reg, watch_init(&(ph->reg_watch)); - if(!watch_setup(&(ph->reg_watch), (Obj*)reg, basicpholder_watch_handler)){ + if(!watch_setup(&(ph->reg_watch), (Obj*)reg, NULL)){ pholder_deinit(&(ph->ph)); return FALSE; }