summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-09-14 11:25:41 +0200
committerDanny Baumann <dannybaumann@web.de>2007-09-14 11:25:41 +0200
commitf60dcc3720ed552462a173f038ea80ef59c111d6 (patch)
tree23796214e1f32f8c23f3b1f3f47c44094627d20f
parentf59632df425dfa05e32f24907fdf126fb45d1cc4 (diff)
downloadshowdesktop-f60dcc3720ed552462a173f038ea80ef59c111d6.tar.gz
showdesktop-f60dcc3720ed552462a173f038ea80ef59c111d6.tar.bz2
Track core changes.
-rw-r--r--showdesktop.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/showdesktop.c b/showdesktop.c
index cddc822..eb368cd 100644
--- a/showdesktop.c
+++ b/showdesktop.c
@@ -626,21 +626,22 @@ showdesktopHandleEvent (CompDisplay *d,
WRAP (sd, d, handleEvent, showdesktopHandleEvent);
}
-static unsigned int
-showdesktopGetAllowedActionsForWindow (CompWindow *w)
+static void
+showdesktopGetAllowedActionsForWindow (CompWindow *w,
+ unsigned int *setActions,
+ unsigned int *clearActions)
{
CompScreen *s = w->screen;
- unsigned int actions;
SD_SCREEN (s);
SD_WINDOW (w);
UNWRAP (ss, s, getAllowedActionsForWindow);
- actions = (*s->getAllowedActionsForWindow) (w);
+ (*s->getAllowedActionsForWindow) (w, setActions, clearActions);
WRAP (ss, s, getAllowedActionsForWindow,
showdesktopGetAllowedActionsForWindow);
- return (actions & ~sw->notAllowedMask);
+ *clearActions |= sw->notAllowedMask;
}
static void