summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-08 15:51:46 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-08 15:51:46 -0500
commit6ed1ea98db6b1b369e7561efcc2c666b810e5446 (patch)
tree69da6d265387965c04a9584547ec42d4d372717d /kinit
parent09d01cacf80d21ad213e6520b35e7f06e9546a83 (diff)
downloadtdelibs-6ed1ea98db6b1b369e7561efcc2c666b810e5446.tar.gz
tdelibs-6ed1ea98db6b1b369e7561efcc2c666b810e5446.zip
Update XDG information in support of bug report 892.
Diffstat (limited to 'kinit')
-rw-r--r--kinit/README.autostart8
-rw-r--r--kinit/autostart.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/kinit/README.autostart b/kinit/README.autostart
index c1f711ef6..ab8132915 100644
--- a/kinit/README.autostart
+++ b/kinit/README.autostart
@@ -15,7 +15,7 @@ application's .desktop file must be located in a KDE autostart directory such
as $TDEDIR/share/autostart or $TDEHOME/share/autostart. The .desktop file can
contain the following optional entries to control its autostart:
- X-KDE-autostart-condition = rcfile:group:entry:default
+ X-TDE-autostart-condition = rcfile:group:entry:default
rcfile = name of a config file (including path if necessary)
group = name of a group within the config file
@@ -28,17 +28,17 @@ contain the following optional entries to control its autostart:
'default' is 'true'.
If the entry is not within a group, the group entry can be left empty.
- X-KDE-autostart-after = desktop_name
+ X-TDE-autostart-after = desktop_name
desktop_name = the name of another .desktop file excluding path and
the .desktop suffix. E.g. panel.desktop would appear
- as 'X-KDE-autostart-after=panel'
+ as 'X-TDE-autostart-after=panel'
Waits until the .desktop file specified by 'desktop_name' has been
autostarted. The entry is ignored if the specified application is not
scheduled in the same autostart phase as this .desktop file.
- X-KDE-autostart-phase = phase
+ X-TDE-autostart-phase = phase
phase = 1 or 2
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 4824f2b23..488003948 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -128,7 +128,7 @@ AutoStart::loadAutoStartList()
continue;
}
else {
- if (!startCondition(config.readEntry("X-KDE-autostart-condition")))
+ if (!startCondition(config.readEntry("X-TDE-autostart-condition")))
continue;
}
if (!config.tryExec())
@@ -193,13 +193,13 @@ AutoStart::loadAutoStartList()
if (config.hasKey("X-TDE-autostart-after"))
item->startAfter = config.readEntry("X-TDE-autostart-after");
else
- item->startAfter = config.readEntry("X-KDE-autostart-after");
+ item->startAfter = config.readEntry("X-TDE-autostart-after");
if( m_newStartup )
{
if (config.hasKey("X-TDE-autostart-phase"))
item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
else
- item->phase = config.readNumEntry("X-KDE-autostart-phase", 2);
+ item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
if (item->phase < 0)
item->phase = 0;
}
@@ -208,7 +208,7 @@ AutoStart::loadAutoStartList()
if (config.hasKey("X-TDE-autostart-phase"))
item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
else
- item->phase = config.readNumEntry("X-KDE-autostart-phase", 1);
+ item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
if (item->phase < 1)
item->phase = 1;
}