on xenial help sign in
Refactor to use key instead of hacked display name
db1d7b7Josh Arenson
qml/Greeter/SessionsList.qml+2−2
@@ -25,7 +25,7 @@ Item {
25
25
26 property string initiallySelectedSession
26 property string initiallySelectedSession
27 property alias selectedIndex: sessionsList.selectedIndex
27 property alias selectedIndex: sessionsList.selectedIndex
28− signal sessionSelected(string sessionName)
28+ signal sessionSelected(string sessionKey)
29
29
30 LoginAreaContainer {
30 LoginAreaContainer {
31 height: sessionsList.itemHeight * sessionsList.model.count
31 height: sessionsList.itemHeight * sessionsList.model.count
@@ -51,7 +51,7 @@ Item {
51 objectName: "sessionDelegate" + index
51 objectName: "sessionDelegate" + index
52 iconSource: icon_url
52 iconSource: icon_url
53 text: display
53 text: display
54− selected: display.toLowerCase() === initiallySelectedSession.toLowerCase()
54+ selected: key === initiallySelectedSession
55 }
55 }
56
56
57 Component.onCompleted: {
57 Component.onCompleted: {
qml/Greeter/WideView.qml+1−1
@@ -219,7 +219,7 @@ FocusScope {
219 onSessionSelected: {
219 onSessionSelected: {
220 loginAreaLoader.loginListShown = true
220 loginAreaLoader.loginListShown = true
221 loginAreaLoader.sessionUpdated = true
221 loginAreaLoader.sessionUpdated = true
222− loginAreaLoader.currentSession = sessionName
222+ loginAreaLoader.currentSession = sessionKey
223 }
223 }
224 ignoreUnknownSignals: true
224 ignoreUnknownSignals: true
225 }
225 }