@@ -20,6 +20,7 @@ import GSettings 1.0
2020import Ubuntu.Components 1.1
2121import Ubuntu.SystemImage 0.1
2222import Unity.Launcher 0.1
23+import "." 0.1
2324import "../Components"
2425
2526Showable {
@@ -43,7 +44,7 @@ Showable {
4344 readonly property bool hasLockedApp: lockedApp !== ""
4445
4546 property bool forcedUnlock
46− readonly property bool locked: lightDM.greeter.active && !lightDM.greeter.authenticated && !forcedUnlock
47+ readonly property bool locked: TheLightDM.greeter.active && !TheLightDM.greeter.authenticated && !forcedUnlock
4748
4849 property bool tabletMode
4950 property url viewSource // only used for testing
@@ -106,15 +107,10 @@ Showable {
106107 return d.startUnlock(true /* toTheRight */);
107108 }
108109
109− LightDM{
110− id:lightDM
111− fullLightDM: root.fullLightDM
112− }
113−
114110 QtObject {
115111 id: d
116112
117− readonly property bool multiUser: lightDM.users.count > 1
113+ readonly property bool multiUser: TheLightDM.users.count > 1
118114 property int currentIndex
119115 property bool waiting
120116
@@ -138,15 +134,15 @@ Showable {
138134 loader.item.reset();
139135 }
140136 currentIndex = uid;
141− var user = lightDM.users.data(uid, lightDM.userRoles.NameRole);
137+ var user = TheLightDM.users.data(uid, TheLightDM.userRoles.NameRole);
142138 AccountsService.user = user;
143139 LauncherModel.setUser(user);
144− lightDM.greeter.authenticate(user); // always resets auth state
140+ TheLightDM.greeter.authenticate(user); // always resets auth state
145141 }
146142
147143 function login() {
148144 enabled = false;
149− if (lightDM.greeter.startSessionSync()) {
145+ if (TheLightDM.greeter.startSessionSync()) {
150146 sessionStarted();
151147 if (loader.item) {
152148 loader.item.notifyAuthenticationSucceeded();
@@ -271,7 +267,7 @@ Showable {
271267 root.lockedApp = "";
272268 root.forceActiveFocus();
273269 d.selectUser(d.currentIndex, true);
274− lightDM.infographic.readyForDataChange();
270+ TheLightDM.infographic.readyForDataChange();
275271 }
276272
277273 Connections {
@@ -281,9 +277,9 @@ Showable {
281277 }
282278 onResponded: {
283279 if (root.locked) {
284− lightDM.greeter.respond(response);
280+ TheLightDM.greeter.respond(response);
285281 } else {
286− if (lightDM.greeter.active && !lightDM.greeter.authenticated) { // could happen if forcedUnlock
282+ if (TheLightDM.greeter.active && !TheLightDM.greeter.authenticated) { // could happen if forcedUnlock
287283 d.login();
288284 }
289285 loader.item.hide();
@@ -349,18 +345,18 @@ Showable {
349345 Binding {
350346 target: loader.item
351347 property: "userModel"
352− value: lightDM.users
348+ value: TheLightDM.users
353349 }
354350
355351 Binding {
356352 target: loader.item
357353 property: "infographicModel"
358− value: lightDM.infographic
354+ value: TheLightDM.infographic
359355 }
360356 }
361357
362358 Connections {
363− target: lightDM.greeter
359+ target: TheLightDM.greeter
364360
365361 onShowGreeter: root.forceShow()
366362
@@ -370,7 +366,7 @@ Showable {
370366 }
371367
372368 onShowMessage: {
373− if (!lightDM.greeter.active) {
369+ if (!TheLightDM.greeter.active) {
374370 return; // could happen if hideGreeter() comes in before we prompt
375371 }
376372
@@ -389,7 +385,7 @@ Showable {
389385 onShowPrompt: {
390386 d.waiting = false;
391387
392− if (!lightDM.greeter.active) {
388+ if (!TheLightDM.greeter.active) {
393389 return; // could happen if hideGreeter() comes in before we prompt
394390 }
395391
@@ -399,14 +395,14 @@ Showable {
399395 onAuthenticationComplete: {
400396 d.waiting = false;
401397
402− if (lightDM.greeter.authenticated) {
398+ if (TheLightDM.greeter.authenticated) {
403399 AccountsService.failedLogins = 0;
404400 d.login();
405− if (!lightDM.greeter.promptless) {
401+ if (!TheLightDM.greeter.promptless) {
406402 loader.item.hide();
407403 }
408404 } else {
409− if (!lightDM.greeter.promptless) {
405+ if (!TheLightDM.greeter.promptless) {
410406 AccountsService.failedLogins++;
411407 }
412408
@@ -427,7 +423,7 @@ Showable {
427423 }
428424
429425 loader.item.notifyAuthenticationFailed();
430− if (!lightDM.greeter.promptless) {
426+ if (!TheLightDM.greeter.promptless) {
431427 d.selectUser(d.currentIndex, false);
432428 }
433429 }
@@ -435,8 +431,8 @@ Showable {
435431
436432 onRequestAuthenticationUser: {
437433 // Find index for requested user, if it exists
438− for (var i = 0; i < lightDM.users.count; i++) {
439− if (user === lightDM.users.data(i, lightDM.userRoles.NameRole)) {
434+ for (var i = 0; i < TheLightDM.users.count; i++) {
435+ if (user === TheLightDM.users.data(i, TheLightDM.userRoles.NameRole)) {
440436 d.selectUser(i, true);
441437 return;
442438 }
@@ -445,19 +441,19 @@ Showable {
445441 }
446442
447443 Binding {
448− target: lightDM.greeter
444+ target: TheLightDM.greeter
449445 property: "active"
450446 value: root.active
451447 }
452448
453449 Binding {
454− target: lightDM.infographic
450+ target: TheLightDM.infographic
455451 property: "username"
456− value: AccountsService.statsWelcomeScreen ? lightDM.users.data(d.currentIndex, lightDM.userRoles.NameRole) : ""
452+ value: AccountsService.statsWelcomeScreen ? TheLightDM.users.data(d.currentIndex, TheLightDM.userRoles.NameRole) : ""
457453 }
458454
459455 Connections {
460456 target: i18n
461− onLanguageChanged: lightDM.infographic.readyForDataChange()
457+ onLanguageChanged: TheLightDM.infographic.readyForDataChange()
462458 }
463459}