summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-08 07:55:25 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-08 07:55:25 +0000
commit434af181a1016e6bea2e1d6fc9dfcdd08f72da0d (patch)
treeb89f2dfcdf0d65a7e53161366237ed5d209745b3 /kinit
parent49dbcf2c5d75fd9a87f0ad11788f00ee88db9b30 (diff)
downloadtdelibs-434af181a1016e6bea2e1d6fc9dfcdd08f72da0d.tar.gz
tdelibs-434af181a1016e6bea2e1d6fc9dfcdd08f72da0d.zip
Fix kdelibs startup failure
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1245665 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kinit')
-rw-r--r--kinit/autostart.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index d6a10e537..9383e4301 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -178,23 +178,12 @@ AutoStart::loadAutoStartList()
if (config.hasKey("OnlyShowIn"))
{
- if (!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE"))
+ if ((!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")))
continue;
}
if (config.hasKey("NotShowIn"))
{
- if (config.readListEntry("NotShowIn", ';').tqcontains("TDE"))
- continue;
- }
-
- if (config.hasKey("OnlyShowIn"))
- {
- if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
- continue;
- }
- if (config.hasKey("NotShowIn"))
- {
- if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+ if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) || (config.readListEntry("NotShowIn", ';').tqcontains("KDE")))
continue;
}