4d6f862 · unity8 · git.iko.soy

plugins/LightDM/UsersModel.cpp+5

compare with xenial

unifiedsplit

@@ -109,6 +109,11 @@ QVariant MangleModel::data(const QModelIndex &index, int role) const

109 variantData = stringData;

110 }

111

112+ // Workaround for liblightdm returning "" when a user has no default session

113+ if (Q_UNLIKELY(role == QLightDM::UsersModel::SessionRole && variantData.toString().length() == 0)) {

114+ variantData = Greeter::instance()->defaultSessionHint();

115+ }

116+

112 return variantData;

117 return variantData;

113}

118}

114

119

qml/Greeter/WideView.qml−6

@@ -142,12 +142,6 @@ FocusScope {

142

143 function setCurrentSession() {

144 currentSession = LightDMService.users.data(currentIndex, LightDMService.userRoles.SessionRole);

145−

146− // If the user has never selected a session

147− // LightDM returns an empty string

148− if (!currentSession.length) {

149− currentSession = LightDMService.greeter.defaultSession

150− }

151 }

145 }

152 }

146 }

153

147

tests/qmltests/Greeter/tst_WideView.qml+6−1

@@ -398,8 +398,13 @@ StyledItem {

398 function test_sessionless_user_is_still_valid() {

399 var loginList = findChild(view, "loginList")

400

401+ /*

402+ * If a user has never logged in before, or, for some reason

403+ * has no sessionHint, ensure that the model returns the default

404+ * session and that the view respects this

405+ */

401 selectUser("no-session");

406 selectUser("no-session");

402− compare(LightDM.Users.data(loginList.currentIndex, LightDM.UserRoles.SessionRole), "");

407+ compare(LightDM.Users.data(loginList.currentIndex, LightDM.UserRoles.SessionRole), LightDM.Greeter.defaultSession);

403

408

404 tryCompare(loginList, "currentSession", LightDM.Greeter.defaultSession);

409 tryCompare(loginList, "currentSession", LightDM.Greeter.defaultSession);

405 }

410 }