summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-09-07 08:25:01 +0200
committerDanny Baumann <dannybaumann@web.de>2007-09-07 08:25:01 +0200
commit57b0175fc4c4f65f237d0b0b10003beaf2eb8624 (patch)
tree07669689ed8fa9c1ec01cbabf7bb3e4c3201772a
parente7834affc980d4ec6e78548fc4cbec4a002e342e (diff)
downloadgroup-57b0175fc4c4f65f237d0b0b10003beaf2eb8624.tar.gz
group-57b0175fc4c4f65f237d0b0b10003beaf2eb8624.tar.bz2
Track core changes.
-rw-r--r--group-internal.h6
-rw-r--r--init.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/group-internal.h b/group-internal.h
index ea0f3ac..283ced4 100644
--- a/group-internal.h
+++ b/group-internal.h
@@ -53,17 +53,17 @@
*
*/
#define GET_GROUP_DISPLAY(d) \
- ((GroupDisplay *) (d)->object.privates[groupDisplayPrivateIndex].ptr)
+ ((GroupDisplay *) (d)->base.privates[groupDisplayPrivateIndex].ptr)
#define GROUP_DISPLAY(d) \
GroupDisplay *gd = GET_GROUP_DISPLAY (d)
#define GET_GROUP_SCREEN(s, gd) \
- ((GroupScreen *) (s)->object.privates[(gd)->screenPrivateIndex].ptr)
+ ((GroupScreen *) (s)->base.privates[(gd)->screenPrivateIndex].ptr)
#define GROUP_SCREEN(s) \
GroupScreen *gs = GET_GROUP_SCREEN (s, GET_GROUP_DISPLAY (s->display))
#define GET_GROUP_WINDOW(w, gs) \
- ((GroupWindow *) (w)->object.privates[(gs)->windowPrivateIndex].ptr)
+ ((GroupWindow *) (w)->base.privates[(gs)->windowPrivateIndex].ptr)
#define GROUP_WINDOW(w) \
GroupWindow *gw = GET_GROUP_WINDOW (w, \
GET_GROUP_SCREEN (w->screen, \
diff --git a/init.c b/init.c
index cc408b4..1ba8ba5 100644
--- a/init.c
+++ b/init.c
@@ -240,7 +240,7 @@ groupInitDisplay (CompPlugin *p,
groupSetIgnoreKeyTerminate (d, groupUnsetIgnore);
groupSetChangeColorKeyInitiate (d, groupChangeColor);
- d->object.privates[groupDisplayPrivateIndex].ptr = gd;
+ d->base.privates[groupDisplayPrivateIndex].ptr = gd;
srand (time (NULL));
@@ -302,7 +302,7 @@ groupInitScreen (CompPlugin *p,
WRAP (gs, s, damageWindowRect, groupDamageWindowRect);
WRAP (gs, s, windowStateChangeNotify, groupWindowStateChangeNotify);
- s->object.privates[gd->screenPrivateIndex].ptr = gs;
+ s->base.privates[gd->screenPrivateIndex].ptr = gs;
groupSetTabHighlightColorNotify (s, groupScreenOptionChanged);
groupSetTabBaseColorNotify (s, groupScreenOptionChanged);
@@ -473,7 +473,7 @@ static Bool groupInitWindow(CompPlugin * p, CompWindow * w)
else
gw->windowState = WindowNormal;
- w->object.privates[gs->windowPrivateIndex].ptr = gw;
+ w->base.privates[gs->windowPrivateIndex].ptr = gw;
gw->glowQuads = NULL;
groupComputeGlowQuads (w, &gs->glowTexture.matrix);
@@ -532,6 +532,7 @@ groupInitObject (CompPlugin *p,
CompObject *o)
{
static InitPluginObjectProc dispTab[] = {
+ (InitPluginObjectProc) 0, /* InitCore */
(InitPluginObjectProc) groupInitDisplay,
(InitPluginObjectProc) groupInitScreen,
(InitPluginObjectProc) groupInitWindow
@@ -545,6 +546,7 @@ groupFiniObject (CompPlugin *p,
CompObject *o)
{
static FiniPluginObjectProc dispTab[] = {
+ (FiniPluginObjectProc) 0, /* FiniCore */
(FiniPluginObjectProc) groupFiniDisplay,
(FiniPluginObjectProc) groupFiniScreen,
(FiniPluginObjectProc) groupFiniWindow