diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-04-23 08:59:44 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-04-23 08:59:44 -0500 |
| commit | 274dd3ccb3dd38866e87c83bd5e6f1085ba861d9 (patch) | |
| tree | 60be5e7765163bf072bbe7a21ca34800c59897c5 /kinit | |
| parent | 8188a65884ac1bca0aea32c5fdbaa19bc3b868f0 (diff) | |
| download | tdelibs-274dd3ccb3dd38866e87c83bd5e6f1085ba861d9.tar.gz tdelibs-274dd3ccb3dd38866e87c83bd5e6f1085ba861d9.zip | |
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.
Diffstat (limited to 'kinit')
| -rw-r--r-- | kinit/autostart.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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; |