git.iko.soy/unity8
on xenial help sign in
Fix tryShell starting with full user list instead of single user
62feeb8Michael Terry
qml/Greeter/LoginList.qml+1
compare with xenial
unifiedsplit
@@ -17,6 +17,7 @@
17import QtQuick 2.4
17import QtQuick 2.4
18import QtGraphicalEffects 1.0
18import QtGraphicalEffects 1.0
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20+import LightDM 0.1 as LightDM
20import "../Components"
21import "../Components"
21
22
22StyledItem {
23StyledItem {
qml/Greeter/WideView.qml+1
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19+import LightDM 0.1 as LightDM
19
20
20FocusScope {
21FocusScope {
21 id: root
22 id: root
tests/mocks/AccountsService/AccountsService.cpp−1
@@ -37,7 +37,6 @@ AccountsService::AccountsService(QObject* parent)
37 m_hereLicensePath(""),
37 m_hereLicensePath(""),
38 m_usersModel(new UsersModel(this))
38 m_usersModel(new UsersModel(this))
39{
39{
40− QLightDM::MockController::instance()->setUserMode("full");
41}
40}
42
41
43QString AccountsService::user() const
42QString AccountsService::user() const
tests/mocks/liblightdm/MockUsersModel.cpp+2−2
@@ -65,8 +65,8 @@ UsersModel::UsersModel(QObject *parent)
65 roles[UidRole] = "uid";
65 roles[UidRole] = "uid";
66 setRoleNames(roles);
66 setRoleNames(roles);
67
67
68− connect(MockController::instance(), SIGNAL(userModeChanged()),
68+ connect(MockController::instance(), &MockController::userModeChanged,
69− this, SLOT(resetEntries()));
69+ this, &UsersModel::resetEntries);
70 resetEntries();
70 resetEntries();
71}
71}
72
72