From 274dd3ccb3dd38866e87c83bd5e6f1085ba861d9 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Tue, 23 Apr 2013 08:59:44 -0500 Subject: 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. --- kinit/autostart.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'kinit/autostart.cpp') diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index ccdbd3d97..3f49dfc1d 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -178,13 +178,23 @@ AutoStart::loadAutoStartList() if (config.hasKey("OnlyShowIn")) { +#ifdef WITH_OLD_XDG_STD if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))) continue; +#else + if (!config.readListEntry("OnlyShowIn", ';').contains("TDE")) + continue; +#endif } if (config.hasKey("NotShowIn")) { +#ifdef WITH_OLD_XDG_STD if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE"))) continue; +#else + if (config.readListEntry("NotShowIn", ';').contains("TDE")) + continue; +#endif } AutoStartItem *item = new AutoStartItem; -- cgit v1.2.1