summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2007-08-20 16:39:18 +0200
committerDennis Kasprzyk <onestone@opencompositing.org>2007-08-20 16:39:18 +0200
commite32ab4aba1c1284172db195c1ae2f25dff1eadfc (patch)
tree0041c22d41efa41f41dc1b283c326f9b3cbf39c7
parent80f303c6e159d841f0c0a176ec9f2193af27a8b9 (diff)
downloadsplash-e32ab4aba1c1284172db195c1ae2f25dff1eadfc.tar.gz
splash-e32ab4aba1c1284172db195c1ae2f25dff1eadfc.tar.bz2
New action system
-rw-r--r--splash.c2
-rw-r--r--splash.xml.in7
2 files changed, 3 insertions, 6 deletions
diff --git a/splash.c b/splash.c
index a0128fd..51957ff 100644
--- a/splash.c
+++ b/splash.c
@@ -603,7 +603,7 @@ splashInitDisplay (CompPlugin *p,
sd->splashAtom = XInternAtom (d->display, "_COMPIZ_WM_SPLASH", 0);
- splashSetInitiateInitiate (d, splashInitiate);
+ splashSetInitiateKeyInitiate (d, splashInitiate);
d->privates[displayPrivateIndex].ptr = sd;
return TRUE;
diff --git a/splash.xml.in b/splash.xml.in
index cbdcde2..1fbf8d9 100644
--- a/splash.xml.in
+++ b/splash.xml.in
@@ -7,13 +7,10 @@
<display>
<group>
<_short>Main</_short>
- <option name="initiate" type="action">
+ <option name="initiate_key" type="key">
<_short>Initiate Splash</_short>
<_long>Start Splash.</_long>
- <allowed key="true"/>
- <default>
- <key>&lt;Control&gt;F11</key>
- </default>
+ <default>&lt;Control&gt;F11</default>
</option>
<option name="firststart" type="bool">
<_short>Show on first start</_short>