Merge branch 'Plasma/5.19'

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] || "";
                 });
             }
 

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())
     {
     }
 };

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;

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<int, QProcess::ExitStatus>::of(&QProcess::finished), [&rc, &e](int exitCode, QProcess::ExitStatus) {