X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=ioncore%2Fframedpholder.c;fp=ioncore%2Fframedpholder.c;h=60c6291ba6c894a58520427b742c2778993cdab1;hp=0a198087709a0b913f4ce5253028feca52b6491a;hb=e3aec18706513a87eaa7839dfdaf7e0fcd0d8d2a;hpb=29aae1975d46f66b97a2b873f1875eded8c6fbc3 diff --git a/ioncore/framedpholder.c b/ioncore/framedpholder.c index 0a19808..60c6291 100644 --- a/ioncore/framedpholder.c +++ b/ioncore/framedpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/framedpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2008. + * Copyright (c) Tuomo Valkonen 2005-2009. * * See the included file LICENSE for details. */ @@ -202,7 +202,9 @@ WRegion *framedpholder_do_attach(WFramedPHolder *ph, int flags, watch_setup(&ph->frame_watch, (Obj*)frame, NULL); } - return ap.reg_ret; + return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT + ? (WRegion*)frame + : ap.reg_ret); }