Merge lp:~aacid/unity8/no_preview_in_preview_title into lp:unity8

[Albert Astals Cid]

Drop the " Preview" suffix from Preview title

As requested in https://bugs.launchpad.net/unity8/+bug/1316671

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

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

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

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

 * If you changed the UI, has there been a design review?
It's a design driven change.

[lp:~aacid/unity8/no_preview_in_preview_title]

967. By Albert Astals Cid on 2014-06-13

Merge ~mterry/unity8/unsplit/

968. By Albert Astals Cid on 2014-06-13

update pot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:966
http://jenkins.qa.ubuntu.com/job/unity8-ci/3125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/842
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1863/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8378

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-05 22:07:57 +0000
+++ CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -96,7 +96,6 @@
 declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
 
 set(SHELL_APP unity8)
-set(GREETER_APP unity8-greeter)
 set(SCOPE_TOOL unity-scope-tool)
 
 include_directories(

=== removed file 'data/51-unity8-greeter.conf'
--- data/51-unity8-greeter.conf	2013-12-20 15:26:36 +0000
+++ data/51-unity8-greeter.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[SeatDefaults]
-greeter-session=unity8-greeter

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-05-27 07:09:28 +0000
+++ data/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -1,20 +1,7 @@
 # generate desktop file
 configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
-configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)
 
 # install desktop files
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
     DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
     )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
-    )
-install(FILES 51-${GREETER_APP}.conf
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
-    )
-install(FILES ${GREETER_APP}-wrapper
-    DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
-install(FILES ${GREETER_APP}-init.conf ${GREETER_APP}-logrotate.conf
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
-    )

=== removed file 'data/unity8-greeter-init.conf'
--- data/unity8-greeter-init.conf	2014-05-09 16:52:32 +0000
+++ data/unity8-greeter-init.conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-description "Unity 8 Greeter initialization"
-author "Michael Terry <[e-mail]>"
-
-start on unity8-greeter-started
-task
-emits indicator-services-start
-
-script
-    start --no-wait ofono-setup || true
-    initctl emit --no-wait indicator-services-start || true
-    start --no-wait maliit-server || true
-end script

=== removed file 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	2014-06-03 20:29:33 +0000
+++ data/unity8-greeter-wrapper	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-#!/bin/sh
-# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2011,2013 Canonical Ltd
-# Author: Michael Terry <[e-mail]>
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 3 of the License.
-#
-# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
-
-# This wrapper merely ensures that init and friends live only as long as this
-# script does.  Otherwise, it's very easy for some processes to not notice that
-# the session died.  We could try to do this in-process, but we want to do this
-# cleanup even if the greeter aborts.
-
-trap cleanup TERM EXIT
-
-cleanup()
-{
-    trap - TERM EXIT
-    # Kill upstart and indicators
-    if [ -n "$INIT_PID" ]; then
-        kill "$INIT_PID"
-    fi
-    if [ -n "$DBUS_PID" ]; then
-        kill "$DBUS_PID"
-    fi
-    if [ -n "$CMD_PID" ]; then
-        kill "$CMD_PID"
-    fi
-    exit 0
-}
-
-set_greeter_var()
-{
-    export "$1=$2"
-    gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"
-    if [ -n "$INIT_PID" ]; then
-        initctl set-env --global "$1=$2"
-    fi
-}
-
-# Start dbus if it hasn't already been started for us (such as on the Desktop
-# images by dbus-launch).  We don't want to use dbus-launch ourselves because
-# we don't want dbus-x11 on the Touch images.
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-    export DBUS_SESSION_BUS_ADDRESS=unix:abstract=$(mktemp -u /tmp/dbus-XXXXXXXXXX)
-    DBUS_PID=$(dbus-daemon --fork --session --print-pid --address="$DBUS_SESSION_BUS_ADDRESS")
-fi
-
-SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
-rm -f $SUB_SOCKET # clear socket in case we were hard shut down
-
-# If touch session script (which sets up grid units and mir variables) is available, use it
-TOUCH_WRAPPER=
-if [ -x /usr/bin/ubuntu-touch-session ]; then
-    TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session
-fi
-
-# Pretend that we're in an ubuntu-touch session, so that indicator-network
-# will start.
-export DESKTOP_SESSION=ubuntu-touch
-
-# We disable ofono using pulse.  It causes problems with racing with the user's
-# pulse.  We need to come up with a better long-term fix for this, because we
-# eventually need the greeter to play ringtones for users that aren't logged in.
-set_greeter_var PA_DISABLED 1
-
-# Normal unity8 sessions are entirely driven by Upstart.  But greeters
-# are special.  They need access to the file descriptors that lightdm
-# creates for them and don't want to start all the services that a normal
-# session would.  So it's inconvenient to live within an upstart session.
-# But... we still want to use Upstart for some services.  So launch here.
-USC_SOCKET=$MIR_SOCKET MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/init --user --no-startup-event &
-INIT_PID=$!
-while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
-export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
-
-# Start any pre-greeter tasks if needed (like wizard)
-/sbin/initctl emit unity8-greeter-starting
-
-# Define language here for phone if available.  When phone user switches their
-# language, they expect that to affect the greeter too.  But the user doesn't
-# have permission to switch system language, only their own.  So we notice if
-# the phablet user exists and use their language if so.  TODO: talk to design
-# about whether we should switch language on fly as users are selected (this
-# is very hard to do technically).
-#
-# Do this after unity8-greeter-starting, in case a customization upstart job
-# changes language.
-if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then
-    USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
-    if [ -n "$USER_LANG" ]; then
-        set_greeter_var LANGUAGE "$USER_LANG"
-    fi
-    USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)
-    if [ -n "$USER_LOCALE" ]; then
-        set_greeter_var LANG "$USER_LOCALE"
-        set_greeter_var LC_ALL "$USER_LOCALE"
-    fi
-fi
-
-# And finally actually start the greeter
-exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
-CMD_PID=$!
-wait $CMD_PID
-CMD_PID=

=== removed file 'data/unity8-greeter.desktop.in'
--- data/unity8-greeter.desktop.in	2014-03-25 19:31:47 +0000
+++ data/unity8-greeter.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Unity 8 Greeter
-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter
-X-LightDM-Session-Type=mir

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-06 11:38:53 +0000
+++ debian/changelog	2014-06-13 07:56:31 +0000
@@ -1,3 +1,11 @@
+unity8 (7.89) UNRELEASED; urgency=medium
+
+  * Revert split greeter for now.  We will bring it back as an option
+    for Desktop, but use a big hammer revert right now to get Touch back
+    in shape.
+
+ -- Michael Terry <[e-mail]>  Wed, 11 Jun 2014 11:39:12 -0400
+
 unity8 (7.88+14.10.20140606-0ubuntu1) utopic; urgency=low
 
   [ Michał Sawicz ]

=== modified file 'debian/control'
--- debian/control	2014-06-03 20:29:33 +0000
+++ debian/control	2014-06-13 07:56:31 +0000
@@ -14,7 +14,6 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libhud-client2-dev,
-               liblightdm-qt5-3-dev (>= 1.11.1),
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
                libqt5xmlpatterns5-dev,
@@ -80,7 +79,6 @@
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-ubuntu-settings-components,
-         unity-greeter-session-broadcast,
          unity-launcher-impl-3,
          unity8-common (= ${source:Version}),
          unity8-private (= ${binary:Version}),
@@ -92,22 +90,12 @@
             unity-scope-scopes,
 Breaks: indicator-network (<< 0.5.1),
         ubuntu-touch-session (<< 0.107),
+        unity8-greeter (<< 7.89),
 Replaces: ubuntu-touch-session (<< 0.82~),
+          unity8-greeter (<< 7.89),
 Description: Unity 8 shell
  The Unity 8 shell is the primary user interface for Ubuntu devices.
 
-Package: unity8-greeter
-Architecture: any
-Depends: libglib2.0-bin,
-         lightdm,
-         unity8 (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Breaks: unity8 (<< 7.87),
-Replaces: unity8 (<< 7.87),
-Description: Ubuntu QML greeter
- The Ubuntu QML greeter is the primary greeter for Ubuntu devices.
-
 Package: unity8-common
 Architecture: all
 Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
@@ -146,7 +134,6 @@
          ubuntu-ui-toolkit-autopilot,
          unity8 (= ${source:Version}),
          unity8-fake-env (= ${source:Version}),
-         unity8-greeter (= ${source:Version}),
          url-dispatcher-tools,
          ${misc:Depends},
          ${python3:Depends},

=== modified file 'debian/copyright'
--- debian/copyright	2013-07-26 18:45:21 +0000
+++ debian/copyright	2014-06-13 07:56:31 +0000
@@ -22,7 +22,7 @@
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
 
-Files: tests/mocks/liblightdm/UsersModel.h tests/mocks/liblightdm/Greeter.h
+Files: tests/mocks/LightDM/UsersModel.h tests/mocks/LightDM/Greeter.h
 Copyright: 2013 Canonical Ltd.
            2010-2011 David Edmundson
            2010-2011 Robert Ancell

=== modified file 'debian/rules'
--- debian/rules	2014-05-05 22:07:57 +0000
+++ debian/rules	2014-06-13 07:56:31 +0000
@@ -34,3 +34,7 @@
 # use private lib directories
 override_dh_makeshlibs:
 	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
+
+# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
+override_dh_shlibdeps:
+	dh_shlibdeps -XlibMockLightDM-qml.so

=== removed file 'debian/unity8-greeter.install'
--- debian/unity8-greeter.install	2014-03-27 19:31:25 +0000
+++ debian/unity8-greeter.install	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-usr/bin/unity8-greeter
-usr/bin/unity8-greeter-wrapper
-usr/share/lightdm
-usr/share/unity8/GreeterShell.qml
-usr/share/unity8/Greeter
-usr/share/upstart/sessions/unity8-greeter-*.conf

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2014-05-13 18:41:08 +0000
+++ debian/unity8-private.install	2014-06-13 07:56:31 +0000
@@ -4,7 +4,6 @@
 usr/lib/*/unity8/qml/LightDM
 usr/lib/*/unity8/qml/Powerd
 usr/lib/*/unity8/qml/SessionBroadcast
-usr/lib/*/unity8/qml/SessionManager
 usr/lib/*/unity8/qml/Ubuntu
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/Utils

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2014-05-08 20:16:28 +0000
+++ debian/unity8.install	2014-06-13 07:56:31 +0000
@@ -1,6 +1,7 @@
 data/unity8.conf usr/share/upstart/sessions/
 usr/bin/unity8
 usr/share/applications/unity8.desktop
+usr/share/unity8/Greeter
 usr/share/unity8/Hud
 usr/share/unity8/Launcher
 usr/share/unity8/Panel

=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2014-03-25 17:37:35 +0000
+++ plugins/AccountsService/AccountsService.cpp	2014-06-13 07:56:31 +0000
@@ -24,6 +24,7 @@
 AccountsService::AccountsService(QObject* parent)
   : QObject(parent),
     m_service(new AccountsServiceDBusAdaptor(this)),
+    m_user(qgetenv("USER")),
     m_demoEdges(false),
     m_statsWelcomeScreen(false)
 {
@@ -31,9 +32,6 @@
             this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
     connect(m_service, SIGNAL(maybeChanged(const QString &)),
             this, SLOT(maybeChanged(const QString &)));
-
-    setUser(qgetenv("USER"));
-    updateDemoEdgesForCurrentUser();
 }
 
 QString AccountsService::user() const
@@ -59,22 +57,9 @@
 void AccountsService::setDemoEdges(bool demoEdges)
 {
     m_demoEdges = demoEdges;
-    Q_EMIT demoEdgesChanged();
     m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
 }
 
-bool AccountsService::demoEdgesForCurrentUser() const
-{
-    return m_demoEdgesForCurrentUser;
-}
-
-void AccountsService::setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser)
-{
-    m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
-    Q_EMIT demoEdgesForCurrentUserChanged();
-    m_service->setUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges", demoEdgesForCurrentUser);
-}
-
 QString AccountsService::backgroundFile() const
 {
     return m_backgroundFile;
@@ -94,15 +79,6 @@
     }
 }
 
-void AccountsService::updateDemoEdgesForCurrentUser()
-{
-    auto demoEdgesForCurrentUser = m_service->getUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges").toBool();
-    if (m_demoEdgesForCurrentUser != demoEdgesForCurrentUser) {
-        m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
-        Q_EMIT demoEdgesForCurrentUserChanged();
-    }
-}
-
 void AccountsService::updateBackgroundFile()
 {
     auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
@@ -123,14 +99,13 @@
 
 void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
 {
+    if (m_user != user) {
+        return;
+    }
+
     if (interface == "com.canonical.unity.AccountsService") {
         if (changed.contains("demo-edges")) {
-            if (qgetenv("USER") == user) {
-                updateDemoEdgesForCurrentUser();
-            }
-            if (m_user == user) {
-                updateDemoEdges();
-            }
+            updateDemoEdges();
         }
     } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
         if (changed.contains("StatsWelcomeScreen")) {
@@ -141,8 +116,10 @@
 
 void AccountsService::maybeChanged(const QString &user)
 {
-    if (m_user == user) {
-        // Standard properties might have changed
-        updateBackgroundFile();
+    if (m_user != user) {
+        return;
     }
+
+    // Standard properties might have changed
+    updateBackgroundFile();
 }

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2013-10-15 17:48:24 +0000
+++ plugins/AccountsService/AccountsService.h	2014-06-13 07:56:31 +0000
@@ -35,10 +35,6 @@
                 READ demoEdges
                 WRITE setDemoEdges
                 NOTIFY demoEdgesChanged)
-    Q_PROPERTY (bool demoEdgesForCurrentUser
-                READ demoEdgesForCurrentUser
-                WRITE setDemoEdgesForCurrentUser
-                NOTIFY demoEdgesForCurrentUserChanged)
     Q_PROPERTY (QString backgroundFile
                 READ backgroundFile
                 NOTIFY backgroundFileChanged)
@@ -53,15 +49,12 @@
     void setUser(const QString &user);
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
-    bool demoEdgesForCurrentUser() const;
-    void setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser);
     QString backgroundFile() const;
     bool statsWelcomeScreen() const;
 
 Q_SIGNALS:
     void userChanged();
     void demoEdgesChanged();
-    void demoEdgesForCurrentUserChanged();
     void backgroundFileChanged();
     void statsWelcomeScreenChanged();
 
@@ -71,14 +64,12 @@
 
 private:
     void updateDemoEdges();
-    void updateDemoEdgesForCurrentUser();
     void updateBackgroundFile();
     void updateStatsWelcomeScreen();
 
     AccountsServiceDBusAdaptor *m_service;
     QString m_user;
     bool m_demoEdges;
-    bool m_demoEdgesForCurrentUser;
     QString m_backgroundFile;
     bool m_statsWelcomeScreen;
 };

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2014-05-18 02:12:09 +0000
+++ plugins/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -17,7 +17,6 @@
 add_subdirectory(Dash)
 add_subdirectory(Powerd)
 add_subdirectory(SessionBroadcast)
-add_subdirectory(SessionManager)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2014-05-18 02:12:09 +0000
+++ plugins/LightDM/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -1,22 +1,23 @@
 # Dependencies
 include(FindPkgConfig)
-pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
 pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
+# TODO: Once we split out a separate greeter process, uncomment these lines
+#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${LIBLIGHTDM_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
+    #${LIBLIGHTDM_INCLUDE_DIRS}
     ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
 )
 
 set(QMLPLUGIN_SRC
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
+    ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
     DBusGreeterList.cpp
     Greeter.cpp
     plugin.cpp
-    URLDispatcher.cpp
     UsersModel.cpp
     )
 
@@ -25,10 +26,12 @@
     )
 
 target_link_libraries(LightDM-qml
-    ${LIBLIGHTDM_LDFLAGS}
+    MockLightDM-demo
+# TODO: Once we split out a separate greeter process, uncomment these lines
+#    ${LIBLIGHTDM_LDFLAGS}
     ${LIBUSERMETRICSOUTPUT_LDFLAGS}
     )
 
-qt5_use_modules(LightDM-qml DBus Qml)
+qt5_use_modules(LightDM-qml DBus Gui Qml)
 
 add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)

=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2014-05-06 17:52:08 +0000
+++ plugins/LightDM/Greeter.cpp	2014-06-13 07:56:31 +0000
@@ -56,10 +56,7 @@
             this, SLOT(showPromptFilter(QString, QLightDM::Greeter::PromptType)));
     connect(d->m_greeter, SIGNAL(authenticationComplete()),
             this, SLOT(authenticationCompleteFilter()));
-    connect(d->m_greeter, SIGNAL(idle()), this, SIGNAL(idle()));
-    connect(d->m_greeter, SIGNAL(reset()), this, SIGNAL(reset()));
 
-    d->m_greeter->setResettable(true);
     d->m_greeter->connectSync();
 }
 

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-04-25 17:57:39 +0000
+++ plugins/LightDM/Greeter.h	2014-06-13 07:56:31 +0000
@@ -56,8 +56,6 @@
     void authenticationComplete();
     void authenticationUserChanged(const QString &user);
     void promptlessChanged();
-    void idle();
-    void reset();
 
     // This signal is emitted by external agents like indicators, and the UI
     // should switch to this user if possible.

=== removed file 'plugins/LightDM/URLDispatcher.cpp'
--- plugins/LightDM/URLDispatcher.cpp	2014-03-25 15:04:46 +0000
+++ plugins/LightDM/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "URLDispatcher.h"
-
-#include <QDBusConnection>
-
-class URLDispatcherInterface : public QObject
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
-
-public:
-    explicit URLDispatcherInterface(URLDispatcher *parent);
-
-    Q_SCRIPTABLE void DispatchURL(const QString &url);
-};
-
-URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
-  : QObject(parent)
-{
-}
-
-void URLDispatcherInterface::DispatchURL(const QString &url)
-{
-    Q_EMIT static_cast<URLDispatcher *>(parent())->dispatchURL(url);
-}
-
-URLDispatcher::URLDispatcher(QObject *parent)
-  : QObject(parent)
-{
-    // This class also manages our url-dispatcher interception.  We intercept
-    // url-dispatcher because rather than spawning the handler for the URL in
-    // our own session, we want to do notify the user session to do it for us
-    // (and start an unlock in the process).
-    QDBusConnection connection = QDBusConnection::sessionBus();
-    URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
-    connection.registerObject("/com/canonical/URLDispatcher", dispatcher, QDBusConnection::ExportScriptableContents);
-    connection.registerService("com.canonical.URLDispatcher");
-}
-
-#include "URLDispatcher.moc"

=== removed file 'plugins/LightDM/URLDispatcher.h'
--- plugins/LightDM/URLDispatcher.h	2014-03-19 19:04:02 +0000
+++ plugins/LightDM/URLDispatcher.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UNITY_URLDISPATCHER_H
-#define UNITY_URLDISPATCHER_H
-
-#include <QObject>
-#include <QString>
-
-class URLDispatcher : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit URLDispatcher(QObject *parent=0);
-
-Q_SIGNALS:
-    void dispatchURL(const QString &url);
-};
-
-#endif

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2014-03-19 19:04:02 +0000
+++ plugins/LightDM/plugin.cpp	2014-06-13 07:56:31 +0000
@@ -20,7 +20,6 @@
 #include "plugin.h"
 #include "DBusGreeterList.h"
 #include "Greeter.h"
-#include "URLDispatcher.h"
 #include "UsersModel.h"
 #include <libusermetricsoutput/ColorTheme.h>
 #include <libusermetricsoutput/UserMetrics.h>
@@ -47,13 +46,6 @@
     return greeter;
 }
 
-static QObject *dispatcher_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new URLDispatcher();
-}
-
 static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -75,7 +67,6 @@
 
     Q_ASSERT(uri == QLatin1String("LightDM"));
     qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
-    qmlRegisterSingletonType<URLDispatcher>(uri, 0, 1, "URLDispatcher", dispatcher_provider);
     qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
     qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
     qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);

=== modified file 'plugins/SessionBroadcast/SessionBroadcast.cpp'
--- plugins/SessionBroadcast/SessionBroadcast.cpp	2014-05-16 21:23:31 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.cpp	2014-06-13 07:56:31 +0000
@@ -18,26 +18,11 @@
 
 #include "SessionBroadcast.h"
 #include <QDBusConnection>
-#include <QDBusConnectionInterface>
-#include <QDBusInterface>
 
 SessionBroadcast::SessionBroadcast(QObject* parent)
   : QObject(parent)
 {
     auto connection = QDBusConnection::SM_BUSNAME();
-    auto interface = connection.interface();
-    interface->startService("com.canonical.Unity.Greeter.Broadcast");
-    m_broadcaster = new QDBusInterface("com.canonical.Unity.Greeter.Broadcast",
-                                       "/com/canonical/Unity/Greeter/Broadcast",
-                                       "com.canonical.Unity.Greeter.Broadcast",
-                                       connection, this);
-
-    connection.connect("com.canonical.Unity.Greeter.Broadcast",
-                       "/com/canonical/Unity/Greeter/Broadcast",
-                       "com.canonical.Unity.Greeter.Broadcast",
-                       "StartUrl",
-                       this,
-                       SLOT(onStartUrl(const QString &, const QString &)));
 
     connection.connect("com.canonical.Unity.Greeter.Broadcast",
                        "/com/canonical/Unity/Greeter/Broadcast",
@@ -47,26 +32,6 @@
                        SLOT(onShowHome(const QString &)));
 }
 
-void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
-{
-    m_broadcaster->asyncCall("RequestUrlStart", username, url);
-}
-
-void SessionBroadcast::requestHomeShown(const QString &username)
-{
-    m_broadcaster->asyncCall("RequestHomeShown", username);
-}
-
-void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
-{
-    // Since this signal is just used for testing, we don't *really* care if
-    // username matches, but just in case we do eventually use the signal, we
-    // should only listen to our own requests.
-    if (username == qgetenv("USER")) {
-        Q_EMIT startUrl(url);
-    }
-}
-
 void SessionBroadcast::onShowHome(const QString &username)
 {
     // Only listen to requests meant for us

=== modified file 'plugins/SessionBroadcast/SessionBroadcast.h'
--- plugins/SessionBroadcast/SessionBroadcast.h	2014-05-16 21:23:31 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.h	2014-06-13 07:56:31 +0000
@@ -31,22 +31,11 @@
 public:
     explicit SessionBroadcast(QObject *parent = 0);
 
-    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
-    Q_INVOKABLE void requestHomeShown(const QString &username);
-
 Q_SIGNALS:
-    // This signal isn't actually used by the shell
-    // (unity-greeter-session-broadcast handles launching an app for us), but
-    // it's useful for testing the plugin.
-    void startUrl(const QString &url);
     void showHome();
 
 private Q_SLOTS:
-    void onStartUrl(const QString &username, const QString &url);
     void onShowHome(const QString &username);
-
-private:
-    QDBusInterface *m_broadcaster;
 };
 
 #endif

=== removed directory 'plugins/SessionManager'
=== removed file 'plugins/SessionManager/CMakeLists.txt'
--- plugins/SessionManager/CMakeLists.txt	2014-05-18 02:12:09 +0000
+++ plugins/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-set(QMLPLUGIN_SRC
-    plugin.cpp
-    SessionManager.cpp
-    )
-
-include_directories(
-    ${Qt5DBus_INCLUDE_DIRS}
-    )
-
-add_definitions(-DSM_BUSNAME=systemBus)
-
-add_library(SessionManager-qml MODULE
-    ${QMLPLUGIN_SRC}
-    )
-
-target_link_libraries(SessionManager-qml
-    ${Qt5DBus_LIBRARIES}
-    )
-
-qt5_use_modules(SessionManager-qml Qml)
-
-add_unity8_plugin(SessionManager 0.1 SessionManager TARGETS SessionManager-qml)

=== removed file 'plugins/SessionManager/SessionManager.cpp'
--- plugins/SessionManager/SessionManager.cpp	2014-05-18 01:58:44 +0000
+++ plugins/SessionManager/SessionManager.cpp	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "SessionManager.h"
-#include <QtCore/QEvent>
-#include <QtDBus/QDBusPendingReply>
-
-SessionManager::SessionManager(QObject* parent)
-  : QObject(parent),
-    l1_manager(NULL),
-    l1_session(NULL),
-    ldm_session(NULL),
-    is_active(true) // assume we're active w/o logind
-{
-    l1_manager = new QDBusInterface("org.freedesktop.login1",
-                                    "/org/freedesktop/login1",
-                                    "org.freedesktop.login1.Manager",
-                                    QDBusConnection::SM_BUSNAME(), this);
-    if (l1_manager->isValid() && QString(qgetenv("XDG_SESSION_ID")) != "") {
-        QDBusPendingCall pcall = l1_manager->asyncCall("GetSession", QString(qgetenv("XDG_SESSION_ID")));
-        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
-        QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-                         this, SLOT(getSessionSlot(QDBusPendingCallWatcher*)));
-    }
-
-    if (QString(qgetenv("XDG_SESSION_PATH")) != "") {
-        ldm_session = new QDBusInterface("org.freedesktop.DisplayManager",
-                                         QString(qgetenv("XDG_SESSION_PATH")),
-                                         "org.freedesktop.DisplayManager.Session",
-                                         QDBusConnection::SM_BUSNAME(), this);
-    }
-}
-
-bool SessionManager::active() const
-{
-    // We cache this value for performance reasons, as QDBusInterface does not
-    // cache for us.
-    return is_active;
-}
-
-void SessionManager::lock()
-{
-    // We use ldm_session to handle locking rather than l1_session, because
-    // l1_session doesn't have permissions to lock from the user session, but
-    // ldm_session does.  This is what the rest of Ubuntu uses to lock.
-    if (ldm_session != NULL && ldm_session->isValid())
-        ldm_session->asyncCall("Lock");
-}
-
-void SessionManager::getSessionSlot(QDBusPendingCallWatcher *watcher)
-{
-    QDBusPendingReply<QDBusObjectPath> reply = *watcher;
-    if (!reply.isError()) {
-        QDBusObjectPath path = reply.argumentAt<0>();
-        l1_session = new QDBusInterface("org.freedesktop.login1",
-                                        path.path(),
-                                        "org.freedesktop.login1.Session",
-                                        l1_manager->connection(), this);
-
-        l1_manager->connection().connect("org.freedesktop.login1",
-                                         path.path(),
-                                         "org.freedesktop.DBus.Properties",
-                                         "PropertiesChanged",
-                                         this,
-                                         SLOT(propertiesChanged(QString, QVariantMap, QStringList)));
-
-        // Login1 is very odd about emitting PropertiesChanged.  It often does
-        // not do so when active is becoming false.  But it always does when
-        // it becomes true.  So we watch for the "Lock" signal too, which is a
-        // reliably hint that active is false.
-        l1_manager->connection().connect("org.freedesktop.login1",
-                                         path.path(),
-                                         "org.freedesktop.login1.Session",
-                                         "Lock",
-                                         this,
-                                         SLOT(sessionLocked()));
-
-        propertiesChanged("", QVariantMap(), QStringList() << "Active");
-    }
-    watcher->deleteLater();
-}
-
-void SessionManager::propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
-{
-    Q_UNUSED(interface)
-
-    QVariant value = changed.value("Active");
-
-    // If Active isn't in changed, check if we were at least notified about it
-    // changing on the server.  Also check if IdleHint was modified, because
-    // sometimes logind does not emit a changed signal for Active becoming
-    // false, but will emit for IdleHint when that does happen.
-    if (!value.isValid() && (invalid.contains("Active") || invalid.contains("IdleHint") || changed.contains("IdleHint")) && l1_session->isValid()) {
-        value = l1_session->property("Active");
-        if (!value.isValid())
-            value = QVariant(false);
-    }
-
-    if (value.isValid() && value.toBool() != is_active) {
-        is_active = value.toBool();
-        Q_EMIT activeChanged();
-    }
-}
-
-void SessionManager::sessionLocked()
-{
-    is_active = false;
-    Q_EMIT activeChanged();
-}

=== removed file 'plugins/SessionManager/SessionManager.h'
--- plugins/SessionManager/SessionManager.h	2014-05-18 01:58:44 +0000
+++ plugins/SessionManager/SessionManager.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2012,2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <[e-mail]>
- *          Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_SESSIONMANAGER_H
-#define UNITY_SESSIONMANAGER_H
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariantMap>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusPendingCallWatcher>
-
-class SessionManager: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool active
-               READ active
-               NOTIFY activeChanged
-               FINAL)
-
-public:
-    explicit SessionManager(QObject *parent = 0);
-
-    bool active() const;
-
-public Q_SLOTS:
-    void lock();
-
-Q_SIGNALS:
-    void activeChanged();
-
-private Q_SLOTS:
-    void getSessionSlot(QDBusPendingCallWatcher *watcher);
-    void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
-    void sessionLocked();
-
-private:
-    QDBusInterface *l1_manager;
-    QDBusInterface *l1_session;
-    QDBusInterface *ldm_session;
-    bool is_active;
-};
-
-#endif

=== removed file 'plugins/SessionManager/plugin.cpp'
--- plugins/SessionManager/plugin.cpp	2014-03-25 15:04:46 +0000
+++ plugins/SessionManager/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012,2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <[e-mail]>
- *          Michael Terry <[e-mail]>
- */
-
-#include "plugin.h"
-#include "SessionManager.h"
-#include <QtQml/qqml.h>
-
-static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new SessionManager();
-}
-
-void SessionManagerPlugin::registerTypes(const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("SessionManager"));
-    qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionmanager_provider);
-}

=== removed file 'plugins/SessionManager/plugin.h'
--- plugins/SessionManager/plugin.h	2013-07-26 18:45:21 +0000
+++ plugins/SessionManager/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012,2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Gerry Boland <[e-mail]>
- *          Michael Terry <[e-mail]>
- */
-
-#ifndef SESSIONMANAGER_PLUGIN_H
-#define SESSIONMANAGER_PLUGIN_H
-
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlExtensionPlugin>
-
-class SessionManagerPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif

=== removed file 'plugins/SessionManager/qmldir'
--- plugins/SessionManager/qmldir	2013-07-26 18:45:21 +0000
+++ plugins/SessionManager/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module SessionManager
-plugin SessionManager-qml

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-05-18 02:12:09 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-06-13 07:56:31 +0000
@@ -37,15 +37,12 @@
     bool    countVisible;
 };
 
-LauncherBackend::LauncherBackend(bool greeterMode, QObject *parent):
+LauncherBackend::LauncherBackend(QObject *parent):
     QDBusVirtualObject(parent),
-    m_greeterMode(greeterMode),
     m_accounts(nullptr)
 {
 #ifndef LAUNCHER_TESTING
     m_accounts = new AccountsServiceDBusAdaptor(this);
-    connect(m_accounts, SIGNAL(propertiesChanged(QString, QString, QStringList)),
-            this, SLOT(accountsListChanged(QString, QString, QStringList)));
 #endif
     m_user = qgetenv("USER");
     syncFromAccounts();
@@ -228,7 +225,7 @@
 
 void LauncherBackend::setUser(const QString &username)
 {
-    if (m_greeterMode && m_user != username) {
+    if (qgetenv("USER") == "lightdm" && m_user != username) {
         m_user = username;
         syncFromAccounts();
     }
@@ -241,15 +238,6 @@
     Q_UNUSED(quickListId)
 }
 
-void LauncherBackend::accountsListChanged(const QString &user, const QString &interface, const QStringList &changed)
-{
-    if (m_greeterMode && user == m_user &&
-        interface == "com.canonical.unity.AccountsService" &&
-        changed.contains("launcher-items")) {
-        syncFromAccounts();
-    }
-}
-
 void LauncherBackend::syncFromAccounts()
 {
     QList<QVariantMap> apps;
@@ -311,8 +299,6 @@
             loadFromVariant(app.toMap());
         }
     }
-
-    Q_EMIT refreshApplications();
 }
 
 void LauncherBackend::syncToAccounts()

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.h'
--- plugins/Unity/Launcher/backend/launcherbackend.h	2014-05-07 18:58:56 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.h	2014-06-13 07:56:31 +0000
@@ -42,7 +42,7 @@
     friend LauncherBackendTest;
 
 public:
-    LauncherBackend(bool greeterMode = false, QObject *parent = 0);
+    LauncherBackend(QObject *parent = 0);
     virtual ~LauncherBackend();
 
     /**
@@ -162,7 +162,6 @@
     virtual QString introspect (const QString &path) const;
 
 Q_SIGNALS:
-    void refreshApplications() const;
     void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList) const;
     void progressChanged(const QString &appId, int progress) const;
     void countChanged(const QString &appId, int count) const;
@@ -179,8 +178,6 @@
     void syncFromAccounts();
     void syncToAccounts();
 
-    bool m_greeterMode;
-
     QList<QString> m_storedApps;
     mutable QHash<QString, LauncherBackendItem*> m_itemCache;
 
@@ -189,9 +186,6 @@
 
     void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
 
-private Q_SLOTS:
-    void accountsListChanged(const QString &user, const QString &interface, const QStringList &changed);
-
 protected: /* Protected to allow testing */
     LauncherBackendItem* getItem(const QString& appId) const;
 

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-05-07 18:58:56 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2014-06-13 07:56:31 +0000
@@ -22,13 +22,12 @@
 
 #include <libintl.h>
 
-LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, bool pinnable, QObject *parent) :
+LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :
     LauncherItemInterface(parent),
     m_appId(appId),
     m_name(name),
     m_icon(icon),
     m_pinned(false),
-    m_pinnable(pinnable),
     m_running(false),
     m_recent(false),
     m_progress(-1),
@@ -39,12 +38,10 @@
     QuickListEntry nameAction;
     nameAction.setText(m_name);
     m_quickList->appendAction(nameAction);
-    if (m_pinnable) {
-        QuickListEntry pinningAction;
-        pinningAction.setActionId("pin_item");
-        pinningAction.setText(gettext("Lock to Launcher"));
-        m_quickList->appendAction(pinningAction);
-    }
+    QuickListEntry pinningAction;
+    pinningAction.setActionId("pin_item");
+    pinningAction.setText(gettext("Lock to Launcher"));
+    m_quickList->appendAction(pinningAction);
 }
 
 QString LauncherItem::appId() const
@@ -71,12 +68,10 @@
 {
     if (m_pinned != pinned) {
         m_pinned = pinned;
-        if (m_pinnable) {
-            QuickListEntry entry;
-            entry.setActionId("pin_item");
-            entry.setText(pinned ? gettext("Unlock from Launcher") : gettext("Lock to Launcher"));
-            m_quickList->updateAction(entry);
-        }
+        QuickListEntry entry;
+        entry.setActionId("pin_item");
+        entry.setText(pinned ? gettext("Unlock from Launcher") : gettext("Lock to Launcher"));
+        m_quickList->updateAction(entry);
         Q_EMIT pinnedChanged(pinned);
     }
 }

=== modified file 'plugins/Unity/Launcher/launcheritem.h'
--- plugins/Unity/Launcher/launcheritem.h	2014-05-07 18:58:56 +0000
+++ plugins/Unity/Launcher/launcheritem.h	2014-06-13 07:56:31 +0000
@@ -32,7 +32,7 @@
 {
     Q_OBJECT
 public:
-    LauncherItem(const QString &appId, const QString &name, const QString &icon, bool pinnable, QObject *parent = 0);
+    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);
 
     QString appId() const;
     QString name() const;
@@ -67,7 +67,6 @@
     QString m_name;
     QString m_icon;
     bool m_pinned;
-    bool m_pinnable;
     bool m_running;
     bool m_recent;
     int m_progress;

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2014-06-06 11:38:34 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-06-13 07:56:31 +0000
@@ -29,15 +29,20 @@
 
 LauncherModel::LauncherModel(QObject *parent):
     LauncherModelInterface(parent),
-    m_greeterMode(qgetenv("XDG_SESSION_CLASS") == "greeter"),
-    m_backend(new LauncherBackend(m_greeterMode, this)),
+    m_backend(new LauncherBackend(this)),
     m_appManager(0)
 {
     connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));
     connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));
-    connect(m_backend, SIGNAL(refreshApplications()), SLOT(refreshStoredApplications()));
 
-    refreshStoredApplications();
+    Q_FOREACH (const QString &entry, m_backend->storedApplications()) {
+        LauncherItem *item = new LauncherItem(entry,
+                                              m_backend->displayName(entry),
+                                              m_backend->icon(entry),
+                                              this);
+        item->setPinned(true);
+        m_list.append(item);
+    }
 }
 
 LauncherModel::~LauncherModel()
@@ -136,8 +141,7 @@
         beginInsertRows(QModelIndex(), index, index);
         LauncherItem *item = new LauncherItem(appId,
                                               m_backend->displayName(appId),
-                                              m_backend->icon(appId),
-                                              !m_greeterMode);
+                                              m_backend->icon(appId));
         item->setPinned(true);
         m_list.insert(index, item);
         endInsertRows();
@@ -213,40 +217,6 @@
     return "appid://" + package + "/" + app + "/current-user-version";
 }
 
-void LauncherModel::refreshStoredApplications()
-{
-    // First remove any existing ones
-    QList<int> storedAppIndices;
-    for (int i = 0; i < m_list.count(); ++i) {
-        if (!m_list.at(i)->recent()) {
-            storedAppIndices << i;
-        }
-    }
-    int run = 0;
-    while (storedAppIndices.count() > 0) {
-        beginRemoveRows(QModelIndex(), storedAppIndices.first() - run, storedAppIndices.first() - run);
-        m_list.takeAt(storedAppIndices.first() - run)->deleteLater();
-        endRemoveRows();
-        storedAppIndices.takeFirst();
-        ++run;
-    }
-
-    // Now insert all stored apps at beginning of list
-    QStringList storedApplications = m_backend->storedApplications();
-    beginInsertRows(QModelIndex(), 0, storedApplications.size() - 1);
-    run = 0;
-    Q_FOREACH (const QString &entry, storedApplications) {
-        LauncherItem *item = new LauncherItem(entry,
-                                              m_backend->displayName(entry),
-                                              m_backend->icon(entry),
-                                              !m_greeterMode,
-                                              this);
-        item->setPinned(true);
-        m_list.insert(run++, item);
-    }
-    endInsertRows();
-}
-
 ApplicationManagerInterface *LauncherModel::applicationManager() const
 {
     return m_appManager;
@@ -354,7 +324,7 @@
     if (found) {
         // Shall we paint some running/recent app highlight? If yes, do it here.
     } else {
-        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), !m_greeterMode);
+        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString());
         item->setRecent(true);
         item->setFocused(app->focused());
 

=== modified file 'plugins/Unity/Launcher/launchermodel.h'
--- plugins/Unity/Launcher/launchermodel.h	2014-05-29 16:00:35 +0000
+++ plugins/Unity/Launcher/launchermodel.h	2014-06-13 07:56:31 +0000
@@ -63,7 +63,6 @@
 private Q_SLOTS:
     void progressChanged(const QString &appId, int progress);
     void countChanged(const QString &appId, int count);
-    void refreshStoredApplications();
 
     void applicationAdded(const QModelIndex &parent, int row);
     void applicationRemoved(const QModelIndex &parent, int row);
@@ -71,7 +70,6 @@
 
 private:
     QList<LauncherItem*> m_list;
-    bool m_greeterMode;
     LauncherBackend *m_backend;
     ApplicationManagerInterface *m_appManager;
 };

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-05-27 20:48:17 +0000
+++ po/unity8.pot	2014-06-13 07:56:31 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-27 22:48+0200\n"
+"POT-Creation-Date: 2014-06-13 09:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -72,10 +72,35 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
+#: qml/Components/Lockscreen.qml:214
+msgid "Emergency Call"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:231
+msgid "OK"
+msgstr ""
+
 #: qml/Components/PageHeader.qml:365
 msgid "Recent searches"
 msgstr ""
 
+#: qml/Components/PassphraseLockscreen.qml:60
+#, qt-format
+msgid "Hello %1"
+msgstr ""
+
+#: qml/Components/PassphraseLockscreen.qml:60
+msgid "Hello"
+msgstr ""
+
+#: qml/Components/PinLockscreen.qml:198
+msgid "CANCEL"
+msgstr ""
+
+#: qml/Components/PinLockscreen.qml:216
+msgid "DONE"
+msgstr ""
+
 #: qml/Components/SeeMore.qml:35
 msgid "See more"
 msgstr ""
@@ -88,11 +113,6 @@
 msgid "Recent"
 msgstr ""
 
-#: qml/Dash/PreviewListView.qml:52
-#, qt-format
-msgid "%1 Preview"
-msgstr ""
-
 #: qml/Dash/Previews/PreviewActionCombo.qml:34
 msgid "More..."
 msgstr ""
@@ -117,31 +137,6 @@
 msgid "Swipe to unlock"
 msgstr ""
 
-#: qml/Greeter/Lockscreen.qml:215
-msgid "Emergency Call"
-msgstr ""
-
-#: qml/Greeter/Lockscreen.qml:232
-msgid "OK"
-msgstr ""
-
-#: qml/Greeter/PassphraseLockscreen.qml:60
-#, qt-format
-msgid "Hello %1"
-msgstr ""
-
-#: qml/Greeter/PassphraseLockscreen.qml:60
-msgid "Hello"
-msgstr ""
-
-#: qml/Greeter/PinLockscreen.qml:198
-msgid "CANCEL"
-msgstr ""
-
-#: qml/Greeter/PinLockscreen.qml:216
-msgid "DONE"
-msgstr ""
-
 #: qml/Hud/HudParametrizedActionsPage.qml:132
 msgid "Confirm"
 msgstr ""
@@ -162,15 +157,15 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:92
+#: qml/Notifications/NotificationMenuItemFactory.qml:91
 msgid "Show password"
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:104
+#: qml/Notifications/NotificationMenuItemFactory.qml:103
 msgid "Please enter SIM PIN"
 msgstr ""
 
-#: qml/Panel/SearchIndicator.qml:27 test.qml:7
+#: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
 

=== removed file 'qml/Components/BasicShell.qml'
--- qml/Components/BasicShell.qml	2014-03-18 01:13:15 +0000
+++ qml/Components/BasicShell.qml	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Unity.Application 0.1
-import "../Components"
-
-FocusScope {
-    id: shell
-
-    // this is only here to select the width / height of the window if not running fullscreen
-    property bool tablet: false
-    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
-    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
-
-    property real edgeSize: units.gu(2)
-
-    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "../graphics/tablet_background.jpg" : "../graphics/phone_background.jpg")
-    property url background
-    property url backgroundSource
-    property url backgroundFallbackSource
-    property url backgroundFinal: (backgroundSource != undefined && backgroundSource != "") ? backgroundSource : (backgroundFallbackSource != undefined && backgroundFallbackSource != "") ? backgroundFallbackSource : shell.defaultBackground
-    onBackgroundFinalChanged: shell.background = backgroundFinal
-
-    // This is a dummy image that is needed to determine if the picture url
-    // in backgroundSettings points to a valid picture file.
-    // We can't do this with the real background image because setting a
-    // new source in onStatusChanged triggers a binding loop detection
-    // inside Image, which causes it not to render even though a valid source
-    // would be set. We don't mind about this image staying black and just
-    // use it for verification to populate the source for the real
-    // background image.
-    Image {
-        source: shell.background
-        height: 0
-        width: 0
-        sourceSize.height: 0
-        sourceSize.width: 0
-        onStatusChanged: {
-            if (status == Image.Error) {
-                if (source != shell.defaultBackground) {
-                    shell.background = defaultBackground
-                } else {
-                    // In case even our default background fails to load...
-                    shell.background = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#000'/></svg>"
-                }
-            }
-        }
-    }
-
-    VolumeControl {
-        id: volumeControl
-    }
-
-    Keys.onVolumeUpPressed: volumeControl.volumeUp()
-    Keys.onVolumeDownPressed: volumeControl.volumeDown()
-
-    function hideIndicatorMenu(delay) {
-        panel.hideIndicatorMenu(delay);
-    }
-
-    focus: true
-    onFocusChanged: if (!focus) forceActiveFocus();
-
-    Binding {
-        target: i18n
-        property: "domain"
-        value: "unity8"
-    }
-}

=== modified file 'qml/Components/EdgeDemo.qml'
--- qml/Components/EdgeDemo.qml	2014-03-25 17:37:35 +0000
+++ qml/Components/EdgeDemo.qml	2014-06-13 07:56:31 +0000
@@ -15,11 +15,13 @@
  */
 
 import AccountsService 0.1
+import LightDM 0.1 as LightDM
 import QtQuick 2.0
 
 Item {
     id: demo
 
+    property Item greeter
     property Item dash
     property Item launcher
     property Item indicators
@@ -34,6 +36,7 @@
     property bool paused: false
 
     onPausedChanged: {
+        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
         if (d.topEdgeDemo)    d.topEdgeDemo.paused = paused
         if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused
         if (d.leftEdgeDemo)   d.leftEdgeDemo.paused = paused
@@ -42,6 +45,16 @@
 
     function hideEdgeDemoInShell() {
         AccountsService.demoEdges = false;
+        stopDemo();
+    }
+
+    function hideEdgeDemoInGreeter() {
+        // TODO: AccountsService.demoEdges = false as lightdm user
+    }
+
+    function hideEdgeDemos() {
+        hideEdgeDemoInGreeter();
+        hideEdgeDemoInShell();
     }
 
     function stopDemo() {
@@ -49,6 +62,7 @@
         dashEnabled = true
         panelEnabled = true
         panelContentEnabled = true
+        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
         if (d.topEdgeDemo)    d.topEdgeDemo.destroy()
         if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
         if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy()
@@ -65,17 +79,24 @@
         panelEnabled = false;
         panelContentEnabled = false;
 
-        startTopEdgeDemo()
+        // Begin with either greeter or dash, depending on which is visible
+        if (greeter && greeter.shown) {
+            startRightEdgeDemo()
+        } else {
+            startTopEdgeDemo()
+        }
     }
 
     QtObject {
         id: d
         property Component overlay
+        property QtObject rightEdgeDemo
         property QtObject topEdgeDemo
         property QtObject bottomEdgeDemo
         property QtObject leftEdgeDemo
         property QtObject finalEdgeDemo
         property bool showEdgeDemo: AccountsService.demoEdges
+        property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user
 
         onShowEdgeDemoChanged: {
             stopDemo()
@@ -85,6 +106,37 @@
         }
     }
 
+    function startRightEdgeDemo() {
+        if (demo.greeter) {
+            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
+                "edge": "right",
+                "title": i18n.tr("Right edge"),
+                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
+                "anchors.fill": demo.greeter,
+            });
+        }
+        if (d.rightEdgeDemo) {
+            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
+        } else {
+            stopDemo();
+        }
+    }
+
+    Connections {
+        target: demo.greeter
+
+        function hide() {
+            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
+                d.rightEdgeDemo.hide()
+                hideEdgeDemoInGreeter()
+                startTopEdgeDemo()
+            }
+        }
+
+        onUnlocked: hide()
+        onShownChanged: if (!greeter.shown) hide()
+    }
+
     function startTopEdgeDemo() {
         demo.panelEnabled = true;
         if (demo.dash && demo.underlay) {

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2014-05-28 07:17:08 +0000
+++ qml/Components/Lockscreen.qml	2014-06-13 07:56:31 +0000
@@ -48,6 +48,8 @@
     property int minPinLength: -1
     property int maxPinLength: -1
 
+    property url background: ""
+
     signal entered(string passphrase)
     signal cancel()
     signal emergencyCall()
@@ -73,6 +75,23 @@
         PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
     }
 
+    Rectangle {
+        // In case background fails to load or is undefined
+        id: backgroundBackup
+        anchors.fill: parent
+        color: "black"
+    }
+
+    Image {
+        id: backgroundImage
+        objectName: "lockscreenBackground"
+        anchors {
+            fill: parent
+        }
+        source: root.required ? root.background : ""
+        fillMode: Image.PreserveAspectCrop
+    }
+
     MouseArea {
         anchors.fill: root
     }

=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-05-23 13:52:36 +0000
+++ qml/Components/PageHeader.qml	2014-06-13 07:56:31 +0000
@@ -18,7 +18,6 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import SessionManager 0.1
 import Unity 0.2
 
 Item {
@@ -52,8 +51,8 @@
     }
 
     Connections {
-        target: SessionManager
-        onActiveChanged: if (!SessionManager.active) resetSearch()
+        target: greeter
+        onShownChanged: if (shown) resetSearch()
     }
 
     Flickable {

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-05-19 11:10:58 +0000
+++ qml/Dash/PreviewListView.qml	2014-06-13 07:56:31 +0000
@@ -49,7 +49,7 @@
                 right: parent.right
                 verticalCenter: parent.verticalCenter
             }
-            text: scope ? i18n.tr("%1 Preview").arg(scope.name) : ""
+            text: scope ? scope.name : ""
             // TODO Saviq: These should come from updated Ubuntu Palette.
             color: "#888888"
             font.family: "Ubuntu"

=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2014-05-13 18:41:08 +0000
+++ qml/Dash/ScopeListView.qml	2014-06-13 07:56:31 +0000
@@ -16,14 +16,13 @@
 
 import QtQuick 2.0
 import Dash 0.1
-import SessionManager 0.1
 
 ListViewWithPageHeader {
     maximumFlickVelocity: height * 10
     flickDeceleration: height * 2
 
     Connections {
-        target: SessionManager
-        onActiveChanged: if (!SessionManager.active) showHeader()
+        target: greeter
+        onShownChanged: if (greeter.shown) showHeader()
     }
 }

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-05-01 14:25:18 +0000
+++ qml/Greeter/Clock.qml	2014-06-13 07:56:31 +0000
@@ -39,7 +39,7 @@
 
         busName: "com.canonical.indicator.datetime"
         actionsObjectPath: "/com/canonical/indicator/datetime"
-        menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone_greeter" : ""
+        menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone" : ""
 
         Indicators.RootActionState {
             menu: timeModel.model

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2014-05-07 16:16:27 +0000
+++ qml/Greeter/Greeter.qml	2014-06-13 07:56:31 +0000
@@ -23,9 +23,9 @@
 Showable {
     id: greeter
     enabled: shown
-    created: greeterContentLoader.status == Loader.Ready
+    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
 
-    property url background
+    property url defaultBackground
 
     // 1 when fully shown and 0 when fully hidden
     property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
@@ -118,36 +118,6 @@
         }
     }
 
-    Rectangle {
-        // To hide lockscreen until background finished fading in
-        id: backgroundBackup
-        anchors {
-            fill: parent
-            topMargin: -greeter.y
-        }
-        color: "black"
-    }
-
-    CrossFadeImage {
-        id: backgroundImage
-        objectName: "greeterBackground"
-        anchors {
-            fill: parent
-            topMargin: -greeter.y
-        }
-        source: greeter.background
-        fillMode: Image.PreserveAspectCrop
-
-        StandardAnimation {
-            running: true
-            target: backgroundImage
-            property: "opacity"
-            from: 0.0
-            to: 1.0
-            duration: 800
-        }
-    }
-
     Loader {
         id: greeterContentLoader
         objectName: "greeterContentLoader"
@@ -155,6 +125,7 @@
         property var model: LightDM.Users
         property int currentIndex: 0
         property var infographicModel: LightDM.Infographic
+        readonly property int backgroundTopMargin: -greeter.y
 
         source: required ? "GreeterContent.qml" : ""
 
@@ -174,10 +145,6 @@
     }
 
     onTease: showLabelAnimation.start()
-    onShownChanged: {
-        showLabelAnimation.stop()
-        swipeHint.opacity = 0
-    }
 
     Label {
         id: swipeHint

=== modified file 'qml/Greeter/GreeterContent.qml'
--- qml/Greeter/GreeterContent.qml	2014-05-09 16:37:54 +0000
+++ qml/Greeter/GreeterContent.qml	2014-06-13 07:56:31 +0000
@@ -24,10 +24,47 @@
     id: root
     anchors.fill: parent
 
+    property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
+
     signal selected(int uid)
     signal unlocked(int uid)
 
     Rectangle {
+        // In case background fails to load
+        id: backgroundBackup
+        anchors.fill: parent
+        color: "black"
+    }
+
+    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : greeter.defaultBackground
+    onBackgroundValueChanged: background.source = backgroundValue
+
+    CrossFadeImage {
+        id: background
+        objectName: "greeterBackground"
+        anchors {
+            fill: parent
+            topMargin: backgroundTopMargin
+        }
+        fillMode: Image.PreserveAspectCrop
+    }
+
+    // See Shell.qml's backgroundSettings treatment for why we need a separate
+    // Image, but it boils down to avoiding binding loop detection.
+    Image {
+        source: background.source
+        height: 0
+        width: 0
+        sourceSize.height: 0
+        sourceSize.width: 0
+        onStatusChanged: {
+            if (status == Image.Error && source != greeter.defaultBackground) {
+                background.source = greeter.defaultBackground
+            }
+        }
+    }
+
+    Rectangle {
         anchors.fill: parent
         color: "black"
         opacity: 0.4
@@ -108,6 +145,7 @@
 
     Clock {
         id: clock
+        visible: narrowMode
 
         anchors {
             top: parent.top

=== removed file 'qml/Greeter/GreeterEdgeDemo.qml'
--- qml/Greeter/GreeterEdgeDemo.qml	2014-03-25 19:52:37 +0000
+++ qml/Greeter/GreeterEdgeDemo.qml	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import AccountsService 0.1
-import LightDM 0.1 as LightDM
-import QtQuick 2.0
-
-Item {
-    id: demo
-
-    property Item greeter
-
-    property bool active: false
-    property bool paused: false
-
-    onPausedChanged: {
-        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
-    }
-
-    function hideEdgeDemoInShell() {
-        AccountsService.demoEdges = false;
-    }
-
-    function hideEdgeDemoInGreeter() {
-        AccountsService.demoEdgesForCurrentUser = false;
-    }
-
-    function hideEdgeDemos() {
-        hideEdgeDemoInGreeter();
-        hideEdgeDemoInShell();
-    }
-
-    function startDemo() {
-        if (!d.overlay) {
-            d.overlay = Qt.createComponent("../Components/EdgeDemoOverlay.qml")
-        }
-        startRightEdgeDemo()
-    }
-
-    function stopDemo() {
-        active = false
-        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
-    }
-
-    QtObject {
-        id: d
-        property Component overlay
-        property QtObject rightEdgeDemo
-        property bool showEdgeDemoInGreeter: AccountsService.demoEdgesForCurrentUser && AccountsService.demoEdges
-
-        onShowEdgeDemoInGreeterChanged: {
-            stopDemo()
-            if (d.showEdgeDemoInGreeter) {
-                startDemo()
-            }
-        }
-    }
-
-    function startRightEdgeDemo() {
-        active = true;
-        if (demo.greeter) {
-            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
-                "edge": "right",
-                "title": i18n.tr("Right edge"),
-                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
-                "anchors.fill": demo.greeter,
-            });
-        }
-        if (d.rightEdgeDemo) {
-            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
-        } else {
-            stopDemo();
-        }
-    }
-
-    Connections {
-        target: demo.greeter
-
-        function hide() {
-            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
-                d.rightEdgeDemo.hide()
-                hideEdgeDemoInGreeter()
-            }
-        }
-
-        onUnlocked: hide()
-        onShownChanged: if (!greeter.shown) hide()
-    }
-}

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2014-03-27 20:57:44 +0000
+++ qml/Greeter/Infographics.qml	2014-06-13 07:56:31 +0000
@@ -59,6 +59,8 @@
 
     visible: model.label !== ""
 
+    Component.onCompleted: startShowAnimation()
+
     Item {
         id: dataCircle
         objectName: "dataCircle"

=== removed file 'qml/GreeterShell.qml'
--- qml/GreeterShell.qml	2014-05-29 16:00:35 +0000
+++ qml/GreeterShell.qml	1970-01-01 00:00:00 +0000
@@ -1,283 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import AccountsService 0.1
-import GSettings 1.0
-import LightDM 0.1 as LightDM
-import Powerd 0.1
-import QtQuick 2.0
-import SessionBroadcast 0.1
-import Ubuntu.Components 0.1
-import Unity.Application 0.1
-import Unity.Launcher 0.1
-import "Components"
-import "Greeter"
-import "Launcher"
-import "Panel"
-import "Notifications"
-import Unity.Notifications 1.0 as NotificationBackend
-
-BasicShell {
-    id: shell
-
-    function activateApplication(appId) {
-        SessionBroadcast.requestUrlStart(LightDM.Greeter.authenticationUser, appId)
-        greeter.hide()
-    }
-
-    GSettings {
-        id: backgroundSettings
-        schema.id: "org.gnome.desktop.background"
-    }
-    backgroundFallbackSource: backgroundSettings.pictureUri // for ease of customization by system builders
-    backgroundSource: AccountsService.backgroundFile
-
-    Lockscreen {
-        id: lockscreen
-        objectName: "lockscreen"
-
-        hides: [launcher, panel.indicators]
-        shown: false
-        enabled: true
-        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
-        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
-        y: panel.panelHeight
-        x: required ? 0 : - width
-        width: parent.width
-        height: parent.height - panel.panelHeight
-        minPinLength: 4
-        maxPinLength: 4
-
-        onEntered: LightDM.Greeter.respond(passphrase);
-        onCancel: greeter.show()
-
-        Component.onCompleted: {
-            if (LightDM.Users.count == 1) {
-                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
-            }
-        }
-    }
-
-    Connections {
-        target: LightDM.Greeter
-
-        onIdle: {
-            greeter.showNow()
-        }
-
-        onShowPrompt: {
-            if (LightDM.Users.count == 1) {
-                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
-                if (text == "PIN") {
-                    lockscreen.alphaNumeric = false
-                } else {
-                    lockscreen.alphaNumeric = true
-                }
-                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
-                lockscreen.show();
-            }
-        }
-
-        onAuthenticationComplete: {
-            if (LightDM.Greeter.promptless) {
-                return;
-            }
-            if (LightDM.Greeter.authenticated) {
-                lockscreen.hide();
-            } else {
-                lockscreen.clear(true);
-            }
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: "black"
-        opacity: greeterWrapper.showProgress * 0.8
-    }
-
-    Item {
-        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
-        id: greeterWrapper
-        x: launcher.progress
-        width: parent.width
-        height: parent.height
-
-        Behavior on x {
-            enabled: !launcher.dashSwipe
-            StandardAnimation {}
-        }
-
-        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
-        onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
-
-        Greeter {
-            id: greeter
-            objectName: "greeter"
-
-            available: true
-            hides: [launcher, panel.indicators]
-            shown: true
-            background: shell.background
-
-            y: panel.panelHeight
-            width: parent.width
-            height: parent.height - panel.panelHeight
-
-            dragHandleWidth: shell.edgeSize
-
-            function login() {
-                enabled = false;
-                LightDM.Greeter.startSessionSync();
-                enabled = true;
-            }
-
-            onShownChanged: {
-                if (shown) {
-                    lockscreen.reset();
-                    // If there is only one user, we start authenticating with that one here.
-                    // If there are more users, the Greeter will handle that
-                    if (LightDM.Users.count == 1) {
-                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
-                    }
-                    greeter.forceActiveFocus();
-                }
-            }
-
-            onUnlocked: hide()
-            onSelected: {
-                // Update launcher items for new user
-                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
-                AccountsService.user = user;
-                LauncherModel.setUser(user);
-            }
-            onTease: launcher.tease()
-        }
-    }
-
-    InputFilterArea {
-        anchors.fill: parent
-        blockInput: true
-    }
-
-    Item {
-        id: overlay
-
-        anchors.fill: parent
-
-        Panel {
-            id: panel
-            anchors.fill: parent //because this draws indicator menus
-            indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
-            indicators {
-                hides: [launcher]
-                available: !edgeDemo.active
-            }
-            fullscreenMode: false
-            searchVisible: false
-        }
-
-        Launcher {
-            id: launcher
-
-            readonly property bool dashSwipe: progress > 0
-
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: parent.width
-            dragAreaWidth: shell.edgeSize
-            available: !edgeDemo.active
-            onLauncherApplicationSelected: {
-                shell.activateApplication(LauncherModel.getUrlForAppId(appId))
-            }
-            onShownChanged: {
-                if (shown) {
-                    panel.indicators.hide()
-                }
-            }
-            onDash: {
-                greeter.hideRight()
-                hide()
-            }
-            onShowDashHome: {
-                SessionBroadcast.requestHomeShown(LightDM.Greeter.authenticationUser)
-                greeter.hide()
-            }
-        }
-
-        Notifications {
-            id: notifications
-
-            model: NotificationBackend.Model
-            margin: units.gu(1)
-
-            anchors {
-                top: parent.top
-                right: parent.right
-                bottom: parent.bottom
-                topMargin: panel.panelHeight
-            }
-            states: [
-                State {
-                    name: "narrow"
-                    when: overlay.width <= units.gu(60)
-                    AnchorChanges { target: notifications; anchors.left: parent.left }
-                },
-                State {
-                    name: "wide"
-                    when: overlay.width > units.gu(60)
-                    AnchorChanges { target: notifications; anchors.left: undefined }
-                    PropertyChanges { target: notifications; width: units.gu(38) }
-                }
-            ]
-
-            InputFilterArea {
-                anchors { left: parent.left; right: parent.right }
-                height: parent.contentHeight
-                blockInput: height > 0
-            }
-        }
-    }
-
-    OSKController {
-        anchors.topMargin: panel.panelHeight
-        anchors.fill: parent // as needs to know the geometry of the shell
-    }
-
-    Connections {
-        id: powerConnection
-        target: Powerd
-
-        onDisplayPowerStateChange: {
-            if (status == Powerd.Off) {
-                greeter.show();
-                edgeDemo.paused = true;
-            } else if (status == Powerd.On) {
-                edgeDemo.paused = false;
-            }
-        }
-    }
-
-    Connections {
-        target: LightDM.URLDispatcher
-        onDispatchURL: shell.activateApplication(url)
-    }
-
-    GreeterEdgeDemo {
-        id: edgeDemo
-        greeter: greeter
-    }
-}

=== modified file 'qml/Hud/Hud.qml'
--- qml/Hud/Hud.qml	2014-03-27 20:57:44 +0000
+++ qml/Hud/Hud.qml	2014-06-13 07:56:31 +0000
@@ -227,7 +227,10 @@
         width: parent.width
 
         onYChanged: {
-            if (!showAnimation.running && !hideAnimation.running) {
+            if (greeter.shown) {
+                showAnimation.duration = 0
+                hideAnimation.duration = 0
+            } else if (!showAnimation.running && !hideAnimation.running) {
                 if (parent.height > 0) {
                     showAnimation.duration = Math.min(showableAnimationDuration * (1 - (parent.height - y) / parent.height), showableAnimationDuration)
                     hideAnimation.duration = showableAnimationDuration - showAnimation.duration

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-05-20 18:44:28 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-06-13 07:56:31 +0000
@@ -97,36 +97,19 @@
     Component {
         id: pinLock
 
-        Item {
+        Lockscreen {
+            anchors.left: parent.left; anchors.right: parent.right
             height: menuFactory.maxHeight
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            Rectangle {
-                // In case background fails to load or is undefined
-                anchors.fill: parent
-                color: "black"
-            }
-
-            Image {
-                objectName: "lockscreenBackground"
-                anchors.fill: parent
-                source: shell.background
-                fillMode: Image.PreserveAspectCrop
-            }
-
-            Lockscreen {
-                anchors.fill: parent
-                placeholderText: i18n.tr("Please enter SIM PIN")
-
-                onEntered: {
-                    menuModel.changeState(menuIndex, passphrase);
-                    entryEnabled = false;
-                }
-
-                onCancel: {
-                    menuModel.activate(menuIndex, false);
-                }
+            placeholderText: i18n.tr("Please enter SIM PIN")
+            background: shell.background
+
+            onEntered: {
+                menuModel.changeState(menuIndex, passphrase);
+                entryEnabled = false;
+            }
+
+            onCancel: {
+                menuModel.activate(menuIndex, false);
             }
         }
     }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-05-28 07:17:08 +0000
+++ qml/Shell.qml	2014-06-13 07:56:31 +0000
@@ -21,19 +21,28 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
 import Unity.Launcher 0.1
+import LightDM 0.1 as LightDM
 import Powerd 0.1
 import SessionBroadcast 0.1
-import SessionManager 0.1
 import "Dash"
+import "Greeter"
 import "Launcher"
 import "Panel"
 import "Components"
 import "Notifications"
 import Unity.Notifications 1.0 as NotificationBackend
 
-BasicShell {
+FocusScope {
     id: shell
 
+    // this is only here to select the width / height of the window if not running fullscreen
+    property bool tablet: false
+    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
+    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
+
+    property real edgeSize: units.gu(2)
+    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
+    property url background
     readonly property real panelHeight: panel.panelHeight
 
     property bool dashShown: dash.shown
@@ -69,7 +78,17 @@
         id: backgroundSettings
         schema.id: "org.gnome.desktop.background"
     }
-    backgroundSource: backgroundSettings.pictureUri
+    property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
+    onGSettingsPictureChanged: {
+        shell.background = gSettingsPicture
+    }
+
+    VolumeControl {
+        id: volumeControl
+    }
+
+    Keys.onVolumeUpPressed: volumeControl.volumeUp()
+    Keys.onVolumeDownPressed: volumeControl.volumeDown()
 
     Item {
         id: underlayClipper
@@ -116,9 +135,10 @@
                 id: dash
                 objectName: "dash"
 
+                available: !greeter.shown && !lockscreen.shown
                 hides: [stages, launcher, panel.indicators]
-                shown: disappearingAnimationProgress !== 1.0
-                enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
+                shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
+                enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
 
                 anchors {
                     fill: parent
@@ -206,6 +226,7 @@
             shown = true;
             panel.indicators.hide();
             edgeDemo.stopDemo();
+            greeter.hide();
             if (!ApplicationManager.focusedApplicationId && ApplicationManager.count > 0 && focusApp) {
                 ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
             }
@@ -246,12 +267,6 @@
             }
         }
 
-        Binding {
-            target: ApplicationManager
-            property: "suspended"
-            value: !SessionManager.active
-        }
-
         Loader {
             id: applicationsDisplayLoader
             anchors.fill: parent
@@ -276,9 +291,132 @@
         }
     }
 
+    Lockscreen {
+        id: lockscreen
+        objectName: "lockscreen"
+
+        readonly property int backgroundTopMargin: -panel.panelHeight
+
+        hides: [launcher, panel.indicators]
+        shown: false
+        enabled: true
+        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
+        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
+        y: panel.panelHeight
+        x: required ? 0 : - width
+        width: parent.width
+        height: parent.height - panel.panelHeight
+        background: shell.background
+        minPinLength: 4
+        maxPinLength: 4
+
+        onEntered: LightDM.Greeter.respond(passphrase);
+        onCancel: greeter.show()
+
+        Component.onCompleted: {
+            if (LightDM.Users.count == 1) {
+                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
+            }
+        }
+    }
+
+    Connections {
+        target: LightDM.Greeter
+
+        onShowPrompt: {
+            if (LightDM.Users.count == 1) {
+                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
+                if (text == "PIN") {
+                    lockscreen.alphaNumeric = false
+                } else {
+                    lockscreen.alphaNumeric = true
+                }
+                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
+                lockscreen.show();
+            }
+        }
+
+        onAuthenticationComplete: {
+            if (LightDM.Greeter.promptless) {
+                return;
+            }
+            if (LightDM.Greeter.authenticated) {
+                lockscreen.hide();
+            } else {
+                lockscreen.clear(true);
+            }
+        }
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: greeterWrapper.showProgress * 0.8
+    }
+
+    Item {
+        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
+        id: greeterWrapper
+        x: launcher.progress
+        y: panel.panelHeight
+        width: parent.width
+        height: parent.height - panel.panelHeight
+
+        Behavior on x {
+            enabled: !launcher.dashSwipe
+            StandardAnimation {}
+        }
+
+        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
+
+        Greeter {
+            id: greeter
+            objectName: "greeter"
+
+            available: true
+            hides: [launcher, panel.indicators]
+            shown: true
+
+            defaultBackground: shell.background
+
+            width: parent.width
+            height: parent.height
+
+            dragHandleWidth: shell.edgeSize
+
+            onShownChanged: {
+                if (shown) {
+                    lockscreen.reset();
+                    // If there is only one user, we start authenticating with that one here.
+                    // If there are more users, the Greeter will handle that
+                    if (LightDM.Users.count == 1) {
+                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+                    }
+                    greeter.forceActiveFocus();
+                }
+            }
+
+            onUnlocked: greeter.hide()
+            onSelected: {
+                // Update launcher items for new user
+                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
+                AccountsService.user = user;
+                LauncherModel.setUser(user);
+            }
+
+            onTease: launcher.tease()
+
+            Binding {
+                target: ApplicationManager
+                property: "suspended"
+                value: greeter.shown && greeterWrapper.showProgress == 1
+            }
+        }
+    }
+
     InputFilterArea {
         anchors.fill: parent
-        blockInput: ApplicationManager.focusedApplicationId.length === 0 || launcher.shown
+        blockInput: ApplicationManager.focusedApplicationId.length === 0 || greeter.shown || lockscreen.shown || launcher.shown
                     || panel.indicators.shown
     }
 
@@ -290,7 +428,7 @@
             // We ignore any display-off signals when the proximity sensor
             // is active.  This usually indicates something like a phone call.
             if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {
-                SessionManager.lock();
+                greeter.showNow();
             }
 
             // No reason to chew demo CPU when user isn't watching
@@ -302,12 +440,17 @@
         }
     }
 
-    function showHome(fromLauncher) {
-        var animate = fromLauncher && !stages.shown
+    function showHome() {
+        var animate = !greeter.shown && !stages.shown
+        greeter.hide()
         dash.setCurrentScope("clickscope", animate, false)
         stages.hide()
     }
 
+    function hideIndicatorMenu(delay) {
+        panel.hideIndicatorMenu(delay);
+    }
+
     Item {
         id: overlay
 
@@ -324,8 +467,8 @@
             }
             property string focusedAppId: ApplicationManager.focusedApplicationId
             property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
-            fullscreenMode: focusedApplication && stages.fullscreen
-            searchVisible: dash.shown && dash.searchable
+            fullscreenMode: focusedApplication && stages.fullscreen && !greeter.shown && !lockscreen.shown
+            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
 
             InputFilterArea {
                 anchors {
@@ -363,9 +506,8 @@
                 if (edgeDemo.running)
                     return;
 
-                showHome(true)
+                showHome()
             }
-
             onDash: {
                 if (stages.shown && !stages.overlayMode) {
                     if (!stages.locked) {
@@ -373,6 +515,10 @@
                         launcher.hide();
                     }
                 }
+                if (greeter.shown) {
+                    greeter.hideRight();
+                    launcher.hide();
+                }
             }
             onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
             onLauncherApplicationSelected: {
@@ -389,7 +535,7 @@
         Rectangle {
             id: modalNotificationBackground
 
-            visible: notifications.useModal && (notifications.state == "narrow")
+            visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
             color: "#000000"
             anchors.fill: parent
             opacity: 0.5
@@ -436,18 +582,11 @@
                 blockInput: height > 0
             }
         }
-
-        Connections {
-            target: SessionManager
-            onActiveChanged: {
-                if (!SessionManager.active) {
-                    launcher.hide()
-                    panel.indicators.hide()
-                }
-            }
-        }
     }
 
+    focus: true
+    onFocusChanged: if (!focus) forceActiveFocus();
+
     InputFilterArea {
         anchors {
             top: parent.top
@@ -468,6 +607,12 @@
         blockInput: true
     }
 
+    Binding {
+        target: i18n
+        property: "domain"
+        value: "unity8"
+    }
+
     OSKController {
         anchors.topMargin: panel.panelHeight
         anchors.fill: parent // as needs to know the geometry of the shell
@@ -499,6 +644,7 @@
 
     EdgeDemo {
         id: edgeDemo
+        greeter: greeter
         launcher: launcher
         dash: dash
         indicators: panel.indicators
@@ -507,6 +653,6 @@
 
     Connections {
         target: SessionBroadcast
-        onShowHome: showHome(false)
+        onShowHome: showHome()
     }
 }

=== modified file 'run.sh'
--- run.sh	2014-05-13 18:41:08 +0000
+++ run.sh	2014-06-13 07:56:31 +0000
@@ -18,14 +18,13 @@
     echo " -p, --pinlock Use a pin protected user." >&2
     echo " -k, --keylock Use a passphrase protected user." >&2
     echo " -g, --gdb Run through gdb." >&2
-    echo " -G, --greeter  Run the greeter instead of the shell." >&2
     echo " -h, --help Show this help." >&2
     echo " -m, --nomousetouch Run without -mousetouch argument." >&2
     echo >&2
     exit 1
 }
 
-ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,greeter,help,nomousetouch" -o "fpkgGhm" -- "$@"`
+ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fpkghm" -- "$@"`
 [ $? -ne 0 ] && usage
 eval set -- "$ARGS"
 
@@ -36,7 +35,6 @@
        -p|--pinlock)  PINLOCK=true;;
        -k|--keylock)  KEYLOCK=true;;
        -g|--gdb)   GDB=true;;
-       -G|--greeter)  QML_PHONE_SHELL_PATH=./builddir/src/unity8-greeter;;
        -h|--help)  usage;;
        -m|--nomousetouch)  MOUSE_TOUCH=false;;
        --)         shift;break;;
@@ -46,17 +44,17 @@
 
 if $FAKE; then
   export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
 fi
 
 if $PINLOCK; then
   export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single-pin
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
 fi
 
 if $KEYLOCK; then
   export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single-passphrase
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
 fi
 
 # Force icon theme if running on the desktop, otherwise gnome theme (if running

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-07 18:36:53 +0000
+++ src/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -15,36 +15,24 @@
     ${CMAKE_SOURCE_DIR}/tests/*.svg
 )
 
-set(COMMON_SRCS
+add_executable(${SHELL_APP}
     ApplicationArguments.h
     main.cpp
     MouseTouchAdaptor.cpp
     ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
-    )
-add_executable(${SHELL_APP} ${COMMON_SRCS})
-add_executable(${GREETER_APP} ${COMMON_SRCS})
-
-set_target_properties(${SHELL_APP} PROPERTIES
-    COMPILE_DEFINITIONS "UNITY8_GREETER=0"
-    )
-set_target_properties(${GREETER_APP} PROPERTIES
-    COMPILE_DEFINITIONS "UNITY8_GREETER=1"
-    )
+)
 
 qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
-qt5_use_modules(${GREETER_APP} Gui Qml Quick Test)
 pkg_check_modules(XCB REQUIRED xcb)
 
 if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
     set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
-    set_target_properties(${GREETER_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
 
     target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
-    target_link_libraries(${GREETER_APP} ${XCB_LDFLAGS})
 endif()
 
 # install binaries
-install(TARGETS ${SHELL_APP} ${GREETER_APP}
+install(TARGETS ${SHELL_APP}
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
      )
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-05-20 03:01:51 +0000
+++ src/main.cpp	2014-06-13 07:56:31 +0000
@@ -26,7 +26,6 @@
 #include <qpa/qplatformnativeinterface.h>
 #include <QLibrary>
 #include <QDebug>
-#include <QProcess>
 #include <libintl.h>
 #include <dlfcn.h>
 #include <csignal>
@@ -43,7 +42,7 @@
 {
     const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
 
-    QGuiApplication::setApplicationName(UNITY8_GREETER ? "Unity 8 Greeter" : "Unity 8");
+    QGuiApplication::setApplicationName("Unity 8");
     QGuiApplication *application;
 
     QCommandLineParser parser;
@@ -94,7 +93,7 @@
 
     QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
     if (indicatorProfile.isEmpty()) {
-        indicatorProfile = UNITY8_GREETER ? "phone_greeter" : "phone";
+        indicatorProfile = "phone";
     }
 
     resolveIconTheme();
@@ -153,7 +152,7 @@
     nativeInterface->setProperty("ubuntuSessionType", 1);
     view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
 
-    QUrl source(::qmlDirectory() + (UNITY8_GREETER ? "GreeterShell.qml" : "Shell.qml"));
+    QUrl source(::qmlDirectory()+"Shell.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());
     if (!isUbuntuMirServer) {
         prependImportPaths(view->engine(), ::nonMirImportPaths());
@@ -161,7 +160,7 @@
     appendImportPaths(view->engine(), ::fallbackImportPaths());
 
     view->setSource(source);
-    view->setColor(Qt::transparent);
+    view->setColor("transparent");
 
     if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || parser.isSet(fullscreenOption)) {
         view->showFullScreen();
@@ -169,19 +168,6 @@
         view->show();
     }
 
-#if UNITY8_GREETER
-    if (isUbuntuMirServer) {
-        // Add alpha to surface, so that the greeter can bleed through
-        QSurfaceFormat format;
-        format.setAlphaBufferSize(8);
-        view->setFormat(format);
-    }
-
-    if (!QProcess::startDetached("/sbin/initctl emit --no-wait unity8-greeter-started")) {
-        qDebug() << "Unable to send unity8-greeter-started event to Upstart";
-    }
-#endif
-
     int result = application->exec();
 
     delete view;

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/__init__.py'
--- tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-04-18 17:04:59 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-06-13 07:56:31 +0000
@@ -31,6 +31,8 @@
         super(ApplicationLifeCycleTestCase, self).setUp()
         self._qml_mock_enabled = False
         self._data_dirs_mock_enabled = False
+        unity_proxy = self.launch_unity()
+        process_helpers.unlock_unity(unity_proxy)
 
     def create_test_application(self):
         desktop_file_dict = fixture_setup.DEFAULT_DESKTOP_FILE_DICT

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-04-18 17:04:59 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-06-13 07:56:31 +0000
@@ -24,8 +24,11 @@
 import logging
 import os
 
+from autopilot.matchers import Eventually
 from autopilot.platform import model
+from testtools.matchers import Equals
 
+from unity8 import process_helpers
 from unity8.application_lifecycle import tests
 
 
@@ -38,7 +41,6 @@
         if model() == 'Desktop':
             self.skipTest('Test cannot be run on the desktop.')
         super(ApplicationLifecycleTests, self).setUp()
-        self.launch_unity()
 
     def swipe_screen_from_right(self):
         width = self.main_window.width
@@ -87,3 +89,29 @@
         self.swipe_screen_from_right()
 
         self.assert_current_focused_application(application1_name)
+
+    def test_greeter_hides_on_app_open(self):
+        """Greeter should hide when an app is opened"""
+        process_helpers.lock_unity()
+        greeter = self.main_window.get_greeter()
+        self.assertThat(greeter.created, Eventually(Equals(True)))
+
+        application_name = self.launch_fake_app()
+        self.assertThat(greeter.created, Eventually(Equals(False)))
+        self.assert_current_focused_application(application_name)
+
+    def test_greeter_hides_on_app_focus(self):
+        """Greeter should hide when an app is re-focused"""
+        application_name = self.launch_fake_app()
+        self.assert_current_focused_application(application_name)
+
+        self.main_window.show_dash_swiping()
+        self.assert_current_focused_application('')
+
+        process_helpers.lock_unity()
+        greeter = self.main_window.get_greeter()
+        self.assertThat(greeter.created, Eventually(Equals(True)))
+
+        self.launch_upstart_application(application_name)
+        self.assertThat(greeter.created, Eventually(Equals(False)))
+        self.assert_current_focused_application(application_name)

=== removed file 'tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py	2014-05-07 13:16:43 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2013, 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-"""Tests for the application lifecycle in the greeter."""
-
-from __future__ import absolute_import
-
-import logging
-import os
-import subprocess
-
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-from testtools.matchers import Equals
-
-from unity8.application_lifecycle import tests
-from unity8.shell import with_lightdm_mock
-
-
-logger = logging.getLogger(__name__)
-
-
-class GreeterApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):
-
-    def setUp(self):
-        if model() == 'Desktop':
-            self.skipTest('Test cannot be run on the desktop.')
-        super(GreeterApplicationLifecycleTests, self).setUp()
-        # Kill user's url-dispatcher daemon, because we want to own its dbus
-        # name during these tests.
-        try:
-            subprocess.check_output(
-                ["/sbin/initctl", "stop", "url-dispatcher"],
-                stderr=subprocess.STDOUT
-            )
-        except subprocess.CalledProcessError:
-            logger.warning("Appears url-dispatcher was already stopped!")
-        self.addCleanup(self._start_dispatcher)
-        self.launch_greeter()
-
-    def _start_dispatcher(self):
-        subprocess.call(
-            ["/sbin/initctl", "start", "url-dispatcher"],
-            stderr=subprocess.STDOUT
-        )
-
-    @with_lightdm_mock("single")
-    def test_greeter_hides_on_url_dispatcher(self):
-        """Greeter should hide when an app is opened"""
-        greeter = self.main_window.get_greeter()
-        self.assertThat(greeter.created, Eventually(Equals(True)))
-
-        _, desktop_file_path = self.create_test_application()
-        desktop_file_name = os.path.basename(desktop_file_path)
-        application_name, _ = os.path.splitext(desktop_file_name)
-
-        subprocess.check_call(
-            ['url-dispatcher', 'application:///{}'.format(desktop_file_name)])
-        self.assertThat(greeter.created, Eventually(Equals(False)))

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-04-18 17:04:59 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-06-13 07:56:31 +0000
@@ -33,7 +33,6 @@
         if platform.model() == 'Desktop':
             self.skipTest("URL dispatcher doesn't work on the desktop.")
         super(URLDispatcherTestCase, self).setUp()
-        self.launch_unity()
 
     def test_swipe_out_application_started_by_url_dispatcher(self):
         _, desktop_file_path = self.create_test_application()

=== modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
--- tests/autopilot/unity8/indicators/tests/test_indicators.py	2014-04-14 13:29:04 +0000
+++ tests/autopilot/unity8/indicators/tests/test_indicators.py	2014-06-13 07:56:31 +0000
@@ -22,6 +22,7 @@
 
 from autopilot import platform
 
+from unity8.process_helpers import unlock_unity
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 
@@ -34,6 +35,7 @@
             self.skipTest('Test cannot be run on the desktop.')
         super(IndicatorTestCase, self).setUp()
         self.unity_proxy = self.launch_unity()
+        unlock_unity(self.unity_proxy)
 
 
 class IndicatorExistsTestCase(IndicatorTestCase):

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2014-05-18 02:12:09 +0000
+++ tests/autopilot/unity8/process_helpers.py	2014-06-13 07:56:31 +0000
@@ -40,6 +40,62 @@
     pass
 
 
+def unlock_unity(unity_proxy_obj=None):
+    """Helper function that attempts to unlock the unity greeter.
+
+    If unity_proxy_object is None create a proxy object by querying for the
+    running unity process.
+    Otherwise re-use the passed proxy object.
+
+    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
+
+    :raises RuntimeWarning: when the greeter cannot be found because it is
+      already unlocked.
+    :raises CannotAccessUnity: if unity is not introspectable or cannot be
+      found on dbus.
+    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
+      upstart job cannot be found at all.
+
+    """
+    if unity_proxy_obj is None:
+        try:
+            pid = _get_unity_pid()
+            unity = _get_unity_proxy_object(pid)
+            main_window = unity.select_single(main_window_emulator.QQuickView)
+        except ProcessSearchError as e:
+            raise CannotAccessUnity(
+                "Cannot introspect unity, make sure that it has been started "
+                "with testability. Perhaps use the function "
+                "'restart_unity_with_testability' this module provides."
+                "(%s)"
+                % str(e)
+            )
+    else:
+        main_window = unity_proxy_obj.select_single(
+            main_window_emulator.QQuickView)
+
+    greeter = main_window.get_greeter()
+    if greeter.created == False:
+        raise RuntimeWarning("Greeter appears to be already unlocked.")
+
+    # Because of potential input jerkiness under heavy load,
+    # retry unlocking the greeter two times.
+    # https://bugs.launchpad.net/ubuntu/+bug/1260113
+
+    retries = 3
+    while retries > 0:
+        try:
+            greeter.swipe()
+        except AssertionError:
+            retries -= 1
+            if retries == 0:
+                raise
+            logger.info("Failed to unlock greeter, trying again...")
+        else:
+            logger.info("Greeter unlocked, continuing.")
+            break
+
+
 def lock_unity(unity_proxy_obj=None):
     """Helper function that attempts to lock the unity greeter."""
     import evdev, time

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-03-31 13:24:11 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2014-06-13 07:56:31 +0000
@@ -249,9 +249,9 @@
                 "%s=%s" % (key, value)
             ], stderr=subprocess.STDOUT)
 
-    def _launch(self, executable, ready_func, **kwargs):
+    def launch_unity(self, **kwargs):
         """Launch the unity shell, return a proxy object for it."""
-        binary_path = get_binary_path(executable)
+        binary_path = get_binary_path()
         lib_path = get_lib_path()
 
         logger.info(
@@ -293,19 +293,11 @@
 
         # Ensure that the dash is visible before we return:
         logger.debug("Unity started, waiting for it to be ready.")
-        ready_func()
+        self.assertUnityReady()
         logger.debug("Unity loaded and ready.")
 
         return app_proxy
 
-    def launch_unity(self, **kwargs):
-        """Launch the unity shell, return a proxy object for it."""
-        return self._launch("unity8", self.assertUnityReady, **kwargs)
-
-    def launch_greeter(self, **kwargs):
-        """Launch the unity shell, return a proxy object for it."""
-        return self._launch("unity8-greeter", self.assertGreeterReady, **kwargs)
-
     def _launch_unity_with_upstart(self, binary_path, args):
         logger.info("Starting unity")
         self._patch_environment("QT_LOAD_TESTABILITY", 1)
@@ -352,7 +344,7 @@
     def _get_lightdm_mock_path(self, mock_type):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "liblightdm", mock_type)
+            os.path.join(lib_path, "LightDM", mock_type)
         )
 
         if not os.path.exists(lightdm_mock_path):
@@ -394,10 +386,6 @@
         )
         self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))
 
-    def assertGreeterReady(self):
-        greeter = self.main_window.get_greeter()
-        self.assertThat(greeter.created, Eventually(Equals(True)))
-
     def get_dash(self):
         dash = self._proxy.wait_select_single(Dash)
         return dash

=== modified file 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'
--- tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-03-25 00:13:01 +0000
+++ tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-06-13 07:56:31 +0000
@@ -19,7 +19,8 @@
 
 from __future__ import absolute_import
 
-from unity8.shell import DragMixin
+from unity8.process_helpers import unlock_unity
+from unity8.shell import with_lightdm_mock, DragMixin
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 from testtools.matchers import Equals
@@ -39,6 +40,7 @@
 
         """
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
         hud_show_button = self.main_window.get_hud_show_button()
         edge_drag_area = self.main_window.get_hud_edge_drag_area()
         hud = self.main_window.get_hud()
@@ -79,6 +81,7 @@
 
         """
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
         hud_show_button = self.main_window.get_hud_show_button()
         hud = self.main_window.get_hud()
 
@@ -114,6 +117,7 @@
     def test_hide_hud_click(self):
         """Tapping the close button of the Hud must dismiss it."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
         hud = self.main_window.get_hud()
 
         self._launch_test_app_from_app_screen()
@@ -130,6 +134,7 @@
 
         """
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
         hud = self.main_window.get_hud()
 
         self._launch_test_app_from_app_screen()
@@ -146,6 +151,7 @@
     def test_launcher_hides_hud(self):
         """Opening the Launcher while the Hud is active must close the Hud."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
         hud = self.main_window.get_hud()
         launcher = self.main_window.get_launcher()
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-05-07 13:16:43 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-06-13 07:56:31 +0000
@@ -34,6 +34,7 @@
 
 from testtools.matchers import Contains, HasLength
 
+from unity8 import process_helpers
 from unity8.shell import emulators, fixture_setup, tests
 from unity8.shell.emulators import dash as dash_emulators
 
@@ -45,6 +46,7 @@
     def setUp(self):
         super(MainWindowTestCase, self).setUp()
         unity_proxy = self.launch_unity()
+        process_helpers.unlock_unity(unity_proxy)
 
     def test_search(self):
         self.main_window.search('Test')
@@ -60,6 +62,7 @@
     def setUp(self):
         super(DashBaseTestCase, self).setUp()
         unity_proxy = self.launch_unity()
+        process_helpers.unlock_unity(unity_proxy)
         self.dash = self.main_window.get_dash()
 
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-03-12 17:01:11 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-06-13 07:56:31 +0000
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 
+from unity8.process_helpers import unlock_unity
 from unity8.shell import with_lightdm_mock
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
@@ -46,41 +47,41 @@
     @with_lightdm_mock("single-pin")
     def test_can_unlock_pin_screen(self):
         """Must be able to unlock the PIN entry lock screen."""
-        self.launch_greeter()
+        unity_proxy = self.launch_unity()
         greeter = self.main_window.get_greeter()
 
         if greeter.narrowMode:
-            greeter.swipe()
+            unlock_unity(unity_proxy)
             lockscreen = self._wait_for_lockscreen()
             self._enter_pincode("1234")
             self.assertThat(lockscreen.shown, Eventually(Equals(False)))
         else:
             self._enter_prompt_passphrase("1234")
-            self.assertThat(greeter.enabled, Eventually(Equals(False)))
+            self.assertThat(greeter.shown, Eventually(Equals(False)))
 
     @with_lightdm_mock("single-passphrase")
     def test_can_unlock_passphrase_screen(self):
         """Must be able to unlock the passphrase entry screen."""
-        self.launch_greeter()
+        unity_proxy = self.launch_unity()
         greeter = self.main_window.get_greeter()
 
         if greeter.narrowMode:
-            greeter.swipe()
+            unlock_unity(unity_proxy)
             lockscreen = self._wait_for_lockscreen()
             self._enter_pin_passphrase("password")
             self.assertThat(lockscreen.shown, Eventually(Equals(False)))
         else:
             self._enter_prompt_passphrase("password")
-            self.assertThat(greeter.enabled, Eventually(Equals(False)))
+            self.assertThat(greeter.shown, Eventually(Equals(False)))
 
     @with_lightdm_mock("single-pin")
     def test_pin_screen_wrong_code(self):
         """Entering the wrong pin code must not dismiss the lock screen."""
-        self.launch_greeter()
+        unity_proxy = self.launch_unity()
         greeter = self.main_window.get_greeter()
 
         if greeter.narrowMode:
-            greeter.swipe()
+            unlock_unity(unity_proxy)
             lockscreen = self._wait_for_lockscreen()
             self._enter_pincode("4321")
             pinentryField = self.main_window.get_pinentryField()
@@ -90,16 +91,16 @@
             self._enter_prompt_passphrase("4231")
             prompt = self.main_window.get_greeter().get_prompt()
             self.assertThat(prompt.text, Eventually(Equals("")))
-            self.assertThat(greeter.enabled, Eventually(Equals(True)))
+            self.assertThat(greeter.shown, Eventually(Equals(True)))
 
     @with_lightdm_mock("single-passphrase")
     def test_passphrase_screen_wrong_password(self):
         """Entering the wrong password must not dismiss the lock screen."""
-        self.launch_greeter()
+        unity_proxy = self.launch_unity()
         greeter = self.main_window.get_greeter()
 
         if greeter.narrowMode:
-            greeter.swipe()
+            unlock_unity(unity_proxy)
             lockscreen = self._wait_for_lockscreen()
             self._enter_pin_passphrase("foobar")
             pinentryField = self.main_window.get_pinentryField()
@@ -109,7 +110,7 @@
             self._enter_prompt_passphrase("foobar")
             prompt = self.main_window.get_greeter().get_prompt()
             self.assertThat(prompt.text, Eventually(Equals("")))
-            self.assertThat(greeter.enabled, Eventually(Equals(True)))
+            self.assertThat(greeter.shown, Eventually(Equals(True)))
 
     def _wait_for_lockscreen(self):
         """Wait for the lock screen to load, and return it."""

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-05-07 13:16:43 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-06-13 07:56:31 +0000
@@ -22,6 +22,7 @@
 from __future__ import absolute_import
 
 from unity8 import shell
+from unity8.process_helpers import unlock_unity
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 from testtools.matchers import Equals, NotEquals
@@ -124,6 +125,7 @@
     def test_interactive(self):
         """Interactive notification must react upon click on itself."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -162,6 +164,7 @@
         """Rejecting a call should make notification expand and
             offer more options."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         summary = "Incoming call"
         body = "Frank Zappa\n+44 (0)7736 027340"
@@ -211,6 +214,7 @@
     def test_modal_sd_without_greeter (self):
         """A snap-decision on a phone should block input to shell beneath it when there's no greeter."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         summary = "Incoming file"
         body = "Frank would like to send you the file: essay.pdf"
@@ -251,7 +255,7 @@
 
     def test_modal_sd_with_greeter (self):
         """A snap-decision on a phone should not block input to the greeter beneath it."""
-        unity_proxy = self.launch_greeter()
+        unity_proxy = self.launch_unity()
 
         summary = "Incoming file"
         body = "Frank would like to send you the file: essay.pdf"
@@ -277,8 +281,8 @@
 
         # verify that we can swipe away the greeter (interact with the "shell")
         time.sleep(1)
+        self.main_window.show_dash_swiping()
         greeter = self.main_window.get_greeter()
-        greeter.swipe()
         self.assertThat(greeter.shown, Eventually(Equals(False)))
 
         # verify and interact with the triggered snap-decision notification
@@ -420,6 +424,7 @@
     def test_icon_summary_body(self):
         """Notification must display the expected summary and body text."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -459,6 +464,7 @@
         """Notification must display the expected summary and secondary
         icon."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -495,6 +501,7 @@
         """Notifications must be displayed in order according to their
         urgency."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -581,6 +588,7 @@
     def test_summary_and_body(self):
         """Notification must display the expected summary- and body-text."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -605,6 +613,7 @@
     def test_summary_only(self):
         """Notification must display only the expected summary-text."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -622,6 +631,7 @@
         """Notification must allow updating its contents while being
         displayed."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -659,6 +669,7 @@
         """Notification must allow updating its contents and layout while
         being displayed."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 
@@ -704,6 +715,7 @@
     def test_append_hint(self):
         """Notification has to accumulate body-text using append-hint."""
         unity_proxy = self.launch_unity()
+        unlock_unity(unity_proxy)
 
         notify_list = self._get_notifications_list()
 

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2014-03-06 21:22:28 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2014-06-13 07:56:31 +0000
@@ -45,15 +45,6 @@
     Q_UNUSED(demoEdges)
 }
 
-bool AccountsService::demoEdgesForCurrentUser() const
-{
-    return false;
-}
-
-void AccountsService::setDemoEdgesForCurrentUser(bool)
-{
-}
-
 QString AccountsService::backgroundFile() const
 {
     return m_backgroundFile;

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2013-10-15 17:48:24 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2014-06-13 07:56:31 +0000
@@ -35,10 +35,6 @@
                 READ demoEdges
                 WRITE setDemoEdges
                 NOTIFY demoEdgesChanged)
-    Q_PROPERTY (bool demoEdgesForCurrentUser
-                READ demoEdgesForCurrentUser
-                WRITE setDemoEdgesForCurrentUser
-                NOTIFY demoEdgesForCurrentUserChanged)
     Q_PROPERTY (QString backgroundFile
                 READ backgroundFile
                 WRITE setBackgroundFile // only available in mock
@@ -55,8 +51,6 @@
     void setUser(const QString &user);
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
-    bool demoEdgesForCurrentUser() const;
-    void setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser);
     QString backgroundFile() const;
     void setBackgroundFile(const QString &backgroundFile);
     bool statsWelcomeScreen() const;
@@ -65,7 +59,6 @@
 Q_SIGNALS:
     void userChanged();
     void demoEdgesChanged();
-    void demoEdgesForCurrentUserChanged();
     void backgroundFileChanged();
     void statsWelcomeScreenChanged();
 

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2014-05-18 02:12:09 +0000
+++ tests/mocks/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -31,11 +31,10 @@
 add_subdirectory(AccountsService)
 add_subdirectory(GSettings.1.0)
 add_subdirectory(HudClient)
-add_subdirectory(liblightdm)
 add_subdirectory(libusermetrics)
+add_subdirectory(LightDM)
 add_subdirectory(Powerd)
 add_subdirectory(QMenuModel)
-add_subdirectory(SessionManager)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(QtMultimedia)

=== renamed directory 'tests/mocks/liblightdm' => 'tests/mocks/LightDM'
=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/liblightdm/CMakeLists.txt	2014-05-18 02:12:09 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -1,4 +1,50 @@
+# This is a copy of the normal LightDM plugin, but instead of statically
+# linking in the lightdm bits, this one uses shared libraries so we can swap
+# out different sets of users for different tests.  When we finally switch to
+# actually using the system liblightdm in the normal plugin, this version can
+# be deleted.
+
+add_subdirectory(demo)
 add_subdirectory(full)
 add_subdirectory(single)
 add_subdirectory(single-pin)
 add_subdirectory(single-passphrase)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
+)
+
+set(QMLPLUGIN_SRC
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
+    )
+
+add_library(MockLightDM-qml MODULE
+    ${QMLPLUGIN_SRC}
+    )
+
+# We want to link to liblightdm-qt5-2, but we don't want to depend on it being
+# installed on the system.  So we make sure we link to our full fake version
+# At run time, we can point to whichever version we happen to be using via
+# LD_LIBRARY_PATH.
+add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
+target_link_libraries(MockLightDM-qml
+    -L${CMAKE_CURRENT_BINARY_DIR}/full
+    -llightdm-qt5-2
+    -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
+    -lusermetricsoutput
+    )
+
+qt5_use_modules(MockLightDM-qml DBus Gui Qml)
+
+add_unity8_mock(LightDM 0.1 LightDM
+    PREFIX mocks
+    TARGETS MockLightDM-qml
+    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
+)

=== modified file 'tests/mocks/LightDM/Greeter.cpp'
--- tests/mocks/liblightdm/Greeter.cpp	2014-04-30 18:09:17 +0000
+++ tests/mocks/LightDM/Greeter.cpp	2014-06-13 07:56:31 +0000
@@ -151,23 +151,12 @@
     Q_UNUSED(language)
 }
 
-void Greeter::setResettable (bool resettable)
-{
-    Q_UNUSED(resettable)
-}
-
 bool Greeter::startSessionSync(const QString &session)
 {
     Q_UNUSED(session)
     return true;
 }
 
-QString Greeter::ensureSharedDataDirSync(const QString &username)
-{
-    Q_UNUSED(username)
-    return "";
-}
-
 void Greeter::respond(const QString &response)
 {
     Q_D(Greeter);

=== modified file 'tests/mocks/LightDM/Greeter.h'
--- tests/mocks/liblightdm/Greeter.h	2014-04-30 18:09:17 +0000
+++ tests/mocks/LightDM/Greeter.h	2014-06-13 07:56:31 +0000
@@ -88,17 +88,13 @@
     void respond(const QString &response);
     void cancelAuthentication();
     void setLanguage (const QString &language);
-    void setResettable (bool resettable);
     bool startSessionSync(const QString &session=QString());
-    QString ensureSharedDataDirSync(const QString &username);
 
 Q_SIGNALS:
     void showMessage(QString text, QLightDM::Greeter::MessageType type);
     void showPrompt(QString text, QLightDM::Greeter::PromptType type);
     void authenticationComplete();
     void autologinTimerExpired();
-    void idle();
-    void reset();
 
 private:
     GreeterPrivate *d_ptr;

=== added directory 'tests/mocks/LightDM/demo'
=== added file 'tests/mocks/LightDM/demo/CMakeLists.txt'
--- tests/mocks/LightDM/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/demo/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -0,0 +1,21 @@
+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
+
+set(LibLightDM_SOURCES
+    ../Greeter.cpp
+    ../UsersModel.cpp
+    GreeterPrivate.cpp
+    UsersModelPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+    )
+
+add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
+
+include_directories(
+    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
+)
+
+target_link_libraries(MockLightDM-demo
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    )
+
+qt5_use_modules(MockLightDM-demo Gui)

=== added file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-06-13 07:56:31 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../Greeter.h"
+#include "../GreeterPrivate.h"
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+
+namespace QLightDM
+{
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    q_ptr(parent)
+{
+}
+
+void GreeterPrivate::handleAuthenticate()
+{
+    Q_Q(Greeter);
+
+    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    settings.beginGroup(authenticationUser);
+    QVariant password = settings.value("password", "none");
+
+    if (password == "pin") {
+        Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
+    } else if (password == "keyboard") {
+        Q_EMIT q->showPrompt("Password", Greeter::PromptTypeSecret);
+    } else {
+        authenticated = true;
+        Q_EMIT q->authenticationComplete();
+    }
+}
+
+void GreeterPrivate::handleRespond(const QString &response)
+{
+    Q_Q(Greeter);
+
+    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    settings.beginGroup(authenticationUser);
+    QVariant password = settings.value("password", "none");
+
+    QString passwordValue;
+    if (password == "pin") {
+        passwordValue = settings.value("passwordValue", "1234").toString();
+    } else {
+        passwordValue = settings.value("passwordValue", "password").toString();
+    }
+    authenticated = (response == passwordValue);
+    Q_EMIT q->authenticationComplete();
+}
+
+}

=== added file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2014-06-13 07:56:31 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../UsersModelPrivate.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QStringList>
+
+namespace QLightDM
+{
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : q_ptr(parent)
+{
+    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    QStringList users = settings.value("users", QStringList() << "phablet").toStringList();
+
+    Q_FOREACH(const QString &user, users)
+    {
+        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
+        entries.append({user, name, 0, 0, false, false, 0, 0});
+    }
+}
+
+}

=== modified file 'tests/mocks/LightDM/full/CMakeLists.txt'
--- tests/mocks/liblightdm/full/CMakeLists.txt	2013-12-01 18:30:07 +0000
+++ tests/mocks/LightDM/full/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -11,9 +11,8 @@
 qt5_use_modules(MockLightDM-full Gui)
 
 set_target_properties(MockLightDM-full PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-3
-                      SOVERSION 0)
+                      OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-full
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/full
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/full
     )

=== added file 'tests/mocks/LightDM/qmldir'
--- tests/mocks/LightDM/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/qmldir	2014-06-13 07:56:31 +0000
@@ -0,0 +1,3 @@
+module LightDM
+plugin MockLightDM-qml
+typeinfo LightDM.qmltypes

=== modified file 'tests/mocks/LightDM/single-passphrase/CMakeLists.txt'
--- tests/mocks/liblightdm/single-passphrase/CMakeLists.txt	2013-12-01 18:30:07 +0000
+++ tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -12,9 +12,8 @@
 qt5_use_modules(MockLightDM-single-passphrase Gui)
 
 set_target_properties(MockLightDM-single-passphrase PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-3
-                      SOVERSION 0)
+                      OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-single-passphrase
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single-passphrase
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-passphrase
     )

=== modified file 'tests/mocks/LightDM/single-pin/CMakeLists.txt'
--- tests/mocks/liblightdm/single-pin/CMakeLists.txt	2013-12-01 18:30:07 +0000
+++ tests/mocks/LightDM/single-pin/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -12,9 +12,8 @@
 qt5_use_modules(MockLightDM-single-pin Gui)
 
 set_target_properties(MockLightDM-single-pin PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-3
-                      SOVERSION 0)
+                      OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-single-pin
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single-pin
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-pin
     )

=== modified file 'tests/mocks/LightDM/single/CMakeLists.txt'
--- tests/mocks/liblightdm/single/CMakeLists.txt	2013-12-01 18:30:07 +0000
+++ tests/mocks/LightDM/single/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -11,9 +11,8 @@
 qt5_use_modules(MockLightDM-single Gui)
 
 set_target_properties(MockLightDM-single PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-3
-                      SOVERSION 0)
+                      OUTPUT_NAME lightdm-qt5-2)
 
 install(TARGETS MockLightDM-single
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single
     )

=== removed directory 'tests/mocks/SessionManager'
=== removed file 'tests/mocks/SessionManager/CMakeLists.txt'
--- tests/mocks/SessionManager/CMakeLists.txt	2013-12-01 18:49:13 +0000
+++ tests/mocks/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-add_library(MockSessionManager-qml MODULE
-    plugin.cpp
-    SessionManager.cpp
-    )
-
-qt5_use_modules(MockSessionManager-qml Qml)
-
-# copy qmldir file into build directory for shadow builds
-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-install(TARGETS MockSessionManager-qml
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/SessionManager
-    )
-
-install(FILES qmldir
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/SessionManager
-    )

=== removed file 'tests/mocks/SessionManager/SessionManager.cpp'
--- tests/mocks/SessionManager/SessionManager.cpp	2013-10-15 17:48:24 +0000
+++ tests/mocks/SessionManager/SessionManager.cpp	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "SessionManager.h"
-
-SessionManager::SessionManager(QObject* parent)
-  : QObject(parent),
-    m_active(true)
-{
-}
-
-bool SessionManager::active() const
-{
-    return m_active;
-}
-
-void SessionManager::setActive(bool active)
-{
-    if (m_active != active) {
-        m_active = active;
-        activeChanged();
-    }
-}
-
-void SessionManager::lock()
-{
-    setActive(false);
-}

=== removed file 'tests/mocks/SessionManager/SessionManager.h'
--- tests/mocks/SessionManager/SessionManager.h	2013-10-15 17:48:24 +0000
+++ tests/mocks/SessionManager/SessionManager.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_MOCK_SESSIONMANAGER_H
-#define UNITY_MOCK_SESSIONMANAGER_H
-
-#include <QObject>
-
-class SessionManager: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool active
-               READ active
-               WRITE setActive // Only in mock
-               NOTIFY activeChanged
-               FINAL)
-
-public:
-    explicit SessionManager(QObject *parent = 0);
-
-    bool active() const;
-    void setActive(bool active);
-
-public Q_SLOTS:
-    void lock();
-
-Q_SIGNALS:
-    void activeChanged();
-
-private:
-    bool m_active;
-};
-
-#endif

=== removed file 'tests/mocks/SessionManager/plugin.cpp'
--- tests/mocks/SessionManager/plugin.cpp	2014-03-25 15:04:46 +0000
+++ tests/mocks/SessionManager/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Terry <[e-mail]>
- */
-
-#include "plugin.h"
-#include "SessionManager.h"
-#include <QtQml/qqml.h>
-
-static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new SessionManager();
-}
-
-void SessionManagerPlugin::registerTypes(const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("SessionManager"));
-    qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionmanager_provider);
-}

=== removed file 'tests/mocks/SessionManager/plugin.h'
--- tests/mocks/SessionManager/plugin.h	2013-08-30 22:06:46 +0000
+++ tests/mocks/SessionManager/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Terry <[e-mail]>
- */
-
-#ifndef MOCK_SESSIONMANAGER_PLUGIN_H
-#define MOCK_SESSIONMANAGER_PLUGIN_H
-
-#include <QQmlEngine>
-#include <QQmlExtensionPlugin>
-
-class SessionManagerPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif

=== removed file 'tests/mocks/SessionManager/qmldir'
--- tests/mocks/SessionManager/qmldir	2013-08-30 22:06:46 +0000
+++ tests/mocks/SessionManager/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module SessionManager
-plugin MockSessionManager-qml

=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2014-05-13 18:41:08 +0000
+++ tests/plugins/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -1,7 +1,6 @@
 add_subdirectory(AccountsService)
+add_subdirectory(LightDM)
 add_subdirectory(Dash)
-add_subdirectory(LightDM)
-add_subdirectory(SessionManager)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)

=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2014-02-10 20:28:28 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -1,6 +1,3 @@
-include(FindPkgConfig)
-pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
-
 add_executable(test-lightdm-dbus
     dbus.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
@@ -10,17 +7,19 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
     ${LIBLIGHTDM_INCLUDE_DIRS}
     )
 
 add_dependencies(test-lightdm-dbus MockLightDM-full)
 target_link_libraries(test-lightdm-dbus
-    ${LIBLIGHTDM_LDFLAGS}
+    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
+    -llightdm-qt5-2
     )
 
 add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/plugins LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
+add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
 add_dependencies(testLightDMDBus test-lightdm-dbus)
 
 add_dependencies(qmluitests testLightDMDBus)

=== removed directory 'tests/plugins/SessionManager'
=== removed file 'tests/plugins/SessionManager/CMakeLists.txt'
--- tests/plugins/SessionManager/CMakeLists.txt	2013-08-30 22:06:46 +0000
+++ tests/plugins/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-macro(make_dbus_class PREFIX SERVICE INTERFACE)
-    if (${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${INTERFACE}Adaptor.h)
-        execute_process(COMMAND qdbusxml2cpp -c ${PREFIX}${INTERFACE}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${INTERFACE}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${SERVICE}.${INTERFACE})
-    endif ()
-endmacro(make_dbus_class)
-
-make_dbus_class(LightDM org.freedesktop.DisplayManager Session)
-make_dbus_class(Login org.freedesktop.login1 Manager)
-make_dbus_class(Login org.freedesktop.login1 Session)
-make_dbus_class(Login org.freedesktop.DBus Properties)
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/plugins/SessionManager
-    )
-
-add_definitions(-DSM_BUSNAME=sessionBus)
-
-add_executable(sessionmanagermock
-    ${CMAKE_CURRENT_BINARY_DIR}/LightDMSessionAdaptor.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/LoginManagerAdaptor.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/LoginPropertiesAdaptor.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/LoginSessionAdaptor.cpp
-    server.cpp
-    LightDMSessionServer.cpp
-    LoginManagerServer.cpp
-    LoginSessionServer.cpp
-    )
-qt5_use_modules(sessionmanagermock Core DBus)
-
-add_executable(sessionmanagertest
-    ${CMAKE_SOURCE_DIR}/plugins/SessionManager/SessionManager.cpp
-    client.cpp
-    )
-qt5_use_modules(sessionmanagertest Core DBus Test)
-
-add_test(NAME sessionmanagertest
-    COMMAND env
-        XDG_SESSION_ID=sessionid
-        XDG_SESSION_PATH=/mocksession/lightdm
-        dbus-test-runner
-        --task ${CMAKE_CURRENT_BINARY_DIR}/sessionmanagermock
-        --task-name server
-        --ignore-return
-        --task ${CMAKE_CURRENT_BINARY_DIR}/sessionmanagertest
-        --task-name client
-        --wait-for org.freedesktop.login1
-    )

=== removed file 'tests/plugins/SessionManager/LightDMSessionServer.cpp'
--- tests/plugins/SessionManager/LightDMSessionServer.cpp	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/LightDMSessionServer.cpp	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#include "LightDMSessionServer.h"
-
-LightDMSessionServer::LightDMSessionServer(LoginSessionServer *logind, QObject *parent)
-    : QObject(parent),
-      logind(logind)
-{
-}
-
-void LightDMSessionServer::Lock()
-{
-    // As a side effect of locking, change Active state of logind.
-    // Note that this will say Active is true while the Active property will be
-    // false.  This is intentional, as we don't want to keep any state in the
-    // mocks.  Having this signal side effect lets us test that lock() was
-    // actually called by the plugin as well as test the changed signal itself.
-    QVariantMap changes;
-    changes.insert("Active", QVariant(true));
-    Q_EMIT logind->PropertiesChanged("org.freedesktop.login1.Session", changes, QStringList());
-}

=== removed file 'tests/plugins/SessionManager/LightDMSessionServer.h'
--- tests/plugins/SessionManager/LightDMSessionServer.h	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/LightDMSessionServer.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_LIGHTDMSESSIONSERVER_H
-#define UNITY_LIGHTDMSESSIONSERVER_H
-
-#include "LoginSessionServer.h"
-#include <QtCore/QObject>
-
-class LightDMSessionServer: public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit LightDMSessionServer(LoginSessionServer *logind, QObject *parent = 0);
-
-public Q_SLOTS:
-    void Lock();
-
-private:
-    LoginSessionServer *logind;
-};
-
-#endif

=== removed file 'tests/plugins/SessionManager/LoginManagerServer.cpp'
--- tests/plugins/SessionManager/LoginManagerServer.cpp	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/LoginManagerServer.cpp	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#include "LoginManagerServer.h"
-
-LoginManagerServer::LoginManagerServer(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QDBusObjectPath LoginManagerServer::GetSession(const QString &id)
-{
-    if (id == "sessionid") {
-        return QDBusObjectPath("/mocksession/login1");
-    } else {
-        return QDBusObjectPath();
-    }
-}

=== removed file 'tests/plugins/SessionManager/LoginManagerServer.h'
--- tests/plugins/SessionManager/LoginManagerServer.h	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/LoginManagerServer.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_LOGINMANAGERSERVER_H
-#define UNITY_LOGINMANAGERSERVER_H
-
-#include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
-
-class LoginManagerServer: public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit LoginManagerServer(QObject *parent = 0);
-
-public Q_SLOTS:
-    QDBusObjectPath GetSession(const QString &id);
-};
-
-#endif

=== removed file 'tests/plugins/SessionManager/LoginSessionServer.cpp'
--- tests/plugins/SessionManager/LoginSessionServer.cpp	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/LoginSessionServer.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#include "LoginSessionServer.h"
-
-LoginSessionServer::LoginSessionServer(QObject *parent)
-    : QObject(parent)
-{
-}

=== removed file 'tests/plugins/SessionManager/LoginSessionServer.h'
--- tests/plugins/SessionManager/LoginSessionServer.h	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/LoginSessionServer.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_LOGINSESSIONSERVER_H
-#define UNITY_LOGINSESSIONSERVER_H
-
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtCore/QVariantMap>
-
-class LoginSessionServer: public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit LoginSessionServer(QObject *parent = 0);
-
-Q_SIGNALS:
-    void PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
-};
-
-#endif

=== removed file 'tests/plugins/SessionManager/client.cpp'
--- tests/plugins/SessionManager/client.cpp	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/client.cpp	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#include "SessionManager.h"
-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
-
-
-// These tests assume the following behavior from our mock logind server:
-// * IsActive will return false
-// * Lock() will emit an ActiveChanged(true) signal
-//
-// This should lead to the following behavior from our SessionManager plugin:
-// * Starts active
-// * Becomes inactive once it connects to logind and sees IsActive result
-// * Becomes active once Lock() is called (which isn't really sensible, but
-//   it's just a mock)
-
-class SessionManagerTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void waitForChange(SessionManager *session)
-    {
-        // Wait 5 seconds for initial activeChanged signal
-        QSignalSpy spy(session, SIGNAL(activeChanged()));
-        int i = 0;
-        while (spy.count() == 0 && i++ < 50)
-            QTest::qWait(100);
-        QCOMPARE(spy.count(), 1);
-    }
-
-    void testAssumeActive()
-    {
-        // Test that active() starts as true before we connect to service
-        SessionManager session;
-        QCOMPARE(session.active(), true);
-    }
-
-    void testSafeLock()
-    {
-        // Test that lock() doesn't crash if used before we connect to service
-        // (i.e. just test that we're not being stupid about pointers)
-        SessionManager session;
-        session.lock();
-    }
-
-    void testInitialSignal()
-    {
-        // Test that we get notified of change once we connect to service
-        SessionManager session;
-        waitForChange(&session);
-        QCOMPARE(session.active(), false);
-    }
-
-    void testLock()
-    {
-        // Test that lock() gets called correctly and that we listen for
-        // the activeChanged signal too.
-        SessionManager session;
-        waitForChange(&session);
-        session.lock();
-        waitForChange(&session);
-        QCOMPARE(session.active(), true);
-    }
-};
-
-QTEST_MAIN(SessionManagerTest)
-
-#include "client.moc"

=== removed file 'tests/plugins/SessionManager/interfaces.xml'
--- tests/plugins/SessionManager/interfaces.xml	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/interfaces.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<node>
-  <interface name="org.freedesktop.login1.Manager">
-    <method name="GetSession">
-      <arg name="id" type="s" direction="in" />
-      <arg name="path" type="o" direction="out" />
-    </method>
-  </interface>
-  <interface name="org.freedesktop.login1.Session">
-    <property name="Active" type="b" access="read"/>
-  </interface>
-  <interface name="org.freedesktop.DBus.Properties">
-    <signal name="PropertiesChanged">
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-      <arg name="interface" type="s" direction="out"/>
-      <arg name="changed" type="a{sv}" direction="out"/>
-      <arg name="invalid" type="as" direction="out"/>
-    </signal>
-  </interface>
-  <interface name="org.freedesktop.DisplayManager.Session">
-    <method name="Lock"/>
-  </interface>
-</node>

=== removed file 'tests/plugins/SessionManager/server.cpp'
--- tests/plugins/SessionManager/server.cpp	2013-07-26 18:45:21 +0000
+++ tests/plugins/SessionManager/server.cpp	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the  Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 3 along with this program.  If not, see
- * <http://www.gnu.org/licenses/>
- *
- * Authored by: Michael Terry <[e-mail]>
- */
-
-#include "LightDMSessionAdaptor.h"
-#include "LightDMSessionServer.h"
-#include "LoginManagerAdaptor.h"
-#include "LoginManagerServer.h"
-#include "LoginPropertiesAdaptor.h"
-#include "LoginSessionAdaptor.h"
-#include "LoginSessionServer.h"
-#include <QtCore/QCoreApplication>
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication a(argc, argv);
-
-    LoginManagerServer *manager = new LoginManagerServer();
-    new LoginManagerAdaptor(manager);
-
-    LoginSessionServer *l1_session = new LoginSessionServer();
-    new LoginSessionAdaptor(l1_session);
-    new LoginPropertiesAdaptor(l1_session);
-
-    LightDMSessionServer *ldm_session = new LightDMSessionServer(l1_session);
-    new LightDMSessionAdaptor(ldm_session);
-
-    // We use the session bus for testing.  The real plugin uses the system bus
-    QDBusConnection connection = QDBusConnection::sessionBus();
-    if (!connection.registerObject("/org/freedesktop/login1", manager))
-        return 1;
-    if (!connection.registerObject("/mocksession/login1", l1_session))
-        return 1;
-    if (!connection.registerObject("/mocksession/lightdm", ldm_session))
-        return 1;
-    if (!connection.registerService("org.freedesktop.DisplayManager"))
-        return 1;
-    if (!connection.registerService("org.freedesktop.login1"))
-        return 1;
-
-    return a.exec();
-}

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-06-02 14:10:59 +0000
+++ tests/qmltests/CMakeLists.txt	2014-06-13 07:56:31 +0000
@@ -19,8 +19,8 @@
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
 
-add_qml_test(. Shell)
-add_qml_test(. GreeterShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/single")
+add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
+                     ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 add_qml_test(Components Carousel)
 add_qml_test(Components DraggingArea)
 add_qml_test(Components EdgeDemoOverlay)
@@ -52,10 +52,10 @@
 add_qml_test(Dash/Previews PreviewVideoPlayback)
 add_qml_test(Dash/Previews PreviewWidgetFactory)
 add_qml_test(Dash/Previews PreviewZoomableImage)
-add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
-add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
-add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/single")
-add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
+add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
+add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
+add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
+add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
 add_qml_test(Greeter Clock ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)

=== modified file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
--- tests/qmltests/Greeter/tst_Lockscreen.qml	2014-05-28 07:17:08 +0000
+++ tests/qmltests/Greeter/tst_Lockscreen.qml	2014-06-13 07:56:31 +0000
@@ -39,6 +39,7 @@
         minPinLength: minPinLengthTextField.text
         maxPinLength: maxPinLengthTextField.text
         username: "Lola"
+        background: "../../../qml/graphics/phone_background.jpg"
         infoText: infoTextTextField.text
     }
 

=== modified file 'tests/qmltests/Greeter/tst_SingleGreeter.qml'
--- tests/qmltests/Greeter/tst_SingleGreeter.qml	2014-06-02 14:10:59 +0000
+++ tests/qmltests/Greeter/tst_SingleGreeter.qml	2014-06-13 07:56:31 +0000
@@ -33,8 +33,6 @@
         height: parent.height
         x: 0; y: 0
 
-        background: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
-
         property int minX: 0
 
         onXChanged: {

=== removed file 'tests/qmltests/tst_GreeterShell.qml'
--- tests/qmltests/tst_GreeterShell.qml	2014-04-30 18:09:17 +0000
+++ tests/qmltests/tst_GreeterShell.qml	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *   Michael Terry <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import AccountsService 0.1
-import GSettings 1.0
-import Unity.Application 0.1
-import Unity.Test 0.1 as UT
-import Powerd 0.1
-import LightDM 0.1 as LightDM
-
-import "../../qml"
-
-Item {
-    width: shell.width
-    height: shell.height
-
-    QtObject {
-        id: applicationArguments
-
-        function hasGeometry() {
-            return false;
-        }
-
-        function width() {
-            return 0;
-        }
-
-        function height() {
-            return 0;
-        }
-    }
-
-    GreeterShell {
-        id: shell
-        defaultBackground: Qt.resolvedUrl("../../qml/graphics/phone_background.jpg")
-    }
-
-    UT.UnityTestCase {
-        name: "GreeterShell"
-        when: windowShown
-
-        function test_wallpaper_data() {
-            return [
-                {tag: "both", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "../tests/data/unity/backgrounds/red.png", expected: "blue.png"},
-                {tag: "accounts", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "", expected: "blue.png"},
-                {tag: "gsettings", accounts: "", gsettings: "../tests/data/unity/backgrounds/red.png", expected: "red.png"},
-                {tag: "none", accounts: "", gsettings: "", expected: shell.defaultBackground},
-                {tag: "invalid-both", accounts: "invalid", gsettings: "invalid", expected: shell.defaultBackground},
-                {tag: "invalid-accounts", accounts: "invalid", gsettings: "../tests/data/unity/backgrounds/red.png", expected: shell.defaultBackground},
-                {tag: "invalid-gsettings", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "invalid", expected: "blue.png"},
-            ]
-        }
-
-        function test_wallpaper(data) {
-            var greeterBackground = findChild(shell, "greeterBackground")
-            GSettingsController.setPictureUri(data.gsettings)
-            AccountsService.backgroundFile = data.accounts
-            verify(greeterBackground.source.toString().indexOf(data.expected) !== -1)
-            tryCompare(greeterBackground, "status", Image.Ready)
-        }
-
-        function test_dispatchURLHidesGreeter() {
-            var greeter = findChild(shell, "greeter")
-            greeter.showNow()
-            tryCompare(greeter, "showProgress", 1)
-            LightDM.URLDispatcher.dispatchURL("application:///notes-app")
-            tryCompare(greeter, "showProgress", 0)
-        }
-    }
-}

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-05-28 07:17:08 +0000
+++ tests/qmltests/tst_Shell.qml	2014-06-13 07:56:31 +0000
@@ -23,7 +23,6 @@
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 import Powerd 0.1
-import SessionManager 0.1
 
 import "../../qml"
 
@@ -49,7 +48,6 @@
 
     Shell {
         id: shell
-        defaultBackground: Qt.resolvedUrl("../../qml/graphics/phone_background.jpg")
     }
 
     UT.UnityTestCase {
@@ -74,6 +72,9 @@
                 ok = homeLoader !== null
                     && homeLoader.item !== undefined;
 
+                var greeter = findChild(shell, "greeter");
+                ok &= greeter !== null;
+
                 var launcherPanel = findChild(shell, "launcherPanel");
                 ok &= launcherPanel !== null;
 
@@ -88,9 +89,17 @@
             } while (!ok && attempts <= maxAttempts);
 
             verify(ok);
+
+            swipeAwayGreeter();
         }
 
         function cleanup() {
+            // If a test invoked the greeter, make sure we swipe it away again
+            var greeter = findChild(shell, "greeter");
+            if (greeter.shown) {
+                swipeAwayGreeter();
+            }
+
             // kill all (fake) running apps
             killApps(ApplicationManager);
 
@@ -172,6 +181,8 @@
         }
 
         function test_suspend() {
+            var greeter = findChild(shell, "greeter");
+
             // Launch an app from the launcher
             dragLauncherIntoView();
             tapOnAppIconInLauncher();
@@ -185,27 +196,40 @@
 
             // Try to suspend while proximity is engaged...
             Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);
-            tryCompare(SessionManager, "active", true);
+            tryCompare(greeter, "showProgress", 0);
 
             // Now really suspend
             print("suspending")
             Powerd.displayPowerStateChange(Powerd.Off, 0);
             print("done suspending")
-            tryCompare(SessionManager, "active", false);
+            tryCompare(greeter, "showProgress", 1);
 
             tryCompare(ApplicationManager, "suspended", true);
             compare(mainApp.state, ApplicationInfo.Suspended);
 
             // And wake up
             Powerd.displayPowerStateChange(Powerd.On, 0);
+            tryCompare(greeter, "showProgress", 1);
 
-            // Activate session to focus app
-            SessionManager.active = true;
+            // Swipe away greeter to focus app
+            swipeAwayGreeter();
             tryCompare(ApplicationManager, "suspended", false);
             compare(mainApp.state, ApplicationInfo.Running);
             tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
         }
 
+        function swipeAwayGreeter() {
+            var greeter = findChild(shell, "greeter");
+            tryCompare(greeter, "showProgress", 1);
+
+            var touchX = shell.width - (shell.edgeSize / 2);
+            var touchY = shell.height / 2;
+            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
+
+            // wait until the animation has finished
+            tryCompare(greeter, "showProgress", 0);
+        }
+
         /*
             Perform a right-edge drag when the Dash is being show and there are
             no running/minimized apps to be restored.
@@ -453,14 +477,22 @@
 
         function test_DashShown_data() {
             return [
-                {tag: "in focus", app: false, launcher: false, indicators: false, expectedShown: true},
-                {tag: "under app", app: true, launcher: false, indicators: false, expectedShown: false},
-                {tag: "under launcher", app: false, launcher: true, indicators: false, expectedShown: true},
-                {tag: "under indicators", app: false, launcher: false, indicators: true, expectedShown: true},
+                {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},
+                {tag: "under greeter", greeter: true, app: false, launcher: false, indicators: false, expectedShown: false},
+                {tag: "under app", greeter: false, app: true, launcher: false, indicators: false, expectedShown: false},
+                {tag: "under launcher", greeter: false, app: false, launcher: true, indicators: false, expectedShown: true},
+                {tag: "under indicators", greeter: false, app: false, launcher: false, indicators: true, expectedShown: true},
             ]
         }
 
         function test_DashShown(data) {
+            if (data.greeter) {
+                // Swipe the greeter in
+                var greeter = findChild(shell, "greeter");
+                Powerd.displayPowerStateChange(Powerd.Off, 0);
+                tryCompare(greeter, "showProgress", 1);
+            }
+
             if (data.app) {
                 dragLauncherIntoView();
                 tapOnAppIconInLauncher();
@@ -490,6 +522,17 @@
             tryCompare(searchIndicator, "opacity", 0);
         }
 
+        function test_searchIndicatorHidesOnGreeterShown() {
+            var searchIndicator = findChild(shell, "container")
+            var greeter = findChild(shell, "greeter");
+
+            tryCompare(searchIndicator, "opacity", 1)
+
+            greeter.show()
+            tryCompare(greeter, "shown", true)
+            tryCompare(searchIndicator, "opacity", 0)
+        }
+
         function test_searchIndicatorHideOnPreviewShown() {
             var searchIndicator = findChild(shell, "container");
             var dashContent = findChild(shell, "dashContent");
@@ -502,5 +545,16 @@
 
             tryCompare(searchIndicator, "opacity", 0);
         }
+
+        function test_focusRequestedHidesGreeter() {
+            var greeter = findChild(shell, "greeter")
+
+            greeter.show()
+            tryCompare(greeter, "showProgress", 1)
+
+            ApplicationManager.focusRequested("notes-app")
+            tryCompare(greeter, "showProgress", 0)
+            waitUntilApplicationWindowIsFullyVisible()
+        }
     }
 }

=== modified file 'tools/unlock-device'
--- tools/unlock-device	2014-05-18 02:12:09 +0000
+++ tools/unlock-device	2014-06-13 07:56:31 +0000
@@ -17,16 +17,24 @@
         esac
 done
 
-LIGHTDM_CONFIG="
-[SeatDefaults]
-autologin-in-background=false
-"
-LIGHTDM_CONFIG_FILE="/etc/lightdm/lightdm.conf.d/99-unity8-greeter-unlock.conf"
-
-adb shell "echo '$LIGHTDM_CONFIG' > $LIGHTDM_CONFIG_FILE"
+UNLOCK_SCRIPT='
+import dbus, logging;
+from unity8 import process_helpers as helpers;
+logging.basicConfig(level=logging.INFO);
+bus = dbus.SystemBus().get_object("com.canonical.powerd", "/com/canonical/powerd");
+cookie = bus.requestSysState("unlock-device-hold", 1, dbus_interface="com.canonical.powerd");
+helpers.restart_unity_with_testability();
+bus.clearSysState(cookie, dbus_interface="com.canonical.powerd");
+helpers.unlock_unity()
+'
 
 eval "$WAIT_COMMAND"
 
-adb shell "rm -f $LIGHTDM_CONFIG_FILE"
-
-exit 0
+UNLOCK_OUTPUT=$(adb shell "sudo -u phablet -i python3 -c '$UNLOCK_SCRIPT'" 2>&1)
+if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
+    echo "I: Unlock passed"
+    exit 0
+else
+    echo "I: Unlock failed, script output: '$UNLOCK_OUTPUT'"
+    exit 1
+fi