Fix kdelibs FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1245206 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 99739b6114
commit 49dbcf2c5d

@ -123,7 +123,7 @@ AutoStart::loadAutoStartList()
++it) ++it)
{ {
KDesktopFile config(*it, true); KDesktopFile config(*it, true);
if (config.hasKey("X-TDE-autostart-condition") { if (config.hasKey("X-TDE-autostart-condition")) {
if (!startCondition(config.readEntry("X-TDE-autostart-condition"))) if (!startCondition(config.readEntry("X-TDE-autostart-condition")))
continue; continue;
} }
@ -201,13 +201,13 @@ AutoStart::loadAutoStartList()
AutoStartItem *item = new AutoStartItem; AutoStartItem *item = new AutoStartItem;
item->name = extractName(*it); item->name = extractName(*it);
item->service = *it; item->service = *it;
if (config.hasKey("X-TDE-autostart-after") if (config.hasKey("X-TDE-autostart-after"))
item->startAfter = config.readEntry("X-TDE-autostart-after"); item->startAfter = config.readEntry("X-TDE-autostart-after");
else else
item->startAfter = config.readEntry("X-KDE-autostart-after"); item->startAfter = config.readEntry("X-KDE-autostart-after");
if( m_newStartup ) if( m_newStartup )
{ {
if (config.hasKey("X-TDE-autostart-phase") if (config.hasKey("X-TDE-autostart-phase"))
item->phase = config.readNumEntry("X-TDE-autostart-phase", 2); item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
else else
item->phase = config.readNumEntry("X-KDE-autostart-phase", 2); item->phase = config.readNumEntry("X-KDE-autostart-phase", 2);
@ -216,7 +216,7 @@ AutoStart::loadAutoStartList()
} }
else else
{ {
if (config.hasKey("X-TDE-autostart-phase") if (config.hasKey("X-TDE-autostart-phase"))
item->phase = config.readNumEntry("X-TDE-autostart-phase", 1); item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
else else
item->phase = config.readNumEntry("X-KDE-autostart-phase", 1); item->phase = config.readNumEntry("X-KDE-autostart-phase", 1);

Loading…
Cancel
Save