X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ioncore%2Fbasicpholder.c;h=7272908c55999216bdd195e7ccbe7e95fcff8fb2;hb=562cb4d37ba7667ac846fc3d426b152d21ef2c22;hp=d5c85a4fca897ae7404d2d05c49d1ce86881daf5;hpb=471a5e5f9928e2d324b2e10422a420f458bd63ff;p=ion3.git diff --git a/ioncore/basicpholder.c b/ioncore/basicpholder.c index d5c85a4..7272908 100644 --- a/ioncore/basicpholder.c +++ b/ioncore/basicpholder.c @@ -1,12 +1,9 @@ /* * ion/ioncore/basicpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * - * 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; }