Browse Source

Fix kdelibs startup failure

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1245665 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
434af181a1
3 changed files with 4 additions and 15 deletions
  1. +2
    -13
      kinit/autostart.cpp
  2. +1
    -1
      kio/kio/kservice.cpp
  3. +1
    -1
      kio/kio/kservicegroup.cpp

+ 2
- 13
kinit/autostart.cpp View File

@@ -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;
}



+ 1
- 1
kio/kio/kservice.cpp View File

@@ -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;
}


+ 1
- 1
kio/kio/kservicegroup.cpp View File

@@ -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;
}



Loading…
Cancel
Save