Merge lp:~mterry/unity8/greeter-hide-indicators into lp:unity8

[Michael Terry]

Make sure indicators and launcher hide when power button is pressed on greeter.

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

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

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

 * If you changed the UI, has there been a design review?
 NA

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2527
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1653/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2193
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2221
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2127
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2127
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2127
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2118/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1653/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Better but not quite; you can still see the indicators "rolling up" when you wake the phone up. Previously you couldn't even see the animation, you were taken straight to the lockscreen.

review: Needs Information

[Michael Terry (mterry)]

Are you sure that's a regression? I think it just depends on how long you wait until turning the screen back on.

[Lukáš Tinkl (lukas-kde)]

Ah :) I stand corrected, indeed if you wait a moment, it will hide completely.

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

Yes

* Did CI run pass? If not, please explain why.

Not completely, passing locally

review: Approve

[lp:~mterry/unity8/greeter-hide-indicators]

2528. By Michael Terry on 2016-07-06

Merge in lp:~josharenson/unity8/sessions-model to make it easier to stack greeter changes

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-27 18:41:15 +0000
+++ CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -128,6 +128,7 @@
 set(DASH_APP unity8-dash)
 set(SCOPE_TOOL unity-scope-tool)
 set(INDICATORS_CLIENT_APP indicators-client)
+set(GREETER_APP unity8-greeter)
 set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
 
 include_directories(

=== added file 'data/51-unity8-greeter.conf'
--- data/51-unity8-greeter.conf	1970-01-01 00:00:00 +0000
+++ data/51-unity8-greeter.conf	2016-07-06 19:43:31 +0000
@@ -0,0 +1,2 @@
+[Seat:*]
+greeter-session=unity8-greeter

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-05-31 10:16:09 +0000
+++ data/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -2,6 +2,7 @@
 configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
 configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)
 configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)
+configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)
 
 # install desktop files
 install(FILES
@@ -11,6 +12,16 @@
     DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
     )
 
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
+    )
+
+install(FILES
+    51-unity8-greeter.conf
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
+    )
+
 # install dash icon
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png

=== added file 'data/unity8-greeter-init.conf'
--- data/unity8-greeter-init.conf	1970-01-01 00:00:00 +0000
+++ data/unity8-greeter-init.conf	2016-07-06 19:43:31 +0000
@@ -0,0 +1,12 @@
+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

=== added file 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	1970-01-01 00:00:00 +0000
+++ data/unity8-greeter-wrapper	2016-07-06 19:43:31 +0000
@@ -0,0 +1,98 @@
+#!/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 "$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
+}
+
+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.
+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --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 QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
+CMD_PID=$!
+wait $CMD_PID
+CMD_PID=

=== added file 'data/unity8-greeter.desktop.in'
--- data/unity8-greeter.desktop.in	1970-01-01 00:00:00 +0000
+++ data/unity8-greeter.desktop.in	2016-07-06 19:43:31 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Unity 8 Greeter
+Comment=The converged Unity shell's Greeter
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter
+X-LightDM-Session-Type=mir
+X-Ubuntu-Touch=true

=== added file 'data/unity8-greeter.pkla'
--- data/unity8-greeter.pkla	1970-01-01 00:00:00 +0000
+++ data/unity8-greeter.pkla	2016-07-06 19:43:31 +0000
@@ -0,0 +1,44 @@
+# DO NOT EDIT THIS FILE, it will be overwritten on update
+# Place your local configurations under /etc/polkit-1/localauthority/
+
+[Disable Controlling of Network Devices]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable Sleep and Wake]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.sleep-wake
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable WiFi Sharing]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable Settings Modifications]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable User Connections]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.use-user-connections
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Enable Controlling of Network Connections]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.network-control
+ResultActive=yes
+ResultInactive=no
+ResultsAny=no

=== modified file 'debian/control'
--- debian/control	2016-06-27 18:44:35 +0000
+++ debian/control	2016-07-06 19:43:31 +0000
@@ -23,6 +23,7 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libhardware-dev,
+               liblightdm-qt5-3-dev,
                libpam0g-dev,
                libpay2-dev,
                libpulse-dev,
@@ -82,6 +83,17 @@
 Description: Indicators client test application
  This package contains the client application for indicators used by autopilot
 
+Package: unity8-greeter
+Architecture: any
+Depends: unity8 (= ${binary:Version}),
+         unity-system-compositor,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: lightdm
+Provides: lightdm-greeter
+Description: The Unity8 Greeter
+ The Unity 8 greeter is the primary login greeter for Ubuntu devices.
+
 Package: unity-scope-tool
 Architecture: any
 Depends: unity8-common (= ${source:Version}),

=== modified file 'debian/rules'
--- debian/rules	2016-05-31 10:05:16 +0000
+++ debian/rules	2016-07-06 19:43:31 +0000
@@ -37,6 +37,6 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
 
-# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
+# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist
 override_dh_shlibdeps:
 	dh_shlibdeps -XlibMockLightDM-qml.so

=== added file 'debian/unity8-greeter.install'
--- debian/unity8-greeter.install	1970-01-01 00:00:00 +0000
+++ debian/unity8-greeter.install	2016-07-06 19:43:31 +0000
@@ -0,0 +1,5 @@
+data/unity8-greeter-wrapper usr/bin/
+data/unity8-greeter-init.conf usr/share/upstart/sessions/
+data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
+usr/share/lightdm/greeters/unity8-greeter.desktop
+usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2016-05-27 13:49:53 +0000
+++ debian/unity8-private.install	2016-07-06 19:43:31 +0000
@@ -4,7 +4,7 @@
 usr/lib/*/unity8/qml/Dash
 usr/lib/*/unity8/qml/GlobalShortcut
 usr/lib/*/unity8/qml/Greeter
-usr/lib/*/unity8/qml/IntegratedLightDM
+usr/lib/*/unity8/qml/LightDM
 usr/lib/*/unity8/qml/Lights
 usr/lib/*/unity8/qml/Powerd
 usr/lib/*/unity8/qml/ScreenshotDirectory

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2016-04-28 12:06:22 +0000
+++ plugins/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -15,7 +15,7 @@
 add_subdirectory(Cursor)
 add_subdirectory(GlobalShortcut)
 add_subdirectory(Greeter)
-add_subdirectory(IntegratedLightDM)
+add_subdirectory(LightDM)
 add_subdirectory(Lights)
 add_subdirectory(Dash)
 add_subdirectory(Powerd)

=== removed file 'plugins/IntegratedLightDM/qmldir'
--- plugins/IntegratedLightDM/qmldir	2015-05-22 16:23:08 +0000
+++ plugins/IntegratedLightDM/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module IntegratedLightDM
-plugin IntegratedLightDM-qml
-typeinfo IntegratedLightDM.qmltypes

=== renamed directory 'plugins/IntegratedLightDM' => 'plugins/LightDM'
=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/IntegratedLightDM/CMakeLists.txt	2015-05-22 17:29:52 +0000
+++ plugins/LightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -1,40 +1,26 @@
 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)
 
-add_subdirectory(liblightdm)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
-    #${LIBLIGHTDM_INCLUDE_DIRS}
+    ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
     ${libunity8-private_SOURCE_DIR}
     ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
 )
 
 set(QMLPLUGIN_SRC
-    ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
+    ../Utils/unitysortfilterproxymodelqml.cpp
     DBusGreeter.cpp
     DBusGreeterList.cpp
     Greeter.cpp
     plugin.cpp
+    SessionsModel.cpp
     UsersModel.cpp
     )
 
-add_library(IntegratedLightDM-qml MODULE
-    ${QMLPLUGIN_SRC}
-    )
-
-target_link_libraries(IntegratedLightDM-qml
-    integratedLightDM
-    unity8-private
-# TODO: Once we split out a separate greeter process, uncomment these lines
-#    ${LIBLIGHTDM_LDFLAGS}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    )
-
-qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
-
-add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)
+add_subdirectory(FullLightDM)
+add_subdirectory(IntegratedLightDM)

=== modified file 'plugins/LightDM/DBusGreeter.cpp'
--- plugins/IntegratedLightDM/DBusGreeter.cpp	2015-09-14 09:11:08 +0000
+++ plugins/LightDM/DBusGreeter.cpp	2016-07-06 19:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014, 2015 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
@@ -24,7 +24,8 @@
  : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),
    m_greeter(greeter)
 {
-    connect(m_greeter, &Greeter::isActiveChanged, this, &DBusGreeter::isActiveChangedHandler);
+    connect(m_greeter, &Greeter::isActiveChanged,
+            this, &DBusGreeter::isActiveChangedHandler);
 }
 
 bool DBusGreeter::isActive() const
@@ -34,12 +35,12 @@
 
 void DBusGreeter::ShowGreeter()
 {
-    return Q_EMIT m_greeter->showGreeter();
+    Q_EMIT m_greeter->showGreeter();
 }
 
 void DBusGreeter::HideGreeter()
 {
-    return Q_EMIT m_greeter->hideGreeter();
+    Q_EMIT m_greeter->hideGreeter();
 }
 
 void DBusGreeter::isActiveChangedHandler()

=== added directory 'plugins/LightDM/FullLightDM'
=== added file 'plugins/LightDM/FullLightDM/CMakeLists.txt'
--- plugins/LightDM/FullLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/FullLightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -0,0 +1,27 @@
+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
+
+set(PLUGIN_CLASSNAME "FullLightDM")
+
+add_definitions(-DFULL_LIGHTDM)
+
+include_directories(
+    ../
+    ${LIBLIGHTDM_INCLUDE_DIRS}
+    )
+
+foreach(source_file ${QMLPLUGIN_SRC})
+    list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
+endforeach()
+
+add_library(FullLightDM-qml MODULE
+    ${RELATIVE_QMLPLUGIN_SRC}
+    )
+
+target_link_libraries(FullLightDM-qml
+    unity8-private
+    ${LIBLIGHTDM_LDFLAGS}
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    )
+
+qt5_use_modules(FullLightDM-qml DBus Gui Qml)
+add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

=== added file 'plugins/LightDM/FullLightDM/qmldir'
--- plugins/LightDM/FullLightDM/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/FullLightDM/qmldir	2016-07-06 19:43:31 +0000
@@ -0,0 +1,3 @@
+module LightDM.FullLightDM
+plugin FullLightDM-qml
+typeinfo FullLightDM.qmltypes

=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/IntegratedLightDM/Greeter.cpp	2015-09-14 13:08:29 +0000
+++ plugins/LightDM/Greeter.cpp	2016-07-06 19:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013, 2015 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
@@ -13,7 +13,6 @@
  * 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"
@@ -72,12 +71,24 @@
     return d->m_greeter->authenticationUser();
 }
 
+QString Greeter::defaultSessionHint() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->defaultSessionHint();
+}
+
 bool Greeter::promptless() const
 {
     Q_D(const Greeter);
     return d->promptless;
 }
 
+QString Greeter::selectUser() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->selectUserHint();
+}
+
 void Greeter::authenticate(const QString &username)
 {
     Q_D(Greeter);

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/IntegratedLightDM/Greeter.h	2015-01-20 11:50:19 +0000
+++ plugins/LightDM/Greeter.h	2016-07-06 19:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013 Canonical, Ltd.
+ * Copyright (C) 2012,2013,2015 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
@@ -13,7 +13,6 @@
  * 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]>
  */
 
 /* This class is a really tiny filter around QLightDM::Greeter.  There are some
@@ -37,7 +36,9 @@
     Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
     Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
     Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
+    Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
     Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
+    Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
 
 public:
     explicit Greeter(QObject* parent=0);
@@ -45,7 +46,9 @@
     bool isActive() const;
     bool isAuthenticated() const;
     QString authenticationUser() const;
+    QString defaultSessionHint() const;
     bool promptless() const;
+    QString selectUser() const;
 
 public Q_SLOTS:
     void authenticate(const QString &username=QString());

=== added directory 'plugins/LightDM/IntegratedLightDM'
=== added file 'plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
--- plugins/LightDM/IntegratedLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -0,0 +1,30 @@
+set(PLUGIN_CLASSNAME "IntegratedLightDM")
+
+add_definitions(-DINTEGRATED_LIGHTDM)
+
+foreach(include_directory ${QMLPLUGIN_INCLUDES})
+        list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
+endforeach()
+
+include_directories(
+    . #QLightDM
+    )
+
+foreach(source_file ${QMLPLUGIN_SRC})
+    list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
+endforeach()
+
+add_library(IntegratedLightDM-qml MODULE
+    ${RELATIVE_QMLPLUGIN_SRC}
+    )
+
+target_link_libraries(IntegratedLightDM-qml
+    integratedLightDM
+    unity8-private
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    )
+
+qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
+add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
+
+add_subdirectory(liblightdm)

=== added directory 'plugins/LightDM/IntegratedLightDM/QLightDM'
=== added file 'plugins/LightDM/IntegratedLightDM/QLightDM/Greeter'
--- plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	2016-07-06 19:43:31 +0000
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2016 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 "../liblightdm/Greeter.h"

=== added file 'plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
--- plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2016-07-06 19:43:31 +0000
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2016 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 "../liblightdm/SessionsModel.h"

=== added file 'plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel'
--- plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	2016-07-06 19:43:31 +0000
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2016 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 "../liblightdm/UsersModel.h"

=== renamed directory 'plugins/IntegratedLightDM/liblightdm' => 'plugins/LightDM/IntegratedLightDM/liblightdm'
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt'
--- plugins/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-03-08 18:07:38 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -2,8 +2,10 @@
 
 set(LibLightDM_SOURCES
     Greeter.cpp
+    SessionsModel.cpp
     UsersModel.cpp
     GreeterPrivate.cpp
+    SessionsModelPrivate.cpp
     UsersModelPrivate.cpp
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
@@ -46,8 +48,8 @@
                       COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
 set_target_properties(MockLightDM-demo-shared PROPERTIES
                       COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
-                      OUTPUT_NAME lightdm-qt5-2)
+                      OUTPUT_NAME lightdm-qt5-3)
 
 install(TARGETS MockLightDM-demo-shared
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
     )

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp'
--- plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2015-09-14 09:11:08 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2016-07-06 19:43:31 +0000
@@ -50,8 +50,7 @@
     {
         qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
 
-        connect(&futureWatcher, &QFutureWatcher<int>::finished,
-                this, &GreeterImpl::finishPam);
+        connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);
         connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
                 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
         // This next connect is how we pass ResponseFutures between threads

=== added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2015 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/>.
+ *
+ */
+
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
+// To use the same method of setting role name that it does, we
+// set our compatibility to Qt4 here too.
+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
+
+#include "SessionsModel.h"
+#include "SessionsModelPrivate.h"
+#include <QtCore/QDir>
+#include <QtCore/QString>
+
+namespace QLightDM
+{
+
+SessionsModel::SessionsModel(QObject* parent) :
+    QAbstractListModel(parent),
+    d_ptr(new SessionsModelPrivate(this))
+{
+    Q_D(SessionsModel);
+    m_roleNames = QAbstractListModel::roleNames();
+    m_roleNames[KeyRole] = "key";
+    m_roleNames[TypeRole] = "type";
+}
+
+SessionsModel::~SessionsModel()
+{
+    delete d_ptr;
+}
+
+QVariant SessionsModel::data(const QModelIndex& index, int role) const
+{
+    Q_D(const SessionsModel);
+
+    if(!index.isValid()) {
+        return QVariant();
+    }
+
+    int row = index.row();
+
+    switch (role) {
+        case QLightDM::SessionsModel::KeyRole:
+            return d->sessionItems[row].key;
+        case Qt::DisplayRole:
+            return d->sessionItems[row].name;
+        default:
+            return QVariant();
+    }
+}
+
+QHash<int, QByteArray> SessionsModel::roleNames() const
+{
+    return m_roleNames;
+}
+
+int SessionsModel::rowCount(const QModelIndex& parent) const
+{
+    Q_D(const SessionsModel);
+
+    if (parent.isValid()) {
+        return 0;
+    } else { // parent is root
+        return d->sessionItems.size();
+    }
+}
+
+} // namespace QLightDM

=== added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-07-06 19:43:31 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 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_INTEGRATED_SESSIONSMODEL_H
+#define UNITY_INTEGRATED_SESSIONSMODEL_H
+
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QString>
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+// This is taken from liblightdm and modified to confirm to our syle conventions
+namespace QLightDM
+{
+class SessionsModelPrivate;
+
+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
+    {
+        Q_OBJECT
+
+        Q_ENUMS(SessionModelRoles SessionType)
+
+    public:
+
+        enum SessionModelRoles {
+            //name is exposed as Qt::DisplayRole
+            //comment is exposed as Qt::TooltipRole
+            KeyRole = Qt::UserRole,
+            IdRole = KeyRole, /** Deprecated */
+            TypeRole
+        };
+
+        enum SessionType {
+            LocalSessions,
+            RemoteSessions
+        };
+
+        explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
+        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
+        virtual ~SessionsModel();
+
+        QHash<int, QByteArray> roleNames() const override;
+        int rowCount(const QModelIndex& parent) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+
+    protected:
+        SessionsModelPrivate* const d_ptr;
+
+    private:
+        QHash<int, QByteArray> m_roleNames;
+        Q_DECLARE_PRIVATE(SessionsModel)
+    };
+}
+
+#endif // UNITY_INTEGRATED_SESSIONSMODEL_H

=== added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2015 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 "SessionsModelPrivate.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QStringList>
+
+namespace QLightDM
+{
+
+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
+  : q_ptr(parent)
+{
+    // Since this model is never visible, as there is only 1 session,
+    // just use the session name as the key
+    QString sessionName = qgetenv("XDG_SESSION_DESKTOP");
+    sessionItems.append({sessionName, "", sessionName, ""});
+}
+
+} // namespace QLightDM

=== added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-07-06 19:43:31 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 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_INTEGRATED_SESSIONSMODEL_PRIVATE_H
+#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+namespace QLightDM
+{
+class SessionsModel;
+
+class SessionItem
+{
+public:
+    QString key;
+    QString type; // unused
+    QString name;
+    QString comment; // unused
+};
+
+class SessionsModelPrivate
+{
+public:
+    explicit SessionsModelPrivate(SessionsModel* parent=0);
+    virtual ~SessionsModelPrivate() = default;
+
+    QList<SessionItem> sessionItems;
+
+protected:
+    SessionsModel* const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(SessionsModel)
+};
+
+} // namespace QLightDM
+
+#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

=== added file 'plugins/LightDM/IntegratedLightDM/qmldir'
--- plugins/LightDM/IntegratedLightDM/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/IntegratedLightDM/qmldir	2016-07-06 19:43:31 +0000
@@ -0,0 +1,3 @@
+module LightDM.IntegratedLightDM
+plugin IntegratedLightDM-qml
+typeinfo IntegratedLightDM.qmltypes

=== added file 'plugins/LightDM/SessionsModel.cpp'
--- plugins/LightDM/SessionsModel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/SessionsModel.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2015 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 "SessionsModel.h"
+#include <QtCore/QFile>
+#include <QtCore/QSortFilterProxyModel>
+
+QHash<int, QByteArray> SessionsModel::roleNames() const
+{
+    return m_roleNames;
+}
+
+int SessionsModel::rowCount(const QModelIndex& parent) const
+{
+    return m_model->rowCount(parent);
+}
+
+QList<QUrl> SessionsModel::iconSearchDirectories() const
+{
+    return m_iconSearchDirectories;
+}
+
+void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)
+{
+    // QML gives us a url with file:// prepended which breaks QFile::exists()
+    // so convert the url to a local file
+    QList<QUrl> localList = {};
+    Q_FOREACH(const QUrl& searchDirectory, searchDirectories)
+    {
+        localList.append(searchDirectory.toLocalFile());
+    }
+    m_iconSearchDirectories = localList;
+    Q_EMIT iconSearchDirectoriesChanged();
+}
+
+QUrl SessionsModel::iconUrl(const QString sessionName) const
+{
+    Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
+    {
+        // This is an established icon naming convention
+        QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
+            "/custom_" + sessionName  + "_badge.png";
+        QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
+            "/" + sessionName  + "_badge.png";
+
+        QFile customIconFile(customIconUrl);
+        QFile iconFile(iconUrl);
+        if (customIconFile.exists()) {
+            return QUrl(customIconUrl);
+        } else if (iconFile.exists()) {
+            return QUrl(iconUrl);
+        } else{
+            // Search the legacy way
+            QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";
+            if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {
+                path += "ubuntu_badge.png";
+            } else if(
+                        sessionName == "gnome-classic" ||
+                        sessionName == "gnome-flashback-compiz" ||
+                        sessionName == "gnome-flashback-metacity" ||
+                        sessionName == "gnome-shell" ||
+                        sessionName == "gnome-wayland" ||
+                        sessionName == "gnome"
+                    ){
+                path += "gnome_badge.png";
+            } else if (sessionName == "plasma") {
+                path += "kde_badge.png";
+            } else if (sessionName == "xterm") {
+                path += "recovery_console_badge.png";
+            } else if (sessionName == "remote-login") {
+                path += "remote_login_help.png";
+            }
+
+            if (QFile(path).exists()) {
+                return path;
+            }
+        }
+    }
+
+    // FIXME make this smarter
+    return QUrl("./graphics/session_icons/unknown_badge.png");
+}
+
+QVariant SessionsModel::data(const QModelIndex& index, int role) const
+{
+    switch (role) {
+        case SessionsModel::IconRole:
+            return iconUrl(m_model->data(index, Qt::DisplayRole).toString());
+        default:
+            return m_model->data(index, role);
+    }
+}
+
+SessionsModel::SessionsModel(QObject* parent)
+  : UnitySortFilterProxyModelQML(parent)
+{
+    // Add a custom IconRole that isn't in either of the lightdm implementations
+    m_model = new QLightDM::SessionsModel(this);
+    m_roleNames = m_model->roleNames();
+    m_roleNames[IconRole] = "icon_url";
+
+    setModel(m_model);
+    setSourceModel(m_model);
+    setSortCaseSensitivity(Qt::CaseInsensitive);
+    setSortLocaleAware(true);
+    setSortRole(Qt::DisplayRole);
+    sort(0);
+}

=== added file 'plugins/LightDM/SessionsModel.h'
--- plugins/LightDM/SessionsModel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/SessionsModel.h	2016-07-06 19:43:31 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2015 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_SESSIONSMODEL_H
+#define UNITY_SESSIONSMODEL_H
+
+#include <unitysortfilterproxymodelqml.h>
+#include <QLightDM/SessionsModel>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
+
+class SessionsModel : public UnitySortFilterProxyModelQML
+{
+    Q_OBJECT
+
+    Q_ENUMS(SessionModelRoles)
+
+    Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
+            WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
+Q_SIGNALS:
+    void iconSearchDirectoriesChanged();
+
+public:
+    enum SessionModelRoles {
+        /* This is tricky / ugly. Since we are ultimately chaining 3 enums together,
+         * the _first_ value of this enum MUST be the _last_ value of
+         * QLightDM::SessionsModel::SessionModelRoles and consquently, this must
+         * also match the last value in the corresponding enum of the integrated lib
+         */
+        TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
+        IconRole
+    };
+
+    explicit SessionsModel(QObject* parent=nullptr);
+
+    QHash<int, QByteArray>  roleNames() const override;
+    int rowCount(const QModelIndex& parent) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
+    QList<QUrl> iconSearchDirectories() const;
+    Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;
+
+    void setIconSearchDirectories(const QList<QUrl> searchDirectories);
+private:
+    QLightDM::SessionsModel* m_model;
+    QHash<int, QByteArray> m_roleNames;
+    QList<QUrl> m_iconSearchDirectories{
+        QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),
+        QUrl("/usr/local/share/unity-greeter"),
+        QUrl("/usr/share/unity-greeter/")};
+
+};
+
+#endif // UNITY_SESSIONSMODEL_H

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/IntegratedLightDM/plugin.cpp	2015-09-14 09:11:08 +0000
+++ plugins/LightDM/plugin.cpp	2016-07-06 19:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013, 2015 Canonical, Ltd.
+ * Copyright (C) 2012,2013,2015 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
@@ -19,9 +19,11 @@
 #include "DBusGreeter.h"
 #include "DBusGreeterList.h"
 #include "Greeter.h"
+#include "SessionsModel.h"
 #include "UsersModel.h"
 #include <libusermetricsoutput/ColorTheme.h>
 #include <libusermetricsoutput/UserMetrics.h>
+#include <QLightDM/SessionsModel>
 #include <QLightDM/UsersModel>
 
 #include <QAbstractItemModel>
@@ -40,6 +42,13 @@
     return greeter;
 }
 
+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new SessionsModel();
+}
+
 static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -54,16 +63,29 @@
     return UserMetricsOutput::UserMetrics::getInstance();
 }
 
-void IntegratedLightDMPlugin::registerTypes(const char *uri)
+void PLUGIN_CLASSNAME::registerTypes(const char *uri)
 {
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<UserMetricsOutput::ColorTheme>();
 
-    Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
+#if defined INTEGRATED_LIGHTDM
+    Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
+    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
+#elif defined FULL_LIGHTDM
+    Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));
+    qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);
+#else
+    #error No library defined in LightDM plugin
+#endif
+
     qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
     qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
-    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
+
+    qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
+    qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
+
     qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
     qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
+
     qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
 }

=== modified file 'plugins/LightDM/plugin.h'
--- plugins/IntegratedLightDM/plugin.h	2015-05-29 19:10:28 +0000
+++ plugins/LightDM/plugin.h	2016-07-06 19:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013, 2015 Canonical, Ltd.
+ * Copyright (C) 2012,2013,2015 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
@@ -15,13 +15,13 @@
  *
  */
 
-#ifndef INTEGRATED_LIGHTDM_PLUGIN_H
-#define INTEGRATED_LIGHTDM_PLUGIN_H
+#ifndef LIGHTDM_PLUGIN_H
+#define LIGHTDM_PLUGIN_H
 
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class IntegratedLightDMPlugin : public QQmlExtensionPlugin
+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -30,4 +30,4 @@
     void registerTypes(const char *uri) override;
 };
 
-#endif /* INTEGRATED_LIGHTDM_PLUGIN_H */
+#endif /* LIGHTDM_PLUGIN_H */

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-03-29 03:47:39 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-07-06 19:43:31 +0000
@@ -291,7 +291,7 @@
     // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
     if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
             || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
-        new_indicator->setProfile(QStringLiteral("desktop"));
+        new_indicator->setProfile(m_profile.replace(QStringLiteral("phone"), QStringLiteral("desktop")));
     } else {
         new_indicator->setProfile(m_profile);
     }

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2016-06-01 19:35:04 +0000
+++ qml/Components/Dialogs.qml	2016-07-06 19:43:31 +0000
@@ -107,12 +107,12 @@
 
     GlobalShortcut { // lock screen
         shortcut: Qt.Key_ScreenSaver
-        onTriggered: lightDM.greeter.showGreeter()
+        onTriggered: LightDMService.greeter.showGreeter()
     }
 
     GlobalShortcut { // lock screen
         shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_L
-        onTriggered: lightDM.greeter.showGreeter()
+        onTriggered: LightDMService.greeter.showGreeter()
     }
 
     QtObject {
@@ -137,8 +137,6 @@
         active: false
     }
 
-    LightDM {id: lightDM} // Provide backend access
-
     Component {
         id: logoutDialogComponent
         ShellDialog {
@@ -148,7 +146,7 @@
             Button {
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
-                    lightDM.greeter.showGreeter()
+                    LightDMService.greeter.showGreeter()
                     logoutDialog.hide();
                 }
             }

=== added file 'qml/Greeter/FullLightDMImpl.qml'
--- qml/Greeter/FullLightDMImpl.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/FullLightDMImpl.qml	2016-07-06 19:43:31 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 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.4
+import LightDM.FullLightDM 0.1 as LightDM
+
+Item{
+    id: implementation
+
+    property var greeter: LightDM.Greeter
+    property var infographic: LightDM.Infographic
+    property var users: LightDM.Users
+    property var userRoles: LightDM.UserRoles
+
+}

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-06-27 18:44:00 +0000
+++ qml/Greeter/Greeter.qml	2016-07-06 19:43:31 +0000
@@ -23,6 +23,8 @@
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import Unity.Session 0.1
+
+import "." 0.1
 import "../Components"
 
 Showable {
@@ -48,7 +50,7 @@
     readonly property bool hasLockedApp: lockedApp !== ""
 
     property bool forcedUnlock
-    readonly property bool locked: lightDM.greeter.active && !lightDM.greeter.authenticated && !forcedUnlock
+    readonly property bool locked: LightDMService.greeter.active && !LightDMService.greeter.authenticated && !forcedUnlock
 
     property bool tabletMode
     property url viewSource // only used for testing
@@ -69,11 +71,14 @@
             d.isLockscreen = true;
         }
         forcedUnlock = false;
-        if (!required) {
-            showNow(); // loader.onLoaded will select a user
-        } else {
+        if (required) {
+            // Normally loader.onLoaded will select a user, but if we're
+            // already shown, do it manually.
             d.selectUser(d.currentIndex, true);
         }
+        // Even though we may already be shown, we want to call show() for its
+        // possible side effects, like hiding indicators and such.
+        showNow();
     }
 
     function notifyAppFocusRequested(appId) {
@@ -120,12 +125,12 @@
         return d.startUnlock(true /* toTheRight */);
     }
 
-    LightDM{id:lightDM} // Provide backend access
     QtObject {
         id: d
 
-        readonly property bool multiUser: lightDM.users.count > 1
-        property int currentIndex
+        readonly property bool multiUser: LightDMService.users.count > 1
+        readonly property int selectUserIndex: d.getUserIndex(LightDMService.greeter.selectUser)
+        property int currentIndex: Math.max(selectUserIndex, 0)
         property bool waiting
         property bool isLockscreen // true when we are locking an active session, rather than first user login
         readonly property bool secureFingerprint: isLockscreen &&
@@ -147,21 +152,37 @@
             UbuntuNumberAnimation {}
         }
 
+        function getUserIndex(username) {
+            if (username === "")
+                return -1;
+
+            // Find index for requested user, if it exists
+            for (var i = 0; i < LightDMService.users.count; i++) {
+                if (username === LightDMService.users.data(i, LightDMService.userRoles.NameRole)) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
         function selectUser(uid, reset) {
+            if (uid < 0)
+                return;
             d.waiting = true;
             if (reset) {
                 loader.item.reset();
             }
             currentIndex = uid;
-            var user = lightDM.users.data(uid, lightDM.userRoles.NameRole);
+            var user = LightDMService.users.data(uid, LightDMService.userRoles.NameRole);
             AccountsService.user = user;
             LauncherModel.setUser(user);
-            lightDM.greeter.authenticate(user); // always resets auth state
+            LightDMService.greeter.authenticate(user); // always resets auth state
         }
 
         function login() {
             enabled = false;
-            if (lightDM.greeter.startSessionSync()) {
+            if (LightDMService.greeter.startSessionSync()) {
                 sessionStarted();
                 if (loader.item) {
                     loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
@@ -307,7 +328,7 @@
             root.lockedApp = "";
             root.forceActiveFocus();
             d.selectUser(d.currentIndex, true);
-            lightDM.infographic.readyForDataChange();
+            LightDMService.infographic.readyForDataChange();
         }
 
         Connections {
@@ -315,13 +336,12 @@
             onSelected: {
                 d.selectUser(index, true);
             }
+            onPromptlessLogin: d.login();
             onResponded: {
                 if (root.locked) {
-                    lightDM.greeter.respond(response);
+                    LightDMService.greeter.respond(response);
                 } else {
-                    if (lightDM.greeter.active && !lightDM.greeter.authenticated) { // could happen if forcedUnlock
-                        d.login();
-                    }
+                    d.login();
                     loader.item.hide();
                 }
             }
@@ -385,18 +405,18 @@
         Binding {
             target: loader.item
             property: "userModel"
-            value: lightDM.users
+            value: LightDMService.users
         }
 
         Binding {
             target: loader.item
             property: "infographicModel"
-            value: lightDM.infographic
+            value: LightDMService.infographic
         }
     }
 
     Connections {
-        target: lightDM.greeter
+        target: LightDMService.greeter
 
         onShowGreeter: root.forceShow()
 
@@ -431,13 +451,13 @@
         onAuthenticationComplete: {
             d.waiting = false;
 
-            if (lightDM.greeter.authenticated) {
-                d.login();
-                if (!lightDM.greeter.promptless) {
+            if (LightDMService.greeter.authenticated) {
+                if (!LightDMService.greeter.promptless) {
+                    d.login();
                     loader.item.hide();
                 }
             } else {
-                if (!lightDM.greeter.promptless) {
+                if (!LightDMService.greeter.promptless) {
                     AccountsService.failedLogins++;
                 }
 
@@ -458,21 +478,13 @@
                 }
 
                 loader.item.notifyAuthenticationFailed();
-                if (!lightDM.greeter.promptless) {
+                if (!LightDMService.greeter.promptless) {
                     d.selectUser(d.currentIndex, false);
                 }
             }
         }
 
-        onRequestAuthenticationUser: {
-            // Find index for requested user, if it exists
-            for (var i = 0; i < lightDM.users.count; i++) {
-                if (user === lightDM.users.data(i, lightDM.userRoles.NameRole)) {
-                    d.selectUser(i, true);
-                    return;
-                }
-            }
-        }
+        onRequestAuthenticationUser: d.selectUser(d.getUserIndex(user), true)
     }
 
     Connections {
@@ -485,20 +497,20 @@
     }
 
     Binding {
-        target: lightDM.greeter
+        target: LightDMService.greeter
         property: "active"
         value: root.active
     }
 
     Binding {
-        target: lightDM.infographic
+        target: LightDMService.infographic
         property: "username"
-        value: AccountsService.statsWelcomeScreen ? lightDM.users.data(d.currentIndex, lightDM.userRoles.NameRole) : ""
+        value: AccountsService.statsWelcomeScreen ? LightDMService.users.data(d.currentIndex, LightDMService.userRoles.NameRole) : ""
     }
 
     Connections {
         target: i18n
-        onLanguageChanged: lightDM.infographic.readyForDataChange()
+        onLanguageChanged: LightDMService.infographic.readyForDataChange()
     }
 
     Observer {
@@ -550,7 +562,7 @@
                 failOperation("fingerprint reader is locked");
                 return;
             }
-            if (result !== lightDM.users.data(d.currentIndex, lightDM.userRoles.UidRole)) {
+            if (result !== LightDMService.users.data(d.currentIndex, LightDMService.userRoles.UidRole)) {
                 AccountsService.failedFingerprintLogins++;
                 failOperation("not the selected user");
                 return;

=== modified file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2015-09-02 07:42:27 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	2016-07-06 19:43:31 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 
 Item{
     id: implementation

=== renamed file 'qml/Greeter/LightDM.qml' => 'qml/Greeter/LightDMService.qml'
--- qml/Greeter/LightDM.qml	2015-09-02 07:42:27 +0000
+++ qml/Greeter/LightDMService.qml	2016-07-06 19:43:31 +0000
@@ -19,6 +19,7 @@
  * plugin
  */
 
+pragma Singleton
 import QtQuick 2.4
 
 Loader {
@@ -29,13 +30,23 @@
     property var users: d.valid ? loader.item.users : null
     property var userRoles: d.valid ? loader.item.userRoles : null
 
-    // TODO: Conditionally load RealLightDMImpl if shellMode dictates it
-    source: "./IntegratedLightDMImpl.qml"
+    // This trickery handles cases where applicationArguments aren't provided
+    // such as during testing
+    property var fullLightDM: {
+        if (typeof applicationArguments !== "undefined") {
+            if (applicationArguments.mode === "greeter") {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    source:  fullLightDM ?
+        "FullLightDMImpl.qml" : "IntegratedLightDMImpl.qml"
 
     QtObject {
         id: d
 
         property bool valid: loader.item !== null
     }
-
 }

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2016-05-31 13:16:03 +0000
+++ qml/Greeter/LoginList.qml	2016-07-06 19:43:31 +0000
@@ -36,6 +36,7 @@
 
     signal selected(int index)
     signal responded(string response)
+    signal promptlessLogin()
 
     function tryToUnlock() {
         if (wasPrompted) {
@@ -44,6 +45,7 @@
             if (root.locked) {
                 root.selected(currentIndex);
             } else {
+                promptlessLogin();
                 root.responded("");
             }
         }

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2016-06-18 22:37:48 +0000
+++ qml/Greeter/WideView.qml	2016-07-06 19:43:31 +0000
@@ -37,6 +37,7 @@
     // so that it can be replaced in tests with a mock object
     property var inputMethod: Qt.inputMethod
 
+    signal promptlessLogin()
     signal selected(int index)
     signal responded(string response)
     signal tease()
@@ -132,6 +133,7 @@
 
             locked: root.locked
 
+            onPromptlessLogin: root.promptlessLogin()
             onSelected: root.selected(index)
             onResponded: root.responded(response)
         }

=== added file 'qml/Greeter/qmldir'
--- qml/Greeter/qmldir	1970-01-01 00:00:00 +0000
+++ qml/Greeter/qmldir	2016-07-06 19:43:31 +0000
@@ -0,0 +1,1 @@
+singleton LightDMService 0.1 LightDMService.qml

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-07-05 09:57:08 +0000
+++ qml/Shell.qml	2016-07-06 19:43:31 +0000
@@ -175,7 +175,6 @@
         finishStartUpTimer.start();
     }
 
-    LightDM{id: lightDM} // Provide backend access
     VolumeControl {
         id: volumeControl
         indicators: panel.indicators
@@ -260,8 +259,8 @@
                                            ? "phone"
                                            : shell.usageScenario
             readonly property string qmlComponent: {
-                if(shell.mode === "greeter") {
-                    return "Stages/ShimStage.qml"
+                if (shell.mode === "greeter") {
+                    return "Stages/AbstractStage.qml"
                 } else if (applicationsDisplayLoader.usageScenario === "phone") {
                     return "Stages/PhoneStage.qml";
                 } else if (applicationsDisplayLoader.usageScenario === "tablet") {
@@ -502,7 +501,7 @@
     function showHome() {
         greeter.notifyUserRequestedApp("unity8-dash");
 
-        var animate = !lightDM.greeter.active && !stages.shown
+        var animate = !LightDMService.greeter.active && !stages.shown
         dash.setCurrentScope(0, animate, false)
         ApplicationManager.requestFocusApplication("unity8-dash")
     }
@@ -541,7 +540,12 @@
 
                 indicatorsModel: Indicators.IndicatorsModel {
                     // tablet and phone both use the same profile
-                    profile: "phone"
+                    // FIXME: use just "phone" for greeter too, but first fix
+                    // greeter app launching to either load the app inside the
+                    // greeter or tell the session to load the app.  This will
+                    // involve taking the url-dispatcher dbus name and using
+                    // SessionBroadcast to tell the session.
+                    profile: shell.mode === "greeter" ? "desktop_greeter" : "phone"
                     Component.onCompleted: load();
                 }
             }
@@ -553,7 +557,7 @@
             readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
                 ? MirFocusController.focusedSurface.state === Mir.FullscreenState
                 : false
-            fullscreenMode: (focusedSurfaceIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)
+            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)
                             || greeter.hasLockedApp
             locked: greeter && greeter.active
         }
@@ -671,6 +675,7 @@
             id: wizard
             objectName: "wizard"
             anchors.fill: parent
+            deferred: shell.mode === "greeter"
 
             function unlockWhenDoneWithWizard() {
                 if (!active) {

=== removed file 'qml/Stages/ShimStage.qml'
--- qml/Stages/ShimStage.qml	2016-04-14 13:28:11 +0000
+++ qml/Stages/ShimStage.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 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.4
-import Ubuntu.Components 1.3
-
-AbstractStage {
-    id: shimStage
-
-    anchors.fill: parent
-
-    Text {
-        id: greeterModeText
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: parent.top
-        anchors.topMargin: units.gu(10)
-        font.bold: true
-        horizontalAlignment: Text.AlignHCenter
-        text: "Shell is in \"greeter\" mode"
-    }
-
-    Text {
-        anchors.centerIn: parent
-        color: UbuntuColors.orange
-        font.pointSize: units.gu(8)
-        horizontalAlignment: Text.AlignHCenter
-        text: "Shim \nStage"
-    }
-}

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2016-03-29 03:47:39 +0000
+++ qml/Wizard/Wizard.qml	2016-07-06 19:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013, 2015 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
@@ -29,6 +29,10 @@
     // expected behavior of no emission on startup.
     readonly property bool active: loader.active
 
+    // The wizard should be run at a later time if, for example, unity8 is
+    // in greeter mode
+    property bool deferred: false
+
     hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
 
     onRequiredChanged: {
@@ -40,7 +44,7 @@
     Loader {
         id: loader
         anchors.fill: parent
-        active: System.wizardEnabled
+        active: System.wizardEnabled && !deferred
         source: "Pages.qml"
 
         Connections {

=== modified file 'src/ShellApplication.cpp'
--- src/ShellApplication.cpp	2016-04-28 12:06:22 +0000
+++ src/ShellApplication.cpp	2016-07-06 19:43:31 +0000
@@ -18,6 +18,7 @@
 
 // Qt
 #include <QLibrary>
+#include <QProcess>
 #include <QScreen>
 
 #include <libintl.h>
@@ -110,7 +111,16 @@
         m_secondaryWindow->setVisible(true);
     }
 
-    if (isMirServer || parser.hasFullscreen()) {
+    if (parser.mode().compare("greeter") == 0) {
+        QSize primaryScreenSize = this->primaryScreen()->size();
+        m_shellView->setHeight(primaryScreenSize.height());
+        m_shellView->setWidth(primaryScreenSize.width());
+        m_shellView->show();
+        m_shellView->requestActivate();
+        if (!QProcess::startDetached("/sbin/initctl emit --no-wait unity8-greeter-started")) {
+            qDebug() << "Unable to send unity8-greeter-started event to Upstart";
+        }
+    } else if (isMirServer || parser.hasFullscreen()) {
         m_shellView->showFullScreen();
     } else {
         m_shellView->show();

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-06-21 14:23:49 +0000
+++ tests/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -47,7 +47,7 @@
     if(U8TEST_LIGHTDM)
         list(APPEND ld_paths
             ${UNITY_MOCKPATH}/libusermetrics
-            ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm
+            ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
         )
     endif()
 

=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-10-19 14:16:23 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2016-07-06 19:43:31 +0000
@@ -74,7 +74,7 @@
     def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "IntegratedLightDM", "liblightdm")
+            os.path.join(lib_path, "LightDM" ,"IntegratedLightDM", "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):

=== modified file 'tests/autopilot/unity8/greeter/tests/test_args.py'
--- tests/autopilot/unity8/greeter/tests/test_args.py	2015-07-06 12:52:08 +0000
+++ tests/autopilot/unity8/greeter/tests/test_args.py	2016-07-06 19:43:31 +0000
@@ -35,11 +35,6 @@
         shell = self.get_shell(unity_proxy)
         self.assertTrue(shell.mode == 'full-shell')
 
-    def test_greeter_mode(self):
-        unity_proxy = self.launch_unity(mode='greeter')
-        shell = self.get_shell(unity_proxy)
-        self.assertTrue(shell.mode == 'greeter')
-
     def test_nonexistent_mode(self):
         unity_proxy = self.launch_unity(mode=self.NONEXISTENT_MODE)
         shell = self.get_shell(unity_proxy)

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-10-19 14:16:23 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2016-07-06 19:43:31 +0000
@@ -261,7 +261,7 @@
     def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "IntegratedLightDM", "liblightdm")
+            os.path.join(lib_path, "LightDM" ,"IntegratedLightDM", "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2016-05-03 13:41:11 +0000
+++ tests/mocks/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -34,7 +34,7 @@
 add_subdirectory(GSettings.1.0)
 add_subdirectory(indicator-service)
 add_subdirectory(libusermetrics)
-add_subdirectory(IntegratedLightDM)
+add_subdirectory(LightDM)
 add_subdirectory(Lights)
 add_subdirectory(MeeGo)
 add_subdirectory(Powerd)

=== renamed directory 'tests/mocks/IntegratedLightDM' => 'tests/mocks/LightDM'
=== added file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(IntegratedLightDM)

=== added directory 'tests/mocks/LightDM/IntegratedLightDM'
=== renamed file 'tests/mocks/IntegratedLightDM/CMakeLists.txt' => 'tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt'
--- tests/mocks/IntegratedLightDM/CMakeLists.txt	2015-06-17 21:59:31 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -10,18 +10,20 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
     ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
     ${libunity8-private_SOURCE_DIR}
 )
 
 set(QMLPLUGIN_SRC
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeter.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeterList.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/SessionsModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     MockGreeter.cpp
+    MockSessionsModel.cpp
     MockUsersModel.cpp
     plugin.cpp
     )
@@ -30,7 +32,7 @@
     ${QMLPLUGIN_SRC}
     )
 
-# We want to link to liblightdm-qt5-2, but we don't want to depend on it being
+# We want to link to liblightdm-qt5-3, 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.
@@ -42,7 +44,7 @@
 
 qt5_use_modules(MockLightDM-qml DBus Gui Qml)
 
-add_unity8_mock(IntegratedLightDM 0.1 IntegratedLightDM
+add_unity8_mock(LightDM.IntegratedLightDM 0.1 LightDM/IntegratedLightDM
     PREFIX mocks
     TARGETS MockLightDM-qml
     ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"

=== renamed file 'tests/mocks/IntegratedLightDM/MockGreeter.cpp' => 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp'
--- tests/mocks/IntegratedLightDM/MockGreeter.cpp	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	2016-07-06 19:43:31 +0000
@@ -33,3 +33,19 @@
         Q_EMIT mockModeChanged(mockMode);
     }
 }
+
+QString MockGreeter::selectUserHint() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->selectUserHint();
+}
+
+void MockGreeter::setSelectUserHint(const QString &selectUserHint)
+{
+    Q_D(Greeter);
+
+    if (d->m_greeter->selectUserHint() != selectUserHint) {
+        d->m_greeter->setSelectUserHint(selectUserHint);
+        Q_EMIT selectUserHintChanged();
+    }
+}

=== renamed file 'tests/mocks/IntegratedLightDM/MockGreeter.h' => 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h'
--- tests/mocks/IntegratedLightDM/MockGreeter.h	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	2016-07-06 19:43:31 +0000
@@ -25,13 +25,18 @@
     Q_OBJECT
 
     Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+    Q_PROPERTY(QString selectUser READ selectUserHint WRITE setSelectUserHint NOTIFY selectUserHintChanged)
 
 public:
     QString mockMode() const;
     void setMockMode(QString mockMode);
 
+    QString selectUserHint() const;
+    void setSelectUserHint(const QString &selectUserHint);
+
 Q_SIGNALS:
     void mockModeChanged(QString mode);
+    void selectUserHintChanged();
 };
 
 #endif // MOCK_UNITY_GREETER_H

=== added file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015 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 "MockSessionsModel.h"
+#include <QLightDM/SessionsModel>
+
+QString MockSessionsModel::testScenario() const
+{
+    QLightDM::SessionsModel* qSessionsModel =
+        static_cast<QLightDM::SessionsModel*>(sourceModel());
+
+    return qSessionsModel->testScenario();
+}
+
+void MockSessionsModel::setTestScenario(const QString testScenario)
+{
+    QLightDM::SessionsModel* qSessionsModel =
+        static_cast<QLightDM::SessionsModel*>(sourceModel());
+
+    if (qSessionsModel->testScenario() != testScenario) {
+        qSessionsModel->setTestScenario(testScenario);
+    }
+}

=== added file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	2016-07-06 19:43:31 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 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 MOCK_UNITY_SESSIONSMODEL_H
+#define MOCK_UNITY_SESSIONSMODEL_H
+
+#include <SessionsModel.h>
+
+class MockSessionsModel : public SessionsModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
+
+public:
+    QString testScenario() const;
+    void setTestScenario(QString testScenario);
+};
+
+#endif // MOCK_UNITY_SESSIONSMODEL_H

=== renamed file 'tests/mocks/IntegratedLightDM/MockUsersModel.cpp' => 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp'
=== renamed file 'tests/mocks/IntegratedLightDM/MockUsersModel.h' => 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h'
=== renamed directory 'tests/mocks/IntegratedLightDM/QLightDM' => 'tests/mocks/LightDM/IntegratedLightDM/QLightDM'
=== added file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2016-07-06 19:43:31 +0000
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2015 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 "../liblightdm/SessionsModel.h"

=== renamed directory 'tests/mocks/IntegratedLightDM/liblightdm' => 'tests/mocks/LightDM/IntegratedLightDM/liblightdm'
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt'
--- tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt	2015-09-21 12:14:55 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -1,7 +1,9 @@
 set(LibLightDM_SOURCES
     Greeter.cpp
+    SessionsModel.cpp
     UsersModel.cpp
     GreeterPrivate.cpp
+    SessionsModelPrivate.cpp
     UsersModelPrivate.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
     )
@@ -11,8 +13,8 @@
 qt5_use_modules(MockLightDM Gui)
 
 set_target_properties(MockLightDM PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-2)
+                      OUTPUT_NAME lightdm-qt5-3)
 
 install(TARGETS MockLightDM
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/liblightdm
     )

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpp	2015-08-19 14:24:07 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-07-06 19:43:31 +0000
@@ -51,7 +51,7 @@
 
 QString Greeter::defaultSessionHint() const
 {
-    return "ubuntu";
+    return QStringLiteral("ubuntu");
 }
 
 bool Greeter::hideUsersHint() const
@@ -76,7 +76,14 @@
 
 QString Greeter::selectUserHint() const
 {
-    return "";
+    Q_D(const Greeter);
+    return d->selectUserHint;
+}
+
+void Greeter::setSelectUserHint(const QString &selectUserHint)
+{
+    Q_D(Greeter);
+    d->selectUserHint = selectUserHint;
 }
 
 bool Greeter::selectGuestHint() const

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- tests/mocks/IntegratedLightDM/liblightdm/Greeter.h	2015-02-20 15:30:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-07-06 19:43:31 +0000
@@ -70,6 +70,7 @@
     bool lockHint () const;
     bool hasGuestAccountHint() const;
     QString selectUserHint() const;
+    void setSelectUserHint(const QString &selectUserHint); // only in mock
     bool selectGuestHint() const;
     QString autologinUserHint() const;
     bool autologinGuestHint() const;

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h'
--- tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.h	2016-05-26 13:15:35 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2016-07-06 19:43:31 +0000
@@ -34,6 +34,7 @@
     bool authenticated;
     QString authenticationUser;
     bool twoFactorDone;
+    QString selectUserHint;
 
     QString mockMode;
 

=== added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2015 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/>.
+ *
+ */
+
+
+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
+// To use the same method of setting role name that it does, we
+// set our compatibility to Qt4 here too.
+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
+
+#include "SessionsModel.h"
+#include "SessionsModelPrivate.h"
+#include <QtCore/QDir>
+#include <QtCore/QString>
+
+namespace QLightDM
+{
+
+SessionsModel::SessionsModel(QObject* parent) :
+    QAbstractListModel(parent),
+    d_ptr(new SessionsModelPrivate(this))
+{
+    Q_D(SessionsModel);
+    m_roleNames = QAbstractListModel::roleNames();
+    m_roleNames[KeyRole] = "key";
+    m_roleNames[TypeRole] = "type";
+}
+
+SessionsModel::~SessionsModel()
+{
+    delete d_ptr;
+}
+
+QVariant SessionsModel::data(const QModelIndex& index, int role) const
+{
+    Q_D(const SessionsModel);
+
+    if(!index.isValid()) {
+        return QVariant();
+    }
+
+    int row = index.row();
+
+    switch (role) {
+        case QLightDM::SessionsModel::KeyRole:
+            return d->sessionItems[row].key;
+        case Qt::DisplayRole:
+            return d->sessionItems[row].name;
+        default:
+            return QVariant();
+    }
+}
+
+QHash<int, QByteArray> SessionsModel::roleNames() const
+{
+    return m_roleNames;
+}
+
+int SessionsModel::rowCount(const QModelIndex& parent) const
+{
+    Q_D(const SessionsModel);
+
+    if (parent.isValid()) {
+        return 0;
+    } else { // parent is root
+        return d->sessionItems.size();
+    }
+}
+
+QString SessionsModel::testScenario() const
+{
+    Q_D(const SessionsModel);
+    return d->testScenario;
+}
+
+void SessionsModel::setTestScenario(QString testScenario)
+{
+    Q_D(SessionsModel);
+
+    if (d->testScenario != testScenario) {
+        d->testScenario = testScenario;
+        d->resetEntries();
+    }
+}
+
+} // namespace QLightDM

=== added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-07-06 19:43:31 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 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_MOCK_SESSIONSMODEL_H
+#define UNITY_MOCK_SESSIONSMODEL_H
+
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QString>
+
+namespace QLightDM
+{
+class SessionsModelPrivate;
+
+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
+    {
+        Q_OBJECT
+
+        Q_ENUMS(SessionModelRoles SessionType)
+
+        // Mock-only API for testing purposes
+        Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
+
+    public:
+
+        enum SessionModelRoles {
+            //name is exposed as Qt::DisplayRole
+            //comment is exposed as Qt::TooltipRole
+            KeyRole = Qt::UserRole,
+            IdRole = KeyRole, /** Deprecated */
+            TypeRole
+        };
+
+        enum SessionType {
+            LocalSessions,
+            RemoteSessions
+        };
+
+        explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
+        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
+        virtual ~SessionsModel();
+
+        QHash<int, QByteArray> roleNames() const override;
+        int rowCount(const QModelIndex& parent) const override;
+        QVariant data(const QModelIndex& index, int role) const override;
+
+        QString testScenario() const;
+        void setTestScenario(QString testScenario);
+
+    protected:
+        SessionsModelPrivate* const d_ptr;
+
+    private:
+        QHash<int, QByteArray> m_roleNames;
+        Q_DECLARE_PRIVATE(SessionsModel)
+    };
+}
+
+#endif // UNITY_MOCK_SESSIONSMODEL_H

=== added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015 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 "SessionsModel.h"
+#include "SessionsModelPrivate.h"
+
+namespace QLightDM
+{
+
+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
+    : testScenario("singleSession")
+    , q_ptr(parent)
+{
+    resetEntries();
+}
+
+void SessionsModelPrivate::resetEntries()
+{
+    Q_Q(SessionsModel);
+
+    q->beginResetModel();
+        if (testScenario == "multipleSessions") {
+            resetEntries_multipleSessions();
+        } else if (testScenario == "noSessions") {
+            resetEntries_noSessions();
+        } else {
+            resetEntries_singleSession();
+        }
+    q->endResetModel();
+}
+
+void SessionsModelPrivate::resetEntries_multipleSessions()
+{
+    sessionItems =
+        {
+            {"ubuntu", "", "Ubuntu", ""},
+            {"ubuntu-2d", "", "Ubuntu 2D", ""},
+            {"gnome", "", "GNOME", ""},
+            {"gnome-classic", "", "GNOME Classic", ""},
+            {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
+            {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
+            {"gnome-wayland", "", "GNOME on Wayland", ""},
+            {"plasma", "", "Plasma", ""},
+            {"kde", "", "KDE" , ""},
+            {"xterm", "", "Recovery Console", ""},
+            {"", "", "Unknown?", ""}
+        };
+}
+
+void SessionsModelPrivate::resetEntries_noSessions()
+{
+    sessionItems = {};
+}
+
+void SessionsModelPrivate::resetEntries_singleSession()
+{
+    sessionItems = {{"ubuntu", "", "Ubuntu", ""}};
+}
+
+} // namespace QLightDM

=== added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-07-06 19:43:31 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2015 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_MOCK_SESSIONSMODEL_PRIVATE_H
+#define UNITY_MOCK_SESSIONSMODEL_PRIVATE_H
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+namespace QLightDM
+{
+class SessionsModel;
+
+class SessionItem
+{
+public:
+    QString key;
+    QString type; // unused
+    QString name;
+    QString comment; // unused
+};
+
+class SessionsModelPrivate
+{
+public:
+    explicit SessionsModelPrivate(SessionsModel* parent=0);
+    virtual ~SessionsModelPrivate() = default;
+
+    QList<SessionItem> sessionItems;
+    QString testScenario;
+
+    void resetEntries();
+protected:
+    SessionsModel* const q_ptr;
+
+private:
+    void resetEntries_multipleSessions();
+    void resetEntries_noSessions();
+    void resetEntries_singleSession();
+    Q_DECLARE_PUBLIC(SessionsModel)
+};
+
+} // namespace QLightDM
+
+#endif // UNITY_MOCK_SESSIONSMODEL_PRIVATE_H

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-18 22:37:48 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-07-06 19:43:31 +0000
@@ -60,7 +60,7 @@
 {
     entries =
     {
-        { "single", "Single User", 0, 0, false, false, 0, 0, 0 },
+        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
     };
 }
 
@@ -68,7 +68,7 @@
 {
     entries =
     {
-        { "single", "Single User", 0, 0, false, false, 0, 0, 0 },
+        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
     };
 }
 
@@ -76,7 +76,7 @@
 {
     entries =
     {
-        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0, 0 },
+        { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
     };
 }
 
@@ -84,26 +84,26 @@
 {
     entries =
     {
-        { "has-password",      "Has Password", 0, 0, false, false, 0, 0, 0 },
-        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0, 0 },
-        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0, 0 },
-        { "no-password",       "No Password", 0, 0, false, false, 0, 0, 0 },
-        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0, 0 },
-        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0, 0 },
-        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0, 0 },
-        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0, 0 },
-        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0, 0 },
-        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0, 0 },
-        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0, 0 },
-        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, 0, 0, 0 },
-        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 0, 0 },
+        { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
+        { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
+        { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
+        { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
+        { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
+        { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
+        { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
+        { "color-background",  "Color Background", "#dd4814", 0, false, false, "ubuntu", 0 },
         // white and black are a bit redundant, but useful for manually testing if UI is still readable
-        { "white-background",  "White Background", "#ffffff", 0, false, false, 0, 0, 0 },
-        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0, 0 },
-        { "no-background",     "No Background", "", 0, false, false, 0, 0, 0 },
-        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0, 0 },
-        { "no-response",       "No Response", 0, 0, false, false, 0, 0, 0 },
-        { "empty-name",        "", 0, 0, false, false, 0, 0, 0 },
+        { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
+        { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
+        { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
+        { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
+        { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
+        { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
     };
 }
 

=== renamed file 'tests/mocks/IntegratedLightDM/plugin.cpp' => 'tests/mocks/LightDM/IntegratedLightDM/plugin.cpp'
--- tests/mocks/IntegratedLightDM/plugin.cpp	2015-05-22 17:29:52 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/plugin.cpp	2016-07-06 19:43:31 +0000
@@ -18,9 +18,11 @@
 #include <DBusGreeter.h>
 #include <DBusGreeterList.h>
 #include "MockGreeter.h"
+#include "MockSessionsModel.h"
 #include "MockUsersModel.h"
-#include <libusermetricsoutput/ColorTheme.h>
-#include <libusermetricsoutput/UserMetrics.h>
+#include <QLightDM/SessionsModel>
+#include "ColorTheme.h"
+#include "UserMetrics.h"
 #include <QLightDM/UsersModel>
 
 #include <QAbstractItemModel>
@@ -39,6 +41,13 @@
     return greeter;
 }
 
+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new MockSessionsModel;
+}
+
 static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -53,15 +62,17 @@
     return UserMetricsOutput::UserMetrics::getInstance();
 }
 
-void IntegratedLightDMPlugin::registerTypes(const char *uri)
+void LightDMPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<UserMetricsOutput::ColorTheme>();
 
-    Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
+    Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
     qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
     qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
     qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
+    qmlRegisterSingletonType<MockSessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
+    qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");
     qmlRegisterSingletonType<MockUsersModel>(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);

=== renamed file 'tests/mocks/IntegratedLightDM/plugin.h' => 'tests/mocks/LightDM/IntegratedLightDM/plugin.h'
--- tests/mocks/IntegratedLightDM/plugin.h	2015-05-22 17:29:52 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/plugin.h	2016-07-06 19:43:31 +0000
@@ -20,7 +20,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class IntegratedLightDMPlugin : public QQmlExtensionPlugin
+class LightDMPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

=== renamed file 'tests/mocks/IntegratedLightDM/qmldir' => 'tests/mocks/LightDM/IntegratedLightDM/qmldir'
--- tests/mocks/IntegratedLightDM/qmldir	2015-05-22 17:29:52 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/qmldir	2016-07-06 19:43:31 +0000
@@ -1,3 +1,2 @@
-module IntegratedLightDM
+module LightDM.IntegratedLightDM
 plugin MockLightDM-qml
-typeinfo IntegratedLightDM.qmltypes

=== removed symlink 'tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h'
=== target was u'../ColorTheme.h'
=== removed symlink 'tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h'
=== target was u'../UserMetrics.h'
=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2016-05-19 19:44:37 +0000
+++ tests/plugins/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -3,7 +3,7 @@
 add_subdirectory(Dash)
 add_subdirectory(GlobalShortcut)
 add_subdirectory(Greeter)
-add_subdirectory(IntegratedLightDM)
+add_subdirectory(LightDM)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)

=== renamed directory 'tests/plugins/IntegratedLightDM' => 'tests/plugins/LightDM'
=== added file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(IntegratedLightDM)

=== added directory 'tests/plugins/LightDM/IntegratedLightDM'
=== renamed file 'tests/plugins/IntegratedLightDM/CMakeLists.txt' => 'tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
--- tests/plugins/IntegratedLightDM/CMakeLists.txt	2016-04-19 20:36:29 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-07-06 19:43:31 +0000
@@ -8,19 +8,18 @@
 
 add_executable(GreeterDBusTestExec
     dbus.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     )
 # This add_dependencies is needed since we're linking with with -L and -l below
 # make seems to work but ninja breaks without it
 add_dependencies(GreeterDBusTestExec MockLightDM)
 qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
 target_link_libraries(GreeterDBusTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
-    -llightdm-qt5-2
+    MockLightDM
     )
 target_include_directories(GreeterDBusTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
-    ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
     )
 add_unity8_uitest(GreeterDBus dbus-test-runner
     ARG_PREFIX "--parameter"
@@ -32,20 +31,45 @@
 
 add_executable(GreeterPamTestExec
     pam.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
     )
 qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
 target_link_libraries(GreeterPamTestExec
     integratedLightDM
     )
+
 target_include_directories(GreeterPamTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm
     )
 add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
 
+# SessionsModelTest
+add_executable(GreeterSessionsModelTestExec
+    sessionsmodel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/SessionsModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
+    )
+add_dependencies(GreeterSessionsModelTestExec MockLightDM)
+qt5_use_modules(GreeterSessionsModelTestExec Core Test)
+target_link_libraries(GreeterSessionsModelTestExec
+    MockLightDM
+    )
+target_include_directories(GreeterSessionsModelTestExec PUBLIC
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
+    )
+add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
+    ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
+    DEPENDS MockLightDM
+    LIGHTDM
+    )
+
+# UsersModelTest
 add_executable(GreeterUsersModelTestExec
     usersmodel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
 # This add_dependencies is needed since we're linking with with -L and -l below
@@ -53,13 +77,12 @@
 add_dependencies(GreeterUsersModelTestExec MockLightDM)
 qt5_use_modules(GreeterUsersModelTestExec Core Test)
 target_link_libraries(GreeterUsersModelTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
-    -llightdm-qt5-2
+    MockLightDM
     )
 target_include_directories(GreeterUsersModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
     )
 add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
     ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
@@ -77,7 +100,7 @@
     )
 target_include_directories(GreeterIntegratedTestExec PUBLIC
     ${GLIB_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm
     )
 add_unity8_unittest(GreeterIntegrated dbus-test-runner
     ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/IntegratedLightDM/liblightdm/

=== renamed file 'tests/plugins/IntegratedLightDM/dbus.cpp' => 'tests/plugins/LightDM/IntegratedLightDM/dbus.cpp'
=== renamed file 'tests/plugins/IntegratedLightDM/greeter.qml' => 'tests/plugins/LightDM/IntegratedLightDM/greeter.qml'
--- tests/plugins/IntegratedLightDM/greeter.qml	2015-09-02 07:42:27 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/greeter.qml	2016-07-06 19:43:31 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 
 Item {
     property var greeter: LightDM.Greeter

=== renamed file 'tests/plugins/IntegratedLightDM/integrated.cpp' => 'tests/plugins/LightDM/IntegratedLightDM/integrated.cpp'
=== renamed file 'tests/plugins/IntegratedLightDM/pam.cpp' => 'tests/plugins/LightDM/IntegratedLightDM/pam.cpp'
=== added file 'tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp	2016-07-06 19:43:31 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2015 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 "SessionsModel.h"
+
+#include <QLightDM/SessionsModel>
+#include <QtCore/QModelIndex>
+#include <QtTest>
+#include <QString>
+
+class GreeterSessionsModelTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void init()
+    {
+        model = new SessionsModel();
+        QVERIFY(model);
+        sourceModel = new QLightDM::SessionsModel();
+        QVERIFY(sourceModel);
+    }
+
+    void cleanup()
+    {
+        delete model;
+        delete sourceModel;
+    }
+
+    static QModelIndex findByKey(QAbstractItemModel *model, const QString& key)
+    {
+        for (int i = 0; i < model->rowCount(QModelIndex()); i++) {
+            if (model->data(model->index(i, 0), QLightDM::SessionsModel::KeyRole).toString() == key)
+                return model->index(i, 0);
+        }
+
+        return QModelIndex();
+    }
+
+    void testIconDirectoriesAreValid()
+    {
+        Q_FOREACH(const QUrl& searchDirectory, model->iconSearchDirectories())
+        {
+            QVERIFY(searchDirectory.isValid());
+        }
+    }
+
+    void testMultipleSessionsCountIsCorrect()
+    {
+        sourceModel->setTestScenario("multipleSessions");
+        QVERIFY(sourceModel->rowCount(QModelIndex()) > 1);
+    }
+
+    void testNoSessionsCountIsCorrect()
+    {
+        sourceModel->setTestScenario("noSessions");
+        QVERIFY(sourceModel->rowCount(QModelIndex()) == 0);
+    }
+
+    void testSingleSessionCountIsCorrect()
+    {
+        sourceModel->setTestScenario("singleSession");
+        QVERIFY(sourceModel->rowCount(QModelIndex()) == 1);
+    }
+
+    void testSessionNameIsCorrect()
+    {
+        // This is testing the lookup, not the correctness of the strings,
+        // so one test should be sufficient
+        sourceModel->setTestScenario("multipleSessions");
+        QVERIFY(model->data(findByKey(sourceModel, "ubuntu"),
+                Qt::DisplayRole).toString() == "Ubuntu");
+    }
+
+private:
+    SessionsModel *model;
+    QLightDM::SessionsModel *sourceModel;
+};
+
+QTEST_MAIN(GreeterSessionsModelTest)
+
+#include "sessionsmodel.moc"

=== renamed file 'tests/plugins/IntegratedLightDM/usersmodel.cpp' => 'tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp'
=== modified file 'tests/qmltests/Greeter/TestView.qml'
--- tests/qmltests/Greeter/TestView.qml	2016-05-25 19:25:51 +0000
+++ tests/qmltests/Greeter/TestView.qml	2016-07-06 19:43:31 +0000
@@ -43,6 +43,7 @@
     signal responded(string response)
     signal tease()
     signal emergencyCall()
+    signal promptlessLogin()
 
     signal _showMessageCalled(string html)
     signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2016-06-20 17:37:25 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2016-07-06 19:43:31 +0000
@@ -22,7 +22,7 @@
 import AccountsService 0.1
 import Biometryd 0.0
 import GSettings 1.0
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1  as LightDM // This is the mock
 import Unity.Test 0.1 as UT
 
 Item {
@@ -146,7 +146,9 @@
 
         function init() {
             greeterSettings.lockedOutTime = 0;
-            resetLoader();
+            LightDM.Greeter.selectUser = "";
+            greeter.failedLoginsDelayAttempts = 7;
+            greeter.failedLoginsDelayMinutes = 5;
             teaseSpy.clear();
             sessionStartedSpy.clear();
             activeChangedSpy.clear();
@@ -162,11 +164,7 @@
             viewShowErrorMessageSpy.clear();
             viewResetSpy.clear();
             viewTryToUnlockSpy.clear();
-            tryCompare(greeter, "waiting", false);
-            view = findChild(greeter, "testView");
-            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
-            greeter.failedLoginsDelayAttempts = 7;
-            greeter.failedLoginsDelayMinutes = 5;
+            resetLoader();
         }
 
         function resetLoader() {
@@ -178,6 +176,8 @@
             loader.active = true;
             tryCompare(loader, "status", Loader.Ready);
             removeTimeConstraintsFromSwipeAreas(loader.item);
+            tryCompare(greeter, "waiting", false);
+            view = findChild(greeter, "testView");
         }
 
         function getIndexOf(name) {
@@ -202,6 +202,7 @@
             compare(view.currentIndex, i);
             compare(AccountsService.user, name);
             compare(LightDM.Greeter.authenticationUser, name);
+            return i;
         }
 
         function verifyLoggedIn() {
@@ -248,11 +249,9 @@
 
         function test_promptless() {
             selectUser("no-password");
-            tryCompare(viewAuthenticationSucceededSpy, "count", 1);
-            compare(sessionStartedSpy.count, 1);
+            tryCompare(view, "locked", false);
             compare(viewShowPromptSpy.count, 0);
             compare(viewHideSpy.count, 0);
-            compare(view.locked, false);
         }
 
         function test_twoFactorPass() {
@@ -573,6 +572,25 @@
             tryCompare(viewShowPromptSpy, "count", 1);
         }
 
+        function test_selectUserHint() {
+            LightDM.Greeter.selectUser = "info-prompt";
+            resetLoader();
+            var i = verifySelected("info-prompt");
+            verify(i != 0); // sanity-check that info-prompt isn't default 0 answer
+        }
+
+        function test_selectUserHintUnset() {
+            LightDM.Greeter.selectUser = "";
+            resetLoader();
+            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+        }
+
+        function test_selectUserHintInvalid() {
+            LightDM.Greeter.selectUser = "not-a-real-user";
+            resetLoader();
+            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+        }
+
         function test_fingerprintSuccess() {
             var index = selectUser("has-password");
             unlockAndShowGreeter(); // turn on lockscreen mode

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2015-09-29 12:28:10 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2016-07-06 19:43:31 +0000
@@ -20,7 +20,7 @@
 import "../../../qml/Greeter"
 import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 
 Item {
     Binding {

=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
--- tests/qmltests/Greeter/tst_NarrowView.qml	2016-06-18 22:37:48 +0000
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2016-07-06 19:43:31 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2016-06-18 22:37:48 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2016-07-06 19:43:31 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2016-06-10 14:36:50 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2016-07-06 19:43:31 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import AccountsService 0.1
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3
 import Ubuntu.Telephony 0.1 as Telephony

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2016-06-20 12:07:20 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2016-07-06 19:43:31 +0000
@@ -22,7 +22,7 @@
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Application 0.1
 import Unity.Test 0.1
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 import Powerd 0.1
 import Unity.InputInfo 0.1
 import Utils 0.1

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-06-18 22:37:48 +0000
+++ tests/qmltests/tst_Shell.qml	2016-07-06 19:43:31 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import AccountsService 0.1
 import GSettings 1.0
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Telephony 0.1 as Telephony
@@ -1161,6 +1161,17 @@
             tryCompare(indicators, "fullyClosed", true);
         }
 
+        function test_greeterShownAgainHidesIndicators() {
+            // Regression test for https://launchpad.net/bugs/1595569
+
+            loadShell("phone");
+            showIndicators();
+            showGreeter();
+
+            var indicators = findChild(shell, "indicators");
+            tryCompare(indicators, "fullyClosed", true);
+        }
+
         function test_showAndHideGreeterDBusCalls() {
             loadShell("phone");
             swipeAwayGreeter();
@@ -1176,16 +1187,13 @@
 
         function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
             loadShell("phone");
-            swipeAwayGreeter();
-
-            sessionSpy.clear();
-            verify(sessionSpy.valid);
-
-            showGreeter();
 
             var greeter = findChild(shell, "greeter");
             verify(!greeter.locked);
-            verify(sessionSpy.count > 0);
+            compare(sessionSpy.count, 0);
+
+            swipeAwayGreeter();
+            compare(sessionSpy.count, 1);
         }
 
         function test_fullscreen() {
@@ -2213,11 +2221,6 @@
             shell.usageScenario = "desktop";
             GSettingsController.setAutohideLauncher(!data.launcherLocked);
             waitForRendering(shell);
-            // Not sure why 2 but it's the number of times
-            // it triggers at this time and we need to wait
-            // for them otherwise a sessionStarted signal will
-            // hide the launcher and make the test fail
-            tryCompare(sessionSpy, "count", 2);
 
             var launcher = findChild(shell, "launcher");
             var launcherPanel = findChild(launcher, "launcherPanel");

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2016-05-02 07:57:07 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2016-07-06 19:43:31 +0000
@@ -19,7 +19,7 @@
 import QtTest 1.0
 import AccountsService 0.1
 import GSettings 1.0
-import IntegratedLightDM 0.1 as LightDM
+import LightDM.IntegratedLightDM 0.1 as LightDM
 import Ubuntu.SystemImage 0.1
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Application 0.1