Fix XDG ShowOnlyIn/NotShowIn conflicts with KDE4. Add cmake

WITH_OLD_XDG_STD configure support to retain old style support
for potential problematic distros. This resolves bug report 1364.

2 files changed, 20 insertions, 0 deletions

diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 14eb172d5..bbcbed5c9 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -749,8 +749,13 @@ bool KService::noDisplay() const {
   {
      TQString aValue = it.data().toString();
      TQStringList aList = TQStringList::split(';', aValue);
+#ifdef WITH_OLD_XDG_STD
      if ((!aList.contains("TDE")) && (!aList.contains("KDE")))
         return true;
+#else
+     if (!aList.contains("TDE"))
+        return true;
+#endif
   }
 
   it = m_mapProps.find( "NotShowIn" );
@@ -758,8 +763,13 @@ bool KService::noDisplay() const {
   {
      TQString aValue = it.data().toString();
      TQStringList aList = TQStringList::split(';', aValue);
+#ifdef WITH_OLD_XDG_STD
      if ((aList.contains("TDE")) || (aList.contains("KDE")))
         return true;
+#else
+     if (aList.contains("TDE"))
+        return true;
+#endif
   }
   
   if (!kapp->authorizeControlModule(d->menuId))
diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp
index 4cb3b8dac..e0ec1321e 100644
--- a/tdeio/tdeio/kservicegroup.cpp
+++ b/tdeio/tdeio/kservicegroup.cpp
@@ -84,13 +84,23 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
   TQStringList tmpList;
   if (config.hasKey("OnlyShowIn"))
   {
+#ifdef WITH_OLD_XDG_STD
      if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
         d->m_bNoDisplay = true;
+#else
+     if (!config.readListEntry("OnlyShowIn", ';').contains("TDE"))
+        d->m_bNoDisplay = true;
+#endif
   }
   if (config.hasKey("NotShowIn"))
   {
+#ifdef WITH_OLD_XDG_STD
      if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE")))
         d->m_bNoDisplay = true;
+#else
+     if (config.readListEntry("NotShowIn", ';').contains("TDE"))
+        d->m_bNoDisplay = true;
+#endif
   }
 
   m_strBaseGroupName = config.readEntry( "X-TDE-BaseGroup" );