9eef0f3 · unity8 · git.iko.soy

qml/Greeter/Greeter.qml+3−3

compare with xenial

unifiedsplit

@@ -131,7 +131,7 @@ Showable {

131 loader.item.reset();

132 }

133 currentIndex = uid;

134− var user = lightDMGreeterAPI.getUser(uid);

134+ var user = lightDMGreeterAPI.getUsername(uid);

135 AccountsService.user = user;

136 LauncherModel.setUser(user);

137 lightDMGreeterAPI.authenticate(user); // always resets auth state

@@ -391,7 +391,7 @@ Showable {

391 onRequestAuthenticationUser: {

392 // Find index for requested user, if it exists

393 for (var i = 0; i < lightDMGreeterAPI.userCount; i++) {

394− if (user === lightDMGreeterAPI.getUser(i)) {

394+ if (user === lightDMGreeterAPI.getUsername(i)) {

395 d.selectUser(i, true);

396 return;

397 }

@@ -408,7 +408,7 @@ Showable {

408 Binding {

409 target: lightDMGreeterAPI.infographicModel

410 property: "username"

411− value: AccountsService.statsWelcomeScreen ? lightDMGreeterAPI.getUser(d.currentIndex) : ""

411+ value: AccountsService.statsWelcomeScreen ? lightDMGreeterAPI.getUsername(d.currentIndex) : ""

412 }

413

414 Connections {

qml/Greeter/IntegratedLightDMImpl.qml+1−1

@@ -31,7 +31,7 @@ QtObject {

31 LightDM.Greeter.authenticate(user);

32 }

33

34− function getUser(uid) {

34+ function getUsername(uid) {

35 return LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

36 }

37

qml/Greeter/LightDMGreeterAPI.qml+2−2

@@ -49,9 +49,9 @@ Loader {

49 }

50 }

51

52− function getUser(uid) {

52+ function getUsername(uid) {

53 if (d.valid) {

54− return item.getUser(uid);

54+ return item.getUsername(uid);

55 }

56 }

57