Changeset View
Changeset View
Standalone View
Standalone View
shell/shellcorona.cpp
Show First 20 Lines • Show All 637 Lines • ▼ Show 20 Line(s) | |||||
638 | } | 638 | } | ||
639 | 639 | | |||
640 | void ShellCorona::load() | 640 | void ShellCorona::load() | ||
641 | { | 641 | { | ||
642 | if (m_shell.isEmpty()) { | 642 | if (m_shell.isEmpty()) { | ||
643 | return; | 643 | return; | ||
644 | } | 644 | } | ||
645 | 645 | | |||
646 | if (m_activityController->serviceStatus() != KActivities::Controller::Running && | 646 | auto activityStatus = m_activityController->serviceStatus(); | ||
647 | if (activityStatus != KActivities::Controller::Running && | ||||
647 | !qApp->property("org.kde.KActivities.core.disableAutostart").toBool()) { | 648 | !qApp->property("org.kde.KActivities.core.disableAutostart").toBool()) { | ||
649 | if (activityStatus == KActivities::Controller::NotRunning) { | ||||
648 | qWarning("Aborting shell load: The activity manager daemon (kactivitymanagerd) is not running."); | 650 | qWarning("Aborting shell load: The activity manager daemon (kactivitymanagerd) is not running."); | ||
649 | qWarning("If this Plasma has been installed into a custom prefix, verify that its D-Bus services dir is known to the system for the daemon to be activatable."); | 651 | qWarning("If this Plasma has been installed into a custom prefix, verify that its D-Bus services dir is known to the system for the daemon to be activatable."); | ||
652 | } | ||||
650 | return; | 653 | return; | ||
651 | } | 654 | } | ||
652 | 655 | | |||
653 | disconnect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load); | 656 | disconnect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load); | ||
654 | 657 | | |||
655 | m_screenPool->load(); | 658 | m_screenPool->load(); | ||
656 | 659 | | |||
657 | //TODO: a kconf_update script is needed | 660 | //TODO: a kconf_update script is needed | ||
▲ Show 20 Lines • Show All 1462 Lines • Show Last 20 Lines |