Make sure the lock screen returns to the login view once a session is activated.

There was a name clash between the signal and the AccelButton.

This work has been sponsored by the City of Munich's LiMux project.

Forward port of kde-workspace ce7746b2dd1426efc627ab17ec8ea9b2eaa1d656

ksmserver/screenlocker/greeter/fallbacktheme/LockScreen.qml

@@ -107,9 +107,9 @@ Item {
             visible: false
 
             Connections {
-                onCancel: returnToLogin()
+                onSwitchingCanceled: returnToLogin()
-                onActivateSession: returnToLogin()
+                onSessionActivated: returnToLogin()
-                onStartNewSession: returnToLogin()
+                onNewSessionStarted: returnToLogin()
             }
         }
     }

ksmserver/screenlocker/greeter/fallbacktheme/SessionSwitching.qml

@@ -26,9 +26,9 @@ Item {
     property alias switchUserSupported: sessions.switchUserSupported
     implicitWidth: theme.mSize(theme.defaultFont).width * 55
     implicitHeight: theme.mSize(theme.defaultFont).height * 25
-    signal activateSession()
+    signal sessionActivated()
-    signal startNewSession()
+    signal newSessionStarted()
-    signal cancel()
+    signal switchingCanceled()
     Sessions {
         id: sessions
     }
@@ -65,7 +65,7 @@ Item {
                 onClicked: userSessionsView.currentIndex = userSessionsView.indexAt(mouse.x, mouse.y)
                 onDoubleClicked: {
                     sessions.activateSession(userSessionsView.indexAt(mouse.x, mouse.y));
-                    activateSession();
+                    sessionActivated();
                 }
             }
         }
@@ -102,7 +102,7 @@ Item {
             iconSource: "fork"
             onClicked: {
                 sessions.activateSession(userSessionsView.currentIndex);
-                activateSession();
+                sessionActivated();
             }
         }
         AccelButton {
@@ -112,14 +112,14 @@ Item {
             visible: sessions.startNewSessionSupported
             onClicked: {
                 sessions.startNewSession();
-                startNewSession();
+                newSessionStarted();
             }
         }
         AccelButton {
             id: cancelSession
             label: i18nd("kscreenlocker_greet", "Cancel")
             iconSource: "dialog-cancel"
-            onClicked: cancel()
+            onClicked: switchingCanceled()
         }
         anchors.bottom: parent.bottom
         anchors.horizontalCenter: userSessionsUI.horizontalCenter