diff --git a/applets/notifications/package/contents/ui/JobDetails.qml b/applets/notifications/package/contents/ui/JobDetails.qml index 6a1fb2c67..c416bc419 100644 --- a/applets/notifications/package/contents/ui/JobDetails.qml +++ b/applets/notifications/package/contents/ui/JobDetails.qml @@ -79,8 +79,7 @@ GridLayout { Component.onCompleted: bindText() function bindText() { text = Qt.binding(function() { - return jobDetails["descriptionLabel" + modelData] && jobDetails["descriptionValue" + modelData] - ? jobDetails["descriptionValue" + modelData] : ""; + return jobDetails["descriptionValue" + modelData] || ""; }); } diff --git a/libkworkspace/sessionmanagement.cpp b/libkworkspace/sessionmanagement.cpp index 943b4c4c6..b9d868548 100644 --- a/libkworkspace/sessionmanagement.cpp +++ b/libkworkspace/sessionmanagement.cpp @@ -47,7 +47,7 @@ class ShutdownIface : public OrgKdeShutdownInterface Q_OBJECT public: ShutdownIface() - : OrgKdeShutdownInterface(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/Shutdown"), QDBusConnection::sessionBus()) + : OrgKdeShutdownInterface(QStringLiteral("org.kde.Shutdown"), QStringLiteral("/Shutdown"), QDBusConnection::sessionBus()) { } }; diff --git a/libnotificationmanager/job_p.cpp b/libnotificationmanager/job_p.cpp index 97949ee6c..4bc398001 100644 --- a/libnotificationmanager/job_p.cpp +++ b/libnotificationmanager/job_p.cpp @@ -136,8 +136,6 @@ void JobPrivate::updateHasDetails() || m_processedFiles > 0 || m_processedDirectories > 0 || m_processedItems > 0 - || !m_descriptionLabel1.isEmpty() - || !m_descriptionLabel2.isEmpty() || !m_descriptionValue1.isEmpty() || !m_descriptionValue2.isEmpty() || m_speed > 0; diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index 7d8631f5a..a055d5635 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -384,7 +384,7 @@ bool startPlasmaSession(bool wayland) // We want to exit when both ksmserver and plasma-session-shutdown have finished // This also closes if ksmserver crashes unexpectedly, as in those cases plasma-shutdown is not running serviceWatcher.addWatchedService(QStringLiteral("org.kde.ksmserver")); - serviceWatcher.addWatchedService(QStringLiteral("org.kde.shutdown")); + serviceWatcher.addWatchedService(QStringLiteral("org.kde.Shutdown")); serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration); QObject::connect(&startPlasmaSession, QOverload::of(&QProcess::finished), [&rc, &e](int exitCode, QProcess::ExitStatus) {