git.iko.soy/unity8
on xenial help sign in
Refactor getUser to getUsername for return value clarification
commit9eef0f3af979ba240433d825bc097862d8faa63a authorJosh Arenson <joshua.arenson@canonical.com> dateMon 1 Jun 2015, 13:48 (11 years ago) parentb8d9d68
3 files changed+6−6
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+3−3 qml/Greeter/IntegratedLightDMImpl.qml+1−1 qml/Greeter/LightDMGreeterAPI.qml+2−2
qml/Greeter/Greeter.qml+3−3
@@ -131,7 +131,7 @@ Showable {
131131 loader.item.reset();
132132 }
133133 currentIndex = uid;
134− var user = lightDMGreeterAPI.getUser(uid);
134+ var user = lightDMGreeterAPI.getUsername(uid);
135135 AccountsService.user = user;
136136 LauncherModel.setUser(user);
137137 lightDMGreeterAPI.authenticate(user); // always resets auth state
@@ -391,7 +391,7 @@ Showable {
391391 onRequestAuthenticationUser: {
392392 // Find index for requested user, if it exists
393393 for (var i = 0; i < lightDMGreeterAPI.userCount; i++) {
394− if (user === lightDMGreeterAPI.getUser(i)) {
394+ if (user === lightDMGreeterAPI.getUsername(i)) {
395395 d.selectUser(i, true);
396396 return;
397397 }
@@ -408,7 +408,7 @@ Showable {
408408 Binding {
409409 target: lightDMGreeterAPI.infographicModel
410410 property: "username"
411− value: AccountsService.statsWelcomeScreen ? lightDMGreeterAPI.getUser(d.currentIndex) : ""
411+ value: AccountsService.statsWelcomeScreen ? lightDMGreeterAPI.getUsername(d.currentIndex) : ""
412412 }
413413
414414 Connections {
qml/Greeter/IntegratedLightDMImpl.qml+1−1
@@ -31,7 +31,7 @@ QtObject {
3131 LightDM.Greeter.authenticate(user);
3232 }
3333
34− function getUser(uid) {
34+ function getUsername(uid) {
3535 return LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
3636 }
3737
qml/Greeter/LightDMGreeterAPI.qml+2−2
@@ -49,9 +49,9 @@ Loader {
4949 }
5050 }
5151
52− function getUser(uid) {
52+ function getUsername(uid) {
5353 if (d.valid) {
54− return item.getUser(uid);
54+ return item.getUsername(uid);
5555 }
5656 }
5757