git.iko.soy/unity8
on xenial help sign in
Hide internal functionality of lightdmapi
1b8367aJosh Arenson
qml/Greeter/LightDMGreeterAPI.qml+23−15
compare with xenial
unifiedsplit
@@ -16,45 +16,53 @@
16
16
17/**
17/**
18 * Expose an API that allows interaction with the
18 * Expose an API that allows interaction with the
19− * integrated LightDM or real LightDM depending on shell mode
19+ * integrated LightDM or real LightDM depending on shell mode.
20+ * This is a hack to essentially support conditional imports
20 */
21 */
22+
21import QtQuick 2.3
23import QtQuick 2.3
22
24
23Loader {
25Loader {
26+ id: loader
24 source: "IntegratedLightDMImpl.qml"
27 source: "IntegratedLightDMImpl.qml"
25− property bool valid: item !== null
26
28
29+ QtObject {
30+ id: d
31+
32+ property bool valid: loader.item !== null
33+ }
34+
27− property bool active: valid ? item.active : null
35+ property bool active: d.valid ? item.active : null
28− property bool authenticated: valid ? item.authenticated : null
36+ property bool authenticated: d.valid ? item.authenticated : null
29− property bool promptless: valid ? item.promptless : null
37+ property bool promptless: d.valid ? item.promptless : null
30− property real userCount: valid ? item.userCount : null
38+ property real userCount: d.valid ? item.userCount : null
31
39
32− property var theGreeter: valid ? item.theGreeter : null
40+ property var theGreeter: d.valid ? item.theGreeter : null
33− property var infographicModel: valid ? item.infographicModel : null
41+ property var infographicModel: d.valid ? item.infographicModel : null
34− property var userModel: valid ? item.userModel : null
42+ property var userModel: d.valid ? item.userModel : null
35
43
36 function authenticate(user) {
44 function authenticate(user) {
37− if (valid) item.authenticate(user);
45+ if (d.valid) item.authenticate(user);
38 }
46 }
39
47
40 function getUser(uid) {
48 function getUser(uid) {
41− if (valid) return item.getUser(uid);
49+ if (d.valid) return item.getUser(uid);
42 }
50 }
43
51
44 function infographicReadyForDataChange() {
52 function infographicReadyForDataChange() {
45− if (valid) return item.infographicReadyForDataChange();
53+ if (d.valid) return item.infographicReadyForDataChange();
46 }
54 }
47
55
48 function respond(response) {
56 function respond(response) {
49− if (valid) item.respond(response);
57+ if (d.valid) item.respond(response);
50 }
58 }
51
59
52 function showGreeter() {
60 function showGreeter() {
53− if (valid) item.showGreeter();
61+ if (d.valid) item.showGreeter();
54 }
62 }
55
63
56 function startSessionSync() {
64 function startSessionSync() {
57− if (valid) item.startSessionSync();
65+ if (d.valid) item.startSessionSync();
58 }
66 }
59}
67}
60
68