6ec76ab · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Merge prereq

6ec76abJosh Arenson10 years ago

data/unity8-greeter-wrapper+1−1

compare with xenial

unifiedsplit

@@ -62,7 +62,7 @@ set_greeter_var PA_DISABLED 1

62# creates for them and don't want to start all the services that a normal

63# session would. So it's inconvenient to live within an upstart session.

64# But... we still want to use Upstart for some services. So launch here.

65−USC_SOCKET=$MIR_SOCKET MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &

65+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &

66INIT_PID=$!

67while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done

68export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)

qml/Greeter/Greeter.qml+1−3

@@ -307,9 +307,7 @@ Showable {

307 if (root.locked) {

308 LightDMService.greeter.respond(response);

309 } else {

310− if (LightDMService.greeter.active && !LightDMService.greeter.authenticated) { // could happen if forcedUnlock

311− d.login();

310+ d.login();

312− }

313 loader.item.hide();

311 loader.item.hide();

314 }

312 }

315 }

313 }

tests/qmltests/tst_Shell.qml+4−12

@@ -1142,16 +1142,13 @@ Rectangle {

1142

1143 function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {

1144 loadShell("phone");

1145− swipeAwayGreeter();

1146−

1147− sessionSpy.clear();

1148− verify(sessionSpy.valid);

1149−

1150− showGreeter();

1151

1145

1152 var greeter = findChild(shell, "greeter");

1146 var greeter = findChild(shell, "greeter");

1153 verify(!greeter.locked);

1147 verify(!greeter.locked);

1154− verify(sessionSpy.count > 0);

1148+ compare(sessionSpy.count, 0);

1149+

1150+ swipeAwayGreeter();

1151+ compare(sessionSpy.count, 1);

1155 }

1152 }

1156

1153

1157 function test_fullscreen() {

1154 function test_fullscreen() {

@@ -2189,11 +2186,6 @@ Rectangle {

2189 shell.usageScenario = "desktop";

2186 shell.usageScenario = "desktop";

2190 GSettingsController.setAutohideLauncher(!data.launcherLocked);

2187 GSettingsController.setAutohideLauncher(!data.launcherLocked);

2191 waitForRendering(shell);

2188 waitForRendering(shell);

2192− // Not sure why 2 but it's the number of times

2193− // it triggers at this time and we need to wait

2194− // for them otherwise a sessionStarted signal will

2195− // hide the launcher and make the test fail

2196− tryCompare(sessionSpy, "count", 2);

2197

2189

2198 var launcher = findChild(shell, "launcher");

2190 var launcher = findChild(shell, "launcher");

2199 var launcherPanel = findChild(launcher, "launcherPanel");

2191 var launcherPanel = findChild(launcher, "launcherPanel");