diff options
| -rw-r--r-- | kinit/autostart.cpp | 15 | ||||
| -rw-r--r-- | kio/kio/kservice.cpp | 2 | ||||
| -rw-r--r-- | kio/kio/kservicegroup.cpp | 2 |
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; } |