summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-09-07 08:28:08 +0200
committerDanny Baumann <dannybaumann@web.de>2007-09-07 08:28:08 +0200
commit90b3dcc1b679ae2a7a361d7316fac624afc8fc6e (patch)
treebfc764dd8d87d7d9802735167f5135588f868bcf
parent8afa6d42fad6e9802547b56f91bf25b09bbd027d (diff)
downloadsplash-90b3dcc1b679ae2a7a361d7316fac624afc8fc6e.tar.gz
splash-90b3dcc1b679ae2a7a361d7316fac624afc8fc6e.tar.bz2
Track core changes.
-rw-r--r--splash.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/splash.c b/splash.c
index 3609681..371ebce 100644
--- a/splash.c
+++ b/splash.c
@@ -34,13 +34,13 @@
#define SPLASH_LOGO_DEFAULT ""
#define GET_SPLASH_DISPLAY(d) \
- ((SplashDisplay *) (d)->object.privates[displayPrivateIndex].ptr)
+ ((SplashDisplay *) (d)->base.privates[displayPrivateIndex].ptr)
#define SPLASH_DISPLAY(d) \
SplashDisplay *sd = GET_SPLASH_DISPLAY (d)
#define GET_SPLASH_SCREEN(s, sd) \
- ((SplashScreen *) (s)->object.privates[(sd)->screenPrivateIndex].ptr)
+ ((SplashScreen *) (s)->base.privates[(sd)->screenPrivateIndex].ptr)
#define SPLASH_SCREEN(s) \
SplashScreen *ss = GET_SPLASH_SCREEN (s, GET_SPLASH_DISPLAY (s->display))
@@ -497,7 +497,7 @@ splashInitScreen (CompPlugin *p,
SplashScreen *ss = (SplashScreen *) calloc (1, sizeof (SplashScreen) );
- s->object.privates[sd->screenPrivateIndex].ptr = ss;
+ s->base.privates[sd->screenPrivateIndex].ptr = ss;
WRAP (ss, s, paintOutput, splashPaintOutput);
WRAP (ss, s, preparePaintScreen, splashPreparePaintScreen);
@@ -613,7 +613,7 @@ splashInitDisplay (CompPlugin *p,
splashSetInitiateKeyInitiate (d, splashInitiate);
- d->object.privates[displayPrivateIndex].ptr = sd;
+ d->base.privates[displayPrivateIndex].ptr = sd;
return TRUE;
}
@@ -653,6 +653,7 @@ splashInitObject (CompPlugin *p,
CompObject *o)
{
static InitPluginObjectProc dispTab[] = {
+ (InitPluginObjectProc) 0, /* InitCore */
(InitPluginObjectProc) splashInitDisplay,
(InitPluginObjectProc) splashInitScreen
};
@@ -665,6 +666,7 @@ splashFiniObject (CompPlugin *p,
CompObject *o)
{
static FiniPluginObjectProc dispTab[] = {
+ (FiniPluginObjectProc) 0, /* FiniCore */
(FiniPluginObjectProc) splashFiniDisplay,
(FiniPluginObjectProc) splashFiniScreen
};
@@ -673,7 +675,6 @@ splashFiniObject (CompPlugin *p,
}
CompPluginVTable splashVTable = {
-
"splash",
0,
splashInit,