shellcorona.cpp   shellcorona.cpp 
skipping to change at line 743 skipping to change at line 743
if (!m_waitingPanels.isEmpty()) { if (!m_waitingPanels.isEmpty()) {
m_waitingPanelsTimer.start(); m_waitingPanelsTimer.start();
} }
if (config()->isImmutable() || !KAuthorized::authorize(QStringLiteral(" plasma/plasmashell/unlockedDesktop"))) { if (config()->isImmutable() || !KAuthorized::authorize(QStringLiteral(" plasma/plasmashell/unlockedDesktop"))) {
setImmutability(Plasma::Types::SystemImmutable); setImmutability(Plasma::Types::SystemImmutable);
} else { } else {
KConfigGroup coronaConfig(config(), "General"); KConfigGroup coronaConfig(config(), "General");
setImmutability((Plasma::Types::ImmutabilityType)coronaConfig.readE ntry("immutability", static_cast<int>(Plasma::Types::Mutable))); setImmutability((Plasma::Types::ImmutabilityType)coronaConfig.readE ntry("immutability", static_cast<int>(Plasma::Types::Mutable)));
} }
Q_EMIT loaded();
} }
void ShellCorona::primaryScreenChanged(QScreen *oldPrimary, QScreen *newPri mary) void ShellCorona::primaryScreenChanged(QScreen *oldPrimary, QScreen *newPri mary)
{ {
// when the appearance of a new primary screen *moves* // when the appearance of a new primary screen *moves*
// the position of the now secondary, the two screens will appear overl apped for an instant, and a spurious output redundant would happen here if checked // the position of the now secondary, the two screens will appear overl apped for an instant, and a spurious output redundant would happen here if checked
// immediately // immediately
#ifndef NDEBUG #ifndef NDEBUG
m_invariantsTimer.start(); m_invariantsTimer.start();
#endif #endif
 End of changes. 1 change blocks. 
2 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/