Merge lp:~josharenson/unity8/fixMangledUsername into lp:unity8

[Josh Arenson]

Don't let IntegratedLightDM muck with the username

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2022
http://jenkins.qa.ubuntu.com/job/unity8-ci/6652/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5027
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/67/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5024
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5024/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24938
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-mako/41/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/67
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24934

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6652/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Tested, works fine

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes (modulo xenial)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

=== modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2015-09-30 13:09:38 +0000
+++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2015-11-05 03:55:22 +0000
@@ -34,8 +34,7 @@
     entries.reserve(users.count());
     Q_FOREACH(const QString &user, users)
     {
-        QVariant defaultValue = QString(user[0].toUpper() + user.mid(1));
-        QString name = settings.value(user + "/name", defaultValue).toString();
+        QString name = settings.value(user + "/name", user).toString();
         entries.append({user, name, 0, 0, false, false, 0, 0});
     }
 }