summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--kinit/autostart.cpp15
-rw-r--r--kio/kio/kservice.cpp2
-rw-r--r--kio/kio/kservicegroup.cpp2
3 files changed, 4 insertions, 15 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;
}
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index 471301d79..8581c362c 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -742,7 +742,7 @@ bool KService::noDisplay() const {
{
TQString aValue = it.data().toString();
TQStringList aList = TQStringList::split(';', aValue);
- if ((aList.tqcontains("TDE")) && (aList.tqcontains("KDE")))
+ if ((aList.tqcontains("TDE")) || (aList.tqcontains("KDE")))
return true;
}
diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
index 8333e4f1e..5efb23937 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/kio/kio/kservicegroup.cpp
@@ -89,7 +89,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
}
if (config.hasKey("NotShowIn"))
{
- if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) && (config.readListEntry("NotShowIn", ';').tqcontains("KDE")))
+ if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) || (config.readListEntry("NotShowIn", ';').tqcontains("KDE")))
d->m_bNoDisplay = true;
}