Merge lp:~josharenson/unity8/slim_greeter_real_lightdm into lp:unity8

[Josh Arenson]

Enable unity8 greeter mode to use real liblightdm and act as a basic desktop greeter

* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes:
lp:~dandrader/unity8/fixOrientedShellTests
lp:~josharenson/unity8/integrated_lightdm_refactor

 * 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?
Yes

Added Build-Deps
liblightdm-gobject-1-dev
liblightdm-qt5-3-dev

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1824
http://jenkins.qa.ubuntu.com/job/unity8-ci/5902/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/220/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/182/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/220/console

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

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/slim_greeter_real_lightdm]

1825. By Josh Arenson <josh@blackbox> on 2015-06-30

Fix whitespace

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1825
http://jenkins.qa.ubuntu.com/job/unity8-ci/5903/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/222/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/222
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21577

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

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/slim_greeter_real_lightdm]

1826. By Josh Arenson <josh@blackbox> on 2015-07-01

Change greeter install directory

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1826
http://jenkins.qa.ubuntu.com/job/unity8-ci/5919/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/200
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/240
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21616

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

You have bad tags

[Mirco Müller (macslow)]

See inline comments.

review: Needs Fixing (code-review)

[Lukáš Tinkl (lukas-kde)]

See comments

review: Needs Fixing

[lp:~josharenson/unity8/slim_greeter_real_lightdm]

1827. By Josh Arenson <josh@blackbox> on 2015-07-07

[ Albert Astals Cid ]
* Save screenshots of suspended apps to disk
* Set width of title label when inside the title row (LP: #1461979)
* qmluitests was renamed to uitests
[ CI Train Bot ]
* Resync trunk.
[ Daniel d'Andrada ]
* Fix tst_OrientedShell and tst_Tutorial (LP: #1469761, #1466947)
[ Leo Arias ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
[ Leonardo Arias Fonseca ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
[ Lukáš Tinkl ]
* fix PO files extraction
[ Michael Zanetti ]
* Make use of QInputDeviceInfo in order to automatically switch
  between usage modes and hide the OSK.
[ Nick Dedekind ]
* Fixed qtmultimedia mock which was generating errors in tests
[ Richard Huddie ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
* Implement full-shell rotation (LP: #1210199)

1828. By Josh Arenson <josh@blackbox> on 2015-07-07

Remove return statements from void functions

1829. By Josh Arenson <josh@blackbox> on 2015-07-07

Remove commented-out #include

1830. By Josh Arenson <josh@blackbox> on 2015-07-08

Update connect statements to Qt5 syntax

[Josh Arenson (josharenson)]

I haven't updated GreeterPrivate to Qt5 syntax yet because its not listed in CMakeLists.txt (it isn't in trunk either) and it doesn't seem to be getting compiled. I want to investigate this before I change anything else.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1830
http://jenkins.qa.ubuntu.com/job/unity8-ci/5994/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/282/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/233
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/194/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21710

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

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/slim_greeter_real_lightdm]

1831. By Josh Arenson on 2015-07-08

Remove GreeterPrivate.cpp as it isn't needed for this impl

1832. By Josh Arenson on 2015-07-14

[ Albert Astals Cid ]
* Revert Session Screenshotter (LP: #1473476)
[ Daniel d'Andrada ]
* Dismiss the apps spread if greeter gets shown (LP: #1471609)
[ Albert Astals Cid ]
* Make the card sizes a bit dependant on the total of gu of the dash

1833. By Josh Arenson on 2015-07-15

Fix deps

1834. By Josh Arenson on 2015-07-16

Fix invalid property in Wizard.qml

1835. By Josh Arenson on 2015-07-16

* Bump library version
* Rename LightDM to correct name

1836. By Josh Arenson on 2015-07-16

Merge integrated_lightdm_refactor

1837. By Josh Arenson on 2015-07-16

Merge trunk

1838. By Josh Arenson on 2015-07-17

Fix external property issues

1839. By Josh Arenson on 2015-07-17

Add fake shell.mode property to tests

1840. By Josh Arenson on 2015-07-20

Remove shell.mode from Wizard

1841. By Josh Arenson on 2015-07-21

[ Albert Astals ]
* Ensure tutorial doesn't let user drag the launcher past screen edge.
  (LP: #1454882)
[ Albert Astals Cid ]
* Fix build with ninja
[ Andrea Cimitan ]
* Add PreviewSocialComment
[ Daniel d'Andrada ]
* Ensure tutorial doesn't let user drag the launcher past screen edge.
  (LP: #1454882)
* Update tst_ShellWithPin
[ Josh Arenson ]
* Add a basic autopilot test for the SettingsWizard
[ Lukáš Tinkl ]
* Avoid sync DBUS calls
[ Marcus Tomlinson ]
* Handle TERM, HUP, and INT signals in unity-scope-tool (LP: #1470464)
[ Michael Zanetti ]
* Add PreviewSocialComment
[ Nick Dedekind ]
* Fixed qml warnings in 'make tryShell'

1842. By Josh Arenson on 2015-07-21

Remove shell.mode dependency from LightDM.qml

1843. By Josh Arenson on 2015-07-21

Remove shellMode dependency from Wizard.qml in a more clear way

1844. By Josh Arenson on 2015-07-21

Revert to the old tightly-coupled way of determining which lightdm to load

1845. By Josh Arenson on 2015-07-22

Fully abstract Greeter/LightDM from shell.mode

1846. By Josh Arenson on 2015-08-06

[ CI Train Bot ]
* Resync trunk.
* allow opening the manage dash area by clicking with a mouse on the
  arrow label (LP: #1431564)
* TouchRegistry: remove null candidates from list of candidates (LP:
  #1473492)
* Fix power dialogs on desktop
* Provide DBUS compatibility with various session services
  (suspend/hibernate, lock/unlock, screensaver, etc)
* React on PrtScr keyboard shortcut for taking screenshots on desktop
  (LP: #1474149)
* launcher parity: close apps from quicklist (LP: #1457201)
[ Michael Zanetti ]
* Implement first edition for a desktop Alt+Tab spread
* drop the gcc-4.9 dependency (LP: #1452348)
[ Mirco Müller ]
* Added corresponding tests and visual tweaks to a launcher-item's
  progress-overlay.
* Added corresponding tests and visual tweaks to a launcher-item's
  progress-overlay.
* Implemented alert/wiggle feature for launcher-icons.
* Implemented alert/wiggle feature for launcher-icons.
[ handsome_feng ]
* makes left swip reset the search string. (LP: #1413791)
[ handsome_feng<email address hidden> ]
* Don't expand indicators when tap to return to call. (LP: #1453217)
* makes left swip reset the search string. (LP: #1413791)

1847. By Josh Arenson on 2015-08-21

[ Albert Astals Cid ]
* Drop gcc 4.9 requirement in debian/rules
* Make the test more stable
* Optimize scope.preview() calls (LP: #1478022)
[ Alberto Mardegan ]
* Set currentIndex after the model change is completed (LP: #1433442)
[ Albert Astals Cid ]
* Make the test pass again after rework of appmanager
* fix testPhoneStage
[ CI Train Bot ]
* New rebuild forced.
[ Daniel d'Andrada ]
* Fix and clean up InputInfo plugin
[ Rodney Dawes ]
* Do not call verify in the payments button code. (LP: #1468038)
[ Albert Astals Cid ]
* Add a test that checks that items in an expandable are the correct
  size after expanding the expandable
* Fix the expandable test
* Replace some waitForRendering with wait(0)
* Workaround for bug 1473471 (LP: #1473471)
[ Gary.Wzl ]
* Fix layout issue when adding audio track widget in expandable widget
[ handsome_feng ]
* Added indication for running apps. (LP: #1471577)
* Adjust the color to highlighting indicator. (LP: #1457098)
* Convert the MouseArea to MultiPointTouchArea to track multiple touch
  points. (LP: #1445472)
[ handsome_feng<email address hidden> ]
* Convert the MouseArea to MultiPointTouchArea to track multiple touch
  points. (LP: #1445472)
[ Kevin Gunn ]
* No change, rebuild for gcc5
[ CI Train Bot ]
* Resync trunk. added: po/cy.po
* Resync trunk. added: po/cy.po
[ Daniel d'Andrada ]
* Stages now control the "requestedState" property of applications
* Stages now control the "requestedState" property of applications

1848. By Josh Arenson on 2015-08-25

[ Michael Terry ]
* Skip the tutorial entirely when in desktop mode. This fixes the
  emulator not being able to pass the tutorial.
* Skip the tutorial entirely when in desktop mode. This fixes the
  emulator not being able to pass the tutorial.

1849. By Josh Arenson on 2015-08-25

Refactor to remove redundant lightdm naming

1850. By Josh Arenson on 2015-08-25

Don't provide Dialogs with a copy of lightDM, just refer to a shared copy.

1851. By Josh Arenson on 2015-08-25

Remove unecessary ./ from file path

1852. By Josh Arenson on 2015-08-25

Remove unused property from qmltest

1853. By Josh Arenson on 2015-08-25

Remove unused package dependency

1854. By Josh Arenson on 2015-08-25

Remove pkg_check from previously removed dependency

1855. By Josh Arenson on 2015-08-25

Fix .install file

1856. By Josh Arenson on 2015-08-25

Re-enable tests

1857. By Josh Arenson on 2015-08-27

Create new plugin directory structure

1858. By Josh Arenson on 2015-08-27

Copy original lightdm files

1859. By Josh Arenson on 2015-08-27

Format qmldir input file

1860. By Josh Arenson on 2015-08-27

Refactor FullLightDM

1861. By Josh Arenson on 2015-08-27

Refactor IntegratedLightDM

1862. By Josh Arenson on 2015-08-27

[CHECKPOINT COMMIT] - Broken

Update tests to reflect lightdm refactor. This does not build yet.

1863. By Josh Arenson on 2015-08-31

Finish LightDM plugin refactor (backend)

1864. By Josh Arenson on 2015-08-31

Re-enable lightdm plugin tests

1865. By Josh Arenson on 2015-09-01

Update includes and debian install files

1866. By Josh Arenson on 2015-09-01

Add types file / fix small bugs

1867. By Josh Arenson on 2015-09-01

Fix qmldir issue

1868. By Josh Arenson on 2015-09-01

Add all the files that were accidently unversioned

1869. By Josh Arenson on 2015-09-01

Re-enable tests

1870. By Josh Arenson on 2015-09-01

[ Albert Astals Cid ]
* Accept auto repeats for the power down button if timer is not yet
  running (LP: #1486953, #1488927)
* Add tests for Shell+Dash interaction
* Make clicking on launcher buttons have haptic feedback
* Make test_greeter_hides_on_app_open more stable
* Move connect() to new syntax
* make pot_file (LP: #1488484)
[ Gerry Boland ]
* [spread] avoid changing sourceSize of snapshotted apps, it causes
  ghost apps in the spread (LP: #1474319)
[ Josh Arenson ]
* Refactor the greeter to enable dynamic loading of backend plugins.
* Refactor the greeter to enable dynamic loading of backend plugins.
[ Lukáš Tinkl ]
* Don't show the volume notification when the sound indicator is shown
  (LP: #1484126)
[ Michael Terry ]
* Unify turn-on-screen-upon-notification logic from various daemons
  into unity8. (LP: #1426115, #1482317)
[ Daniel d'Andrada ]
* MirSurfaceItem is now a view+controller instantiated from QML (LP:
  #1483752)

1871. By Josh Arenson on 2015-09-01

Remove stray files

1872. By Josh Arenson on 2015-09-01

Add package to debian/control

1873. By Josh Arenson on 2015-09-01

Add unity8-greeter configuration file

1874. By Josh Arenson on 2015-09-02

Fix typo

1875. By Josh Arenson on 2015-09-02

Merge integrated_lightdm

1876. By Josh Arenson on 2015-09-02

Update greeter name in config file

1877. By Josh Arenson on 2015-09-02

Update path in plugins test

1878. By Josh Arenson on 2015-09-03

Install 51-unity-greeter.conf

1879. By Josh Arenson on 2015-09-03

Remove duplicate install

1880. By Josh Arenson on 2015-09-03

Convert signal connection to new style

1881. By Josh Arenson on 2015-09-03

Convert signal connection to new style

1882. By Josh Arenson on 2015-09-03

Return correct type

1883. By Josh Arenson on 2015-09-03

Return correct types

1884. By Josh Arenson on 2015-09-03

Add address-of opperator to string argument

1885. By Josh Arenson on 2015-09-04

Revert some small changes

1886. By Josh Arenson on 2015-09-04

More review changes (mostly to types)

1887. By Josh Arenson on 2015-09-04

License updates

1888. By Josh Arenson on 2015-09-04

Bump licenses

1889. By Josh Arenson on 2015-09-10

Playing bzr games

Re-add IntegratedLightDM (soon to be clobered)

1890. By Josh Arenson on 2015-09-10

Revert last commit

1891. By Josh Arenson on 2015-09-10

remove integrated lightdm

1892. By Josh Arenson on 2015-09-11

Re-add original LightDM

1893. By Josh Arenson on 2015-09-11

Revert to original LightDM directory revision

1894. By Josh Arenson on 2015-09-11

Change directory name to LightDM

1895. By Josh Arenson on 2015-09-11

Update top level plugin files

1896. By Josh Arenson on 2015-09-11

Add IntegratedLightDM Files

1897. By Josh Arenson on 2015-09-11

Add FullLightDM

1898. By Josh Arenson on 2015-09-11

Remove debug include

1899. By Josh Arenson on 2015-09-11

[ Michal Sawicz ]
* Resync wily with vivid
[ Albert Astals Cid ]
* Accomodate header height when using a card carousel with non
  overlayed header (LP: #1489309)
* Fix restart unity8 from inside the phone more than two times (LP:
  #1487946)
[ Gary.Wzl ]
* Move textarea up automatically when inputmethod popup. (LP:
  #1485947)
[ Lukáš Tinkl ]
* Introduce a GlobalShortcut QML component for handling global
  keyboard shortcuts
[ Michael Terry ]
* Fix the fact that a user that is locked out from their account for
  five minutes after entering too many wrong passwords can simply
  reboot to try again. (LP: #1383086)
* Fix the fact that a user that is locked out from their account for
  five minutes after entering too many wrong passwords can simply
  reboot to try again. (LP: #1383086)
[ Michael Zanetti ]
* Implement progressive autoscrolling in desktop spread
* add an animation transition when invoking the spread by hitting the
  right edge
[ Michael Zanetti ]
* release for wily
[ CI Train Bot ]
* New rebuild forced.

1900. By Josh Arenson on 2015-09-11

Update LightDM import strings in tests

1901. By Josh Arenson on 2015-09-16

Refactor config filename

1902. By Josh Arenson on 2015-09-16

Remove redundant linker option

1903. By Josh Arenson on 2015-09-16

Update to new connect syntax

1904. By Josh Arenson on 2015-09-16

Remove unused property

1905. By Josh Arenson on 2015-09-16

Remove duplicate objects and clean syntax

1906. By Josh Arenson on 2015-09-16

Revert

1907. By Josh Arenson on 2015-09-16

remove unused prop

1908. By Josh Arenson on 2015-09-16

Backout some changes

1909. By Josh Arenson on 2015-09-16

Remove redundant fullightDM property

1910. By Josh Arenson on 2015-09-16

Remove redundant property yet again

1911. By Josh Arenson on 2015-09-17

[NOT WORKING] Singleton is working, but this is an overall bad state

1912. By Josh Arenson on 2015-09-17

Refactor TheLightDM back to LightDM

1913. By Josh Arenson on 2015-09-17

Add logic to determine which LightDM to load

1914. By Josh Arenson on 2015-09-18

[NOT WORKING] Refactor LightDM's to help pass tests

1915. By Josh Arenson on 2015-09-18

Fix lightdm path

1916. By Josh Arenson on 2015-09-18

Hack a solution to the Q_ASSERT

1917. By Josh Arenson on 2015-09-21

Remove unecessary alias

1918. By Josh Arenson on 2015-09-21

[ Albert Astals Cid ]
* Fix testNotifications
* Make the wait longer to make tests pass in CI
* New simplified CroppedImageMinimumSourceSize (LP: #1467740)
* Stop animateTimer when starting the fadeOutAnimation
* Use AlreadyLaunchedUpstart so that tests passes
* Workaround keyboard issues and make test pass again
[ Daniel d'Andrada ]
* DesktopStage: Refactor focus handling
* Stabilize tstShell.test_launchedAppHasActiveFocus
[ Gary.Wzl ]
* Add widgetData["expanded"] property for expandable widget.
[ Michael Terry ]
* Fix typo that caused the tutorial to tease the launcher on top of
  the greeter.
* Fix typo that caused the tutorial to tease the launcher on top of
  the greeter.

1919. By Josh Arenson on 2015-09-24

merge overlay

1920. By Josh Arenson on 2015-09-24

Some small changes that don't fix testing still

1921. By Josh Arenson on 2015-09-24

[ Albert Astals Cid ]
* Adapt test to code changes
* Add DEP-8 test for all our UI and unit tests
* Keep the PreviewStack around to avoid mem leaks (LP: #1495467)
[ CI Train Bot ]
* Resync trunk.
[ Michael Terry ]
* When libusermetrics gives us an empty string, still show the
  infographic circle rather than hiding it. This is a follow-on to a
  branch [1] that changes the "no data available" label to the empty
  string.
[ Michał Sawicz ]
* Add DEP-8 test for all our UI and unit tests
* Fix integrated LightDM path
* Resync trunk

1922. By Josh Arenson on 2015-09-25

remove redundant dep from debian/control

1923. By Josh Arenson on 2015-09-25

Fix greeter tests

1924. By Josh Arenson on 2015-09-25

Fix include paths in plugins/LightDM

1925. By Josh Arenson on 2015-09-28

Fix plugin test import path

1926. By Josh Arenson on 2015-09-28

Move things around

1927. By Josh Arenson on 2015-09-28

Use magic to link to mock LightDM by target name

1928. By Josh Arenson on 2015-09-29

Resync trunk

1929. By Josh Arenson on 2015-10-01

Fix testing mock path

1930. By Josh Arenson on 2015-10-01

[ Albert Astals Cid ]
* Make Launcher::test_quickListMenuOnRMB stable (LP: #1500359)
[ CI Train Bot ]
* New rebuild forced.
[ Michael Zanetti ]
* Stabilize Launcher DND test
[ Albert Astals Cid ]
* Improvements from running clazy over the code
[ Daniel d'Andrada ]
* PhoneStage: ensure you're left in a consistent state after being
  reset (LP: #1476757)
[ Lukáš Tinkl ]
* Improve the appearance and functionality of datetime and session
  indicators in Unity8 desktop.
* Using InputInfo, determine if we need swipe or click to dismiss the
  notifications (e.g. incoming phone call)
[ Michael Zanetti ]
* further development on the Desktop Spread (LP: #1488147)
[ Michał Sawicz ]
* Bump application API version
* Skip bluetooth check under wily, use expectFailure to notice when
  it's back
[ Richard Somlói ]
* Fix translator comments in time formatter

1931. By Josh Arenson on 2015-10-02

Fix mock paths

This still doesn't fix tests and I'm not sure why

1932. By Josh Arenson on 2015-10-02

Fix lightdm qt version paths

1933. By Josh Arenson on 2015-10-02

AP Tests finally pass!

1934. By Josh Arenson on 2015-10-03

[ CI Train Bot ]
* Resync trunk.
[ Lukáš Tinkl ]
* Wizard: skip the reporting page if the system is configured not to
  report crashes (LP: #1494442)
[ Alexandros Frantzis ]
* Use power state change reason SnapDecision to turn screen on when a
  SnapDecision arrives (LP: #1291455)
[ CI Train Bot ]
* New rebuild forced.

1935. By Josh Arenson on 2015-10-05

Remove AP test for greeter mode as the real lightdm can't be run inside a user session

1936. By Josh Arenson on 2015-10-20

Refactor TheLightDM to LightDMService

1937. By Josh Arenson on 2015-10-20

Remove unused code

1938. By Josh Arenson on 2015-10-20

[ CI Train Bot ]
* New rebuild forced.
[ Pawel Stolowski ]
* Store unity8 package version in /var/lib/.../version file for fast
  retrieval from the shell plugin.
[ Lukáš Tinkl ]
* Revert to using plaintext instead of HTML-like markup for the
  notifications (LP: #1504256)

1939. By Josh Arenson on 2015-10-26

[ Albert Astals Cid ]
* Clazy fixes
* Enable Efficient String Construction by default
[ CI Train Bot ]
* New rebuild forced.
[ Daniel d'Andrada ]
* Have unity8 drawing its own cursor (LP: #1488417)
* Initial multi-monitor support
[ Daniel van Vugt ]
* Disable Qt's stuttering 'touch compression' to fix scrolling
  smoothness (LP: #1486341, #1488327)
[ Lukáš Tinkl ]
* Fix autopilot wizard test skipping the reporting page
* Implement Unity.Platform plugin wrapping org.freedesktop.hostname1
  (LP: #1504318)
* React to window title (aka surface name) changes (LP: #1497092)
* Rotate the screenshots according to the actual orientation
[ Michał Sawicz ]
* Fix application API dependency
* Have unity8 drawing its own cursor (LP: #1488417)
* Initial multi-monitor support
* Rotate the screenshots according to the actual orientation
[ Nick Dedekind ]
* Fixed leak in UnityMenuModelStackTest
* Moved time translation to SDK (LP: #1372061)

1940. By Josh Arenson <josh@blackbox> on 2015-10-27

Update new ShellApplication class to handle greeter mode

1941. By Josh Arenson <josh@blackbox> on 2015-10-27

Change include paths

1942. By Josh Arenson on 2015-10-27

Restore control

1943. By Josh Arenson on 2015-11-02

Re-enable whitespace test

1944. By Josh Arenson on 2015-11-02

Merge trunk

1945. By Josh Arenson on 2015-11-02

Fix whitespace

1946. By Josh Arenson on 2015-11-02

Remove useless preprocessor code

1947. By Josh Arenson on 2015-11-02

Fix translations

1948. By Josh Arenson on 2015-11-04

Fix permissions

1949. By Josh Arenson on 2015-11-04

Remove unused fields from the .desktop file

1950. By Josh Arenson on 2015-11-04

Update unity8-greeter package description

1951. By Josh Arenson on 2015-11-04

Fix qmltypes

1952. By Josh Arenson on 2015-11-06

Fix permissions?

1953. By Josh Arenson on 2015-11-06

Fix permissions.

1954. By Josh Arenson on 2015-11-06

[ Albert Astals Cid ]
* Add an Item that proxies for old and new audio roles (LP: #1493851)
* CroppedImageMinimumSourceSize: Fix 'Binding loop detected for
  property "imageAspectRatio"'
* Make the scope settings list scroll to text visible area (LP:
  #1499084)
* Move to importing QtQuick 2.4 & friends
* Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)
[ Andrea Cimitan ]
* Add sharing widget to zoomable image and video playback
* Make zoomable and video playback widgets edge to edge
* Updated all 1.3 UbuntuShape to use new APIs where possible
* Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)
[ CI Train Bot ]
* Resync trunk.
[ Christopher Lee ]
* Quick spelling fix in process control output.
[ Daniel d'Andrada ]
* Enable support for overriding application orientations based on
  device type (LP: #1478637)
* Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)
* Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)
[ Josh Arenson ]
* Enable support for overriding application orientations based on
  device type (LP: #1478637)
[ Michael Terry ]
* Avoid showing the shutdown dialog when turning on the screen if your
  device is under heavy load. (LP: #1508563)
* Handle lifecycle policy exceptions ourselves, instead of letting
  qtmir do it for us and allow non-Touch apps to opt-out of the Touch
  lifecycle.
[ Michael Zanetti ]
* Fixes for the panel buttons (LP: #1510360, #1504269, #1431566,
  #1443319)
* Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)
[ Michał Sawicz ]
* Add missing copyright to Cursor.qml
* Enable support for overriding application orientations based on
  device type (LP: #1478637)
* Support server->client visibility change to stop rendering
  (lp:#1475678) (LP: #1475678)
[ Nick Dedekind ]
* Support server->client visibility change to stop rendering
  (lp:#1475678) (LP: #1475678)

1955. By Josh Arenson on 2015-11-07

Fix mistakes from previous merge

1956. By Josh Arenson on 2015-11-09

Merge trunk

1957. By Josh Arenson on 2015-11-09

Bump qml version

1958. By Josh Arenson on 2015-11-09

Chmod more messed up files

1959. By Josh Arenson on 2015-11-09

Fix more permissions

1960. By Josh Arenson on 2015-11-20

Merge

1961. By Josh Arenson on 2015-11-20

[ Albert Astals Cid ]
* Make cardWidth and cardHeight real
* Reset instead of qFatal when removing things from the middle (LP:
  #1238979)
* Warn we're using only the cache when not connected to the interwebs
[ Andrea Cimitan ]
* Add sharing widget to zoomable image and video playback
[ Daniel d'Andrada ]
* Cursor: properly initialize hotspot position (LP: #1510407)
* Update GSettings mock in tst_OrientedShell
[ Lukáš Tinkl ]
* Restore windows when activating from the spread, maintain a focus
  stack
[ Michael Terry ]
* Make a few DBus calls asynchronous, for a smoother UX.
[ Michael Zanetti ]
* Add a warning dialog when disconnecting the external monitor.
* added icon for the dash (LP: #1488146)
* prevent windows to be moved under the panel (LP: #1438465)
* update inputinfo api to the latest upstream snapshot
* use UbuntuNumberAnimations instead of linear ones for window state
  transitions (LP: #1497097)

1962. By Josh Arenson on 2015-11-24

Merge trunk

1963. By Josh Arenson on 2015-12-13

[ Albert Astals Cid ]
* Allow dragging launcher items with the quicklist open (LP: #1250861)
* Create ratings on demand instead of all at the same time (LP:
  #1519898, #1492214)
* LVWPH: Process correctly section changes (LP: #1519893)
* Make sure that unfavoriting a scope gives us the next one
* Move images only used in tests to tests folder
[ Andrea Cimitan ]
* Add shadows to ubuntu store icon
[ Daniel d'Andrada ]
* MirSurfaceItem got a new property: fillMode (LP: #1497083)
* Session can have multiple surfaces now
* plugins/Cursor: Do not force loading a specific cursor size (LP:
  #1517878)
[ Lukáš Tinkl ]
* Indicators convergence: use the "phone" profile everywhere (LP:
  #1520492)
[ Michael Terry ]
* Let qtmir know which apps are exempt from the lifecycle management.
  This way, it can manage its own wakelocks better (and stop
  preventing the system from deep sleeping).
[ Michael Zanetti ]
* Use proper z ordering instead of app index for occlusion detection
* add some debug prints to the uinput backend
* drop the ignoredMice hack again (LP: #1521580)
[ Michał Sawicz ]
* Let qtmir know which apps are exempt from the lifecycle management.
  This way, it can manage its own wakelocks better (and stop
  preventing the system from deep sleeping).
* Update .pot file in debian/clean when in train
* Rebuild against Qt 5.5.1.
[ Albert Astals Cid ]
* Initialize the image to be transparent (LP: #1517128)
* Update pot file
* clazy improvements
[ Andrea Cimitan ]
* Shadows in launcher and dash using UbuntuShapeIcon
[ CI Train Bot ]
* Resync trunk.
[ Daniel d'Andrada ]
* Cursor plugin: add scroll wheel handling (LP: #1497091)
* Cursor: Add more fallback names, a blank and custom cursor support
* DesktopStage: swiping from right edge shows window spread
* Don't stretch application surfaces when resizing (LP: #1497083)
* Mouse has to push against edges to show launcher or apps spread (LP:
  #1510969)
[ Josh Arenson ]
* Don't let IntegratedLightDM muck with the username (LP: #1497081)
[ Lukáš Tinkl ]
* Implement new visuals for panel and window decorations (LP:
  #1493066, #1511020, #1497095)
* Let systemd/logind handle the lid-close action
* Make saving screenshots really async
[ Michael Zanetti ]
* detect touchpads too, not only mice (LP: #1518395)
* move screenshots out of the Dash dir

1964. By Josh Arenson on 2015-12-30

Merge trunk

1965. By Josh Arenson on 2016-01-19

[ Albert Astals Cid ]
* Clear fake item icon name as soon as it goes invisible (LP:
  #1531172)
* Fix LVWPH test failing on Xenial (Qt 5.5)
* Fix dragging so that test passes on Xenial
* Fix focus on the dash page header text field with new SDK (LP:
  #1528178)
* Make the card creator test pass again
* Quit the dash communicator thread before destroying it (LP:
  #1508485)
* Remove duplicated override_dh_auto_clean
* SDK changed the name they give to the buttons, follow
[ Andrea Cimitan ]
* Fix a broken binding
[ CI Train Bot ]
* Resync trunk.
* Update translation template
[ Daniel d'Andrada ]
* Have "make tryFoo" work with Qt 5.5
* Make DragHandle tests run again.
[ Lukáš Tinkl ]
* Fix dismissing the launcher when clicking/tapping outside (LP:
  #1531339, #1530940)
* Fix panel drop shadow and click-to-focus of maximized apps (LP:
  #1531854)
* Fix wifi access point indicator items signal strength icon on
  desktop
[ Michael Terry ]
* Guard against a couple odd timing scenarios for the too-many-failed-
  login-attempts lockout screen.
* Skip the wizard's password screens if there is already a password
  set by other means. (LP: #1531268)
* Stop the emergency dialer from accidentally exposing the mtp
  service. (LP: #1525981)
[ Michael Zanetti ]
* Make sure the triangle of the quicklist is in bounds (LP: #1531340)
[ Pawel Stolowski ]
* Changes 'shareData' and 'contentType' attributes to 'share-data' and
  'content-type', to match existing naming schema.
[ Albert Astals Cid ]
* Introduce audio cards
[ CI Train Bot ]
* Update translation template
[ Michael Zanetti ]
* Introduce audio cards
[ CI Train Bot ]
* Resync trunk.
* Update translation template
[ Nick Dedekind ]
* Use volume-sync action to resync the volume control. (LP: #1520548)

1966. By Josh Arenson on 2016-01-22

Enable running the greeter as a Mir server.

1967. By Josh Arenson on 2016-01-22

Fix whitespace, remove some hacks

1968. By Josh Arenson on 2016-01-22

Fix translations

1969. By Josh Arenson on 2016-01-26

[ Albert Astals Cid ]
* Fix bug #1536296 added: tests/plugins/Dash/cardcreator/10.tst (LP:
  #1536296)
* Fix card tests on the phone
[ CI Train Bot ]
* Update translation template

1970. By Josh Arenson on 2016-02-03

[ Albert Astals Cid ]
* Audio Preview Button: Don't gain focus on press (LP: #1517830)
* Better attempt at sanitization
* Better looking application scopes for wide screens
* Call printSettings correctly
* Card test: Limit the precision we ask for doubles to be equal
* Convert while into tryCompareFunction
* Do not use the same filepath parameter for all the card creator
  createQmlObject calls (LP: #1536379)
* Fix some test shells being unstable in the armhf builders
* Make revealByEdgePush more stable
* More reliable compares
* Move the mouse over the bfb before waiting for rendering
* Remove the DDAs constrains for every test
* Set the background source size to the max we'll need + new
  background (LP: #1539011)
[ Andrea Cimitan ]
* Dynamically change click scope card size according to size (LP:
  #1536745)
* Should fix lazyimage test failures on fast machines
[ CI Train Bot ]
* Fix card tests on the phone
* Update translation template
[ Daniel d'Andrada ]
* Desktop stage rotates only to follow screen orientation (LP:
  #1515977)
[ Lukáš Tinkl ]
* Hide/reveal the mouse pointer on touch/mouse events renamed:
  plugins/Utils/HomeKeyWatcher.cpp =>
  plugins/Utils/WindowInputMonitor.cpp plugins/Utils/HomeKeyWatcher.h
  => plugins/Utils/WindowInputMonitor.h
  tests/mocks/Utils/HomeKeyWatcher.qml =>
  tests/mocks/Utils/WindowInputMonitor.qml
  tests/plugins/Utils/HomeKeyWatcherTest.cpp =>
  tests/plugins/Utils/WindowInputMonitorTest.cpp
[ Michael Terry ]
* Synchronize the mouse-cursor-speed and touchpad-cursor-speed
  properties with USC. (LP: #1536383)
[ Michael Zanetti ]
* Add InputMethod to secondary screen
* Add a virtual Touchpad while external screen is connected
* Make big tablets switch to windowed mode by plugging a kbd only (LP:
  #1535399)
* Prevent alt key presses from being dispatched to the app on alt+tab
  (LP: #1532862)
[ Michał Sawicz ]
* Make qmluitests.sh more robust and allow parallel test execution
* Skip SessionBackendTest::testLogin1Capabilities until we talk to a
  mock instead (LP: #1532112, #1532113)

1971. By Josh Arenson on 2016-02-03

Fix ninja complaining about qmldir files

1972. By Josh Arenson on 2016-02-09

Re-enable tests.

1973. By Josh Arenson on 2016-02-16

[ Albert Astals Cid ]
* Do not use components in card creator generated code
* Forward the makesurevisible signal from the inner preview widget
* Make fallback also be fallback when the image is empty and not only
  on error (LP: #1531913)
* Make the artShapeSize assignment be updated when using dynamic grid
  units
* Visual improvements to the dash audio play cards
* We don't use the unity-scope-scopes anymore (LP: #1439172)
[ Andrea Cimitan ]
* only request a bigger image if zoomable widget data property is
  true, otherwise just leave the screen size (LP: #1536814)
[ CI Train Bot ]
* Update translation template
[ Daniel d'Andrada ]
* Set initial surface size (LP: #1532974)
[ Daniel d'Andrada, Michał Sawicz ]
* Window Size Hints
[ Florian Boucault ]
* Splash screen: delay showing the ActivityIndicator by 2 seconds.
[ Lukáš Tinkl ]
* Replace the word "phone" with a more generic term "device" in the
  welcome wizard (LP: #1294732, #1543527)
[ Michael Terry ]
* Have the tablet greeter set appropriate OSK hints if the user has a
  passcode instead of a passphrase. (LP: #1544173)
[ Michael Zanetti ]
* Don't eat mouse events in the edgebarrer
[ Michał Sawicz ]
* Bump unity-api dependencies
[ Nick Dedekind ]
* Added support for secondary indicator actions (LP: #1398888)
* Remove zombie if they're not animated. (LP: #1534541)
* Removed unused panel resources
[ Ted Gould ]
* Start the indicators after Unity8 starts instead of before
[ Albert Astals Cid ]
* LVWPH: Reset to initial values when list is empty (LP: #1540490)
* Make LazyImage qmltest less flaky on CI
[ Andrea Cimitan ]
* Make LazyImage qmltest less flaky on CI
[ CI Train Bot ]
* Resync trunk.
* Update translation template
[ Michael Terry ]
* Display the current user's real name on the tablet lockscreen. (LP:
  #1536714)

1974. By Josh Arenson on 2016-02-22

[ Albert Astals Cid ]
* Make the audio previews create a playlist (LP: #1540477)
[ CI Train Bot ]
* Resync trunk. added: po/aa.po
* Update translation template

1975. By Josh Arenson on 2016-02-24

Fix issue where a passwordless user was logged in automatically.

1976. By Josh Arenson on 2016-02-29

Merge trunk.

1977. By Josh Arenson on 2016-03-02

Merge trunk

1978. By Josh Arenson on 2016-03-17

Merge trunk

1979. By Josh Arenson on 2016-03-21

merge trunk

1980. By Josh Arenson on 2016-03-21

Move a lost file

1981. By Josh Arenson on 2016-03-21

Fix test

1982. By Josh Arenson on 2016-03-25

merge trunk

1983. By Josh Arenson on 2016-04-01

Fix some bad merge changes.

1984. By Josh Arenson on 2016-04-29

merge trunk

1985. By Josh Arenson on 2016-05-02

merge trunk

1986. By Josh Arenson on 2016-05-25

merge trunk

1987. By Josh Arenson on 2016-06-07

Merge trunk

1988. By Josh Arenson on 2016-06-07

Fix seat type

1989. By Josh Arenson on 2016-06-13

Merge lp:~mterry/unity8/slim_greeter_select_user

1990. By Josh Arenson on 2016-06-13

Remove qmltype files

1991. By Josh Arenson on 2016-06-14

Patch tests so that they pass. Thanks to mterry for this patch.

1992. By Josh Arenson on 2016-06-14

Remove unused env variable in wrapper

1993. By Josh Arenson on 2016-06-20

Merge trunk

1994. By Josh Arenson on 2016-06-27

Merge trunk

1995. By Josh Arenson on 2016-06-27

Fix merge

1996. By Josh Arenson on 2016-06-29

Merge trunk

1997. By Josh Arenson on 2016-07-05

merge trunk

1998. By Josh Arenson on 2016-07-08

Merge lp:~mterry/unity8/slim_greeter_real_lightdm

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-17 12:14:27 +0000
+++ CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -108,6 +108,7 @@
 set(DASH_APP unity8-dash)
 set(SCOPE_TOOL unity-scope-tool)
 set(INDICATORS_CLIENT_APP indicators-client)
+set(LIGHTDM_GREETER_APP lightdm-unity8-greeter)
 set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
 
 include_directories(

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-03-12 13:59:07 +0000
+++ data/CMakeLists.txt	2015-07-08 19:22:49 +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(${LIGHTDM_GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${LIGHTDM_GREETER_APP}.desktop @ONLY)
 
 # install desktop files
 install(FILES
@@ -11,5 +12,10 @@
     DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
     )
 
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${LIGHTDM_GREETER_APP}.desktop
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
+    )
+
 install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
 install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)

=== added file 'data/lightdm-unity8-greeter.desktop.in'
--- data/lightdm-unity8-greeter.desktop.in	1970-01-01 00:00:00 +0000
+++ data/lightdm-unity8-greeter.desktop.in	2015-07-08 19:22:49 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=LightDM Unity 8 Greeter
+Comment=The converged Unity shell's LightDM Greeter
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter
+Terminal=false
+Icon=
+NoDisplay=true
+X-Ubuntu-Touch=true

=== modified file 'debian/control'
--- debian/control	2015-07-02 16:09:27 +0000
+++ debian/control	2015-07-08 19:22:49 +0000
@@ -11,7 +11,7 @@
 # version. To allow cross-compiling to work, we also must
 # append :native to g++-4.9 so we don't try to run armhf g++
 # on an x86 CPU for eaxmple, when cross-compiling.
-               g++-4.9:native,
+#               g++-4.9:native,
                libandroid-properties-dev,
                graphviz,
                gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
@@ -23,6 +23,8 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libhardware-dev,
+               liblightdm-gobject-1-dev,
+               liblightdm-qt5-3-dev,
                libpam0g-dev,
                libpay2-dev,
                libpulse-dev,

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2015-04-24 11:06:05 +0000
+++ debian/unity8-private.install	2015-07-08 19:22:49 +0000
@@ -2,8 +2,9 @@
 usr/lib/*/unity8/libUbuntuGestures*
 usr/lib/*/unity8/qml/AccountsService
 usr/lib/*/unity8/qml/Dash
+usr/lib/*/unity8/qml/FullLightDM
 usr/lib/*/unity8/qml/Greeter
-usr/lib/*/unity8/qml/LightDM
+usr/lib/*/unity8/qml/IntegratedLightDM
 usr/lib/*/unity8/qml/Lights
 usr/lib/*/unity8/qml/Powerd
 usr/lib/*/unity8/qml/ScreenGrabber

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2015-06-23 20:51:20 +0000
+++ debian/unity8.install	2015-07-08 19:22:49 +0000
@@ -5,6 +5,7 @@
 usr/bin/unity8-dash
 usr/share/applications/unity8-dash.desktop
 usr/share/applications/unity8.desktop
+usr/share/lightdm/greeters/lightdm-unity8-greeter.desktop
 usr/share/unity8/Greeter
 usr/share/unity8/Launcher
 usr/share/unity8/Panel

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2015-04-24 11:06:05 +0000
+++ plugins/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -12,8 +12,9 @@
 endmacro()
 
 add_subdirectory(AccountsService)
+add_subdirectory(FullLightDM)
 add_subdirectory(Greeter)
-add_subdirectory(LightDM)
+add_subdirectory(IntegratedLightDM)
 add_subdirectory(Lights)
 add_subdirectory(Dash)
 add_subdirectory(Powerd)

=== added directory 'plugins/FullLightDM'
=== added file 'plugins/FullLightDM/CMakeLists.txt'
--- plugins/FullLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -0,0 +1,36 @@
+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
+pkg_check_modules(LIBLIGHTDM_GOBJECT REQUIRED liblightdm-gobject-1)
+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${LIBLIGHTDM_INCLUDE_DIRS}
+    ${libunity8-private_SOURCE_DIR}
+    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
+)
+
+set(QMLPLUGIN_SRC
+    ../Utils/unitysortfilterproxymodelqml.cpp
+    DBusGreeter.cpp
+    DBusGreeterList.cpp
+    Greeter.cpp
+    plugin.cpp
+    UsersModel.cpp
+    )
+
+add_library(FullLightDM-qml MODULE
+    ${QMLPLUGIN_SRC}
+    )
+
+target_link_libraries(FullLightDM-qml
+    unity8-private
+    lightdm-qt5-3
+    ${LIBLIGHTDM_LDFLAGS}
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    )
+
+qt5_use_modules(FullLightDM-qml DBus Gui Qml)
+
+add_unity8_plugin(FullLightDM 0.1 FullLightDM TARGETS FullLightDM-qml)

=== added file 'plugins/FullLightDM/DBusGreeter.cpp'
--- plugins/FullLightDM/DBusGreeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/DBusGreeter.cpp	2015-07-08 19:22:49 +0000
@@ -0,0 +1,49 @@
+/*
+ * 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
+ * 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 "DBusGreeter.h"
+#include "Greeter.h"
+
+#include <QDBusMessage>
+#include <QStringList>
+
+DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)
+ : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),
+   m_greeter(greeter)
+{
+    connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));
+}
+
+bool DBusGreeter::isActive() const
+{
+    return m_greeter->isActive();
+}
+
+void DBusGreeter::ShowGreeter()
+{
+    Q_EMIT m_greeter->showGreeter();
+}
+
+void DBusGreeter::HideGreeter()
+{
+    Q_EMIT m_greeter->hideGreeter();
+}
+
+void DBusGreeter::isActiveChangedHandler()
+{
+    notifyPropertyChanged("IsActive", isActive());
+    Q_EMIT isActiveChanged();
+}

=== added file 'plugins/FullLightDM/DBusGreeter.h'
--- plugins/FullLightDM/DBusGreeter.h	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/DBusGreeter.h	2015-07-08 19:22:49 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 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_DBUSGREETER_H
+#define UNITY_DBUSGREETER_H
+
+#include "unitydbusobject.h"
+#include <QDBusConnection>
+
+class Greeter;
+
+/** This is an internal class used to talk with the indicators.
+  */
+
+class DBusGreeter : public UnityDBusObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter")
+
+    Q_PROPERTY(bool IsActive READ isActive NOTIFY isActiveChanged) // since 14.10
+
+public:
+    explicit DBusGreeter(Greeter *greeter, const QString &path);
+
+    bool isActive() const;
+    Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
+    Q_SCRIPTABLE void HideGreeter(); // temporary, until we split the greeter again
+
+Q_SIGNALS:
+    void isActiveChanged();
+
+private Q_SLOTS:
+    void isActiveChangedHandler();
+
+private:
+    Greeter *m_greeter;
+};
+
+#endif

=== added file 'plugins/FullLightDM/DBusGreeterList.cpp'
--- plugins/FullLightDM/DBusGreeterList.cpp	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/DBusGreeterList.cpp	2015-07-08 19:22:49 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "DBusGreeterList.h"
+#include "Greeter.h"
+
+#include <QDBusMessage>
+#include <QStringList>
+
+DBusGreeterList::DBusGreeterList(Greeter *greeter, const QString &path)
+ : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),
+   m_greeter(greeter)
+{
+    connect(m_greeter, SIGNAL(authenticationUserChanged(const QString &)), this, SLOT(authenticationUserChangedHandler(const QString &)));
+    connect(m_greeter, SIGNAL(promptlessChanged()), this, SLOT(promptlessChangedHandler()));
+}
+
+QString DBusGreeterList::GetActiveEntry() const
+{
+    return m_greeter->authenticationUser();
+}
+
+void DBusGreeterList::SetActiveEntry(const QString &entry)
+{
+    Q_EMIT m_greeter->requestAuthenticationUser(entry);
+}
+
+bool DBusGreeterList::entryIsLocked() const
+{
+    return !m_greeter->promptless();
+}
+
+void DBusGreeterList::authenticationUserChangedHandler(const QString &user)
+{
+    notifyPropertyChanged("ActiveEntry", user);
+    Q_EMIT EntrySelected(user);
+}
+
+void DBusGreeterList::promptlessChangedHandler()
+{
+    notifyPropertyChanged("EntryIsLocked", entryIsLocked());
+    Q_EMIT entryIsLockedChanged();
+}

=== added file 'plugins/FullLightDM/DBusGreeterList.h'
--- plugins/FullLightDM/DBusGreeterList.h	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/DBusGreeterList.h	2015-07-08 19:22:49 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_DBUSGREETERLIST_H
+#define UNITY_DBUSGREETERLIST_H
+
+#include "unitydbusobject.h"
+#include <QDBusConnection>
+
+class Greeter;
+
+/** This is an internal class used to talk with the indicators.
+  */
+
+class DBusGreeterList : public UnityDBusObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter.List")
+
+    Q_PROPERTY(QString ActiveEntry READ GetActiveEntry WRITE SetActiveEntry NOTIFY EntrySelected) // since 14.04
+    Q_PROPERTY(bool EntryIsLocked READ entryIsLocked NOTIFY entryIsLockedChanged) // since 14.04
+
+public:
+    explicit DBusGreeterList(Greeter *greeter, const QString &path);
+
+    Q_SCRIPTABLE void SetActiveEntry(const QString &entry); // since 13.04
+    Q_SCRIPTABLE QString GetActiveEntry() const; // since 13.10
+
+    bool entryIsLocked() const;
+
+Q_SIGNALS:
+    Q_SCRIPTABLE void EntrySelected(const QString &entry); // since 13.10
+
+    void entryIsLockedChanged();
+
+private Q_SLOTS:
+    void authenticationUserChangedHandler(const QString &user);
+    void promptlessChangedHandler();
+
+private:
+    Greeter *m_greeter;
+};
+
+#endif

=== added file 'plugins/FullLightDM/FullLightDM.qmltypes'
--- plugins/FullLightDM/FullLightDM.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/FullLightDM.qmltypes	2015-07-08 19:22:49 +0000
@@ -0,0 +1,251 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable LightDM 0.1 plugins'
+
+Module {
+    Component {
+        name: "Greeter"
+        prototype: "QObject"
+        exports: ["LightDM/Greeter 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "active"; type: "bool" }
+        Property { name: "authenticated"; type: "bool"; isReadonly: true }
+        Property { name: "authenticationUser"; type: "string"; isReadonly: true }
+        Property { name: "promptless"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "showMessage"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "isError"; type: "bool" }
+        }
+        Signal {
+            name: "showPrompt"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "isSecret"; type: "bool" }
+            Parameter { name: "isDefaultPrompt"; type: "bool" }
+        }
+        Signal { name: "authenticationComplete" }
+        Signal {
+            name: "authenticationUserChanged"
+            Parameter { name: "user"; type: "string" }
+        }
+        Signal { name: "isActiveChanged" }
+        Signal { name: "isAuthenticatedChanged" }
+        Signal { name: "showGreeter" }
+        Signal { name: "hideGreeter" }
+        Signal {
+            name: "requestAuthenticationUser"
+            Parameter { name: "user"; type: "string" }
+        }
+        Method {
+            name: "authenticate"
+            Parameter { name: "username"; type: "string" }
+        }
+        Method { name: "authenticate" }
+        Method {
+            name: "respond"
+            Parameter { name: "response"; type: "string" }
+        }
+        Method {
+            name: "startSessionSync"
+            type: "bool"
+            Parameter { name: "session"; type: "string" }
+        }
+        Method { name: "startSessionSync"; type: "bool" }
+        Method {
+            name: "setIsActive"
+            Parameter { name: "isActive"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    }
+    Component {
+        name: "QLightDM::UsersModel"
+        prototype: "QAbstractListModel"
+        exports: ["LightDM/UserRoles 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "UserModelRoles"
+            values: {
+                "NameRole": 256,
+                "RealNameRole": 257,
+                "LoggedInRole": 258,
+                "BackgroundRole": 259,
+                "SessionRole": 260,
+                "HasMessagesRole": 261,
+                "ImagePathRole": 262,
+                "BackgroundPathRole": 263
+            }
+        }
+    }
+    Component {
+        name: "QSortFilterProxyModel"
+        prototype: "QAbstractProxyModel"
+        Property { name: "filterRegExp"; type: "QRegExp" }
+        Property { name: "filterKeyColumn"; type: "int" }
+        Property { name: "dynamicSortFilter"; type: "bool" }
+        Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "isSortLocaleAware"; type: "bool" }
+        Property { name: "sortRole"; type: "int" }
+        Property { name: "filterRole"; type: "int" }
+        Method {
+            name: "setFilterRegExp"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterWildcard"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterFixedString"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method { name: "clear" }
+        Method { name: "invalidate" }
+    }
+    Component {
+        name: "UnitySortFilterProxyModelQML"
+        prototype: "QSortFilterProxyModel"
+        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+        Property { name: "totalCount"; type: "int"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "invertMatch"; type: "bool" }
+        Signal {
+            name: "invertMatchChanged"
+            Parameter { type: "bool" }
+        }
+        Method {
+            name: "get"
+            type: "QVariantMap"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "int" }
+        }
+        Method { name: "count"; type: "int" }
+        Method {
+            name: "findFirst"
+            type: "int"
+            Parameter { name: "role"; type: "int" }
+            Parameter { name: "value"; type: "QVariant" }
+        }
+        Method {
+            name: "mapRowToSource"
+            type: "int"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "mapFromSource"
+            type: "int"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "mapToSource"
+            type: "int"
+            Parameter { name: "row"; type: "int" }
+        }
+    }
+    Component {
+        name: "UserMetricsOutput::ColorTheme"
+        prototype: "QObject"
+        Property { name: "start"; type: "QColor"; isReadonly: true }
+        Property { name: "main"; type: "QColor"; isReadonly: true }
+        Property { name: "end"; type: "QColor"; isReadonly: true }
+        Signal {
+            name: "startChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "mainChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "endChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+    }
+    Component {
+        name: "UserMetricsOutput::UserMetrics"
+        prototype: "QObject"
+        exports: ["LightDM/Infographic 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "label"; type: "string"; isReadonly: true }
+        Property { name: "username"; type: "string" }
+        Property {
+            name: "firstColor"
+            type: "UserMetricsOutput::ColorTheme"
+            isReadonly: true
+            isPointer: true
+        }
+        Property {
+            name: "secondColor"
+            type: "UserMetricsOutput::ColorTheme"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "firstMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Property { name: "secondMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Property { name: "currentDay"; type: "int"; isReadonly: true }
+        Signal {
+            name: "labelChanged"
+            Parameter { name: "label"; type: "string" }
+        }
+        Signal {
+            name: "usernameChanged"
+            Parameter { name: "username"; type: "string" }
+        }
+        Signal {
+            name: "firstColorChanged"
+            Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
+        }
+        Signal {
+            name: "firstMonthChanged"
+            Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }
+        }
+        Signal {
+            name: "currentDayChanged"
+            Parameter { name: "currentDay"; type: "int" }
+        }
+        Signal {
+            name: "secondColorChanged"
+            Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
+        }
+        Signal {
+            name: "secondMonthChanged"
+            Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }
+        }
+        Signal { name: "nextDataSource" }
+        Signal { name: "readyForDataChange" }
+        Signal { name: "dataAboutToAppear" }
+        Signal { name: "dataAppeared" }
+        Signal { name: "dataAboutToChange" }
+        Signal { name: "dataChanged" }
+        Signal { name: "dataAboutToDisappear" }
+        Signal { name: "dataDisappeared" }
+        Method { name: "nextDataSourceSlot" }
+        Method { name: "readyForDataChangeSlot" }
+    }
+    Component {
+        name: "UsersModel"
+        prototype: "UnitySortFilterProxyModelQML"
+        exports: ["LightDM/Users 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+    }
+}

=== added file 'plugins/FullLightDM/Greeter.cpp'
--- plugins/FullLightDM/Greeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/Greeter.cpp	2015-07-08 19:22:49 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "Greeter.h"
+#include "GreeterPrivate.h"
+#include <libintl.h>
+#include <QDebug>
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : m_greeter(new QLightDM::Greeter(parent)),
+    m_active(false),
+    wasPrompted(false),
+    promptless(false),
+    q_ptr(parent)
+{
+}
+
+Greeter::Greeter(QObject* parent)
+  : QObject(parent),
+    d_ptr(new GreeterPrivate(this))
+{
+    Q_D(Greeter);
+
+    connect(d->m_greeter, &QLightDM::Greeter::showMessage,
+            this, &Greeter::showMessageFilter);
+    connect(d->m_greeter, &QLightDM::Greeter::showPrompt,
+            this, &Greeter::showPromptFilter);
+    connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,
+            this, &Greeter::authenticationCompleteFilter);
+
+    d->m_greeter->connectSync();
+}
+
+bool Greeter::isActive() const
+{
+    Q_D(const Greeter);
+    return d->m_active;
+}
+
+void Greeter::setIsActive(bool active)
+{
+    Q_D(Greeter);
+    if (d->m_active != active) {
+        d->m_active = active;
+        Q_EMIT isActiveChanged();
+    }
+}
+
+bool Greeter::isAuthenticated() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->isAuthenticated();
+}
+
+QString Greeter::authenticationUser() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->authenticationUser();
+}
+
+bool Greeter::promptless() const
+{
+    Q_D(const Greeter);
+    return d->promptless;
+}
+
+void Greeter::authenticate(const QString &username)
+{
+    Q_D(Greeter);
+    d->wasPrompted = false;
+    if (d->promptless) {
+        d->promptless = false;
+        Q_EMIT promptlessChanged();
+    }
+
+    d->m_greeter->authenticate(username);
+    Q_EMIT isAuthenticatedChanged();
+    Q_EMIT authenticationUserChanged(username);
+}
+
+void Greeter::respond(const QString &response)
+{
+    Q_D(Greeter);
+    d->m_greeter->respond(response);
+}
+
+bool Greeter::startSessionSync(const QString &session)
+{
+    Q_D(Greeter);
+    return d->m_greeter->startSessionSync(session);
+}
+
+void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)
+{
+    Q_D(Greeter);
+    d->wasPrompted = true;
+
+    bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
+
+    // Strip prompt of any colons at the end
+    QString trimmedText = text.trimmed();
+    if (trimmedText.endsWith(":") || trimmedText.endsWith("：")) {
+        trimmedText.chop(1);
+    }
+
+    Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);
+}
+
+void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
+{
+    Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);
+}
+
+void Greeter::authenticationCompleteFilter()
+{
+    Q_D(Greeter);
+    if (!d->wasPrompted) {
+        d->promptless = true;
+        Q_EMIT promptlessChanged();
+    }
+
+    Q_EMIT isAuthenticatedChanged();
+    Q_EMIT authenticationComplete();
+}

=== added file 'plugins/FullLightDM/Greeter.h'
--- plugins/FullLightDM/Greeter.h	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/Greeter.h	2015-07-08 19:22:49 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2012,2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Terry <[e-mail]>
+ */
+
+/* This class is a really tiny filter around QLightDM::Greeter.  There are some
+   operations that we want to edit a bit for the benefit of Qml.  Specifically,
+   we want to chop colons off of any password prompts.  But there may be more
+   such edits in the future, and by inserting ourselves here, we have more
+   control. */
+
+#ifndef UNITY_GREETER_H
+#define UNITY_GREETER_H
+
+#include <QLightDM/Greeter>
+#include <QtCore/QObject>
+
+class GreeterPrivate;
+
+class Greeter : public QObject
+{
+    Q_OBJECT
+
+    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(bool promptless READ promptless NOTIFY promptlessChanged)
+
+public:
+    explicit Greeter(QObject* parent=0);
+
+    bool isActive() const;
+    bool isAuthenticated() const;
+    QString authenticationUser() const;
+    bool promptless() const;
+
+public Q_SLOTS:
+    void authenticate(const QString &username=QString());
+    void respond(const QString &response);
+    bool startSessionSync(const QString &session=QString());
+    void setIsActive(bool isActive);
+
+Q_SIGNALS:
+    void showMessage(const QString &text, bool isError);
+    void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);
+    void authenticationComplete();
+    void authenticationUserChanged(const QString &user);
+    void isActiveChanged();
+    void isAuthenticatedChanged();
+    void promptlessChanged();
+    void showGreeter();
+    void hideGreeter();
+
+    // This signal is emitted by external agents like indicators, and the UI
+    // should switch to this user if possible.
+    void requestAuthenticationUser(const QString &user);
+
+protected:
+    GreeterPrivate * const d_ptr;
+
+    Q_DECLARE_PRIVATE(Greeter)
+
+private Q_SLOTS:
+    void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);
+    void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);
+    void authenticationCompleteFilter();
+};
+
+#endif

=== added file 'plugins/FullLightDM/GreeterPrivate.h'
--- plugins/FullLightDM/GreeterPrivate.h	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/GreeterPrivate.h	2015-07-08 19:22:49 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 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_GREETER_PRIVATE_H
+#define UNITY_GREETER_PRIVATE_H
+
+#include <QLightDM/Greeter>
+
+class GreeterPrivate
+{
+public:
+    explicit GreeterPrivate(Greeter *parent);
+
+    QLightDM::Greeter *m_greeter;
+    bool m_active;
+    bool wasPrompted;
+    bool promptless;
+
+protected:
+    Greeter * const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(Greeter)
+};
+
+#endif // UNITY_GREETER_PRIVATE_H

=== added file 'plugins/FullLightDM/UsersModel.cpp'
--- plugins/FullLightDM/UsersModel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/UsersModel.cpp	2015-07-08 19:22:49 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "UsersModel.h"
+#include <QLightDM/UsersModel>
+#include <QtCore/QSortFilterProxyModel>
+
+// First, we define an internal class that wraps LightDM's UsersModel.  This
+// class will modify some of the data coming from LightDM.  For example, we
+// modify any empty Real Names into just normal Names.
+// (We can't modify the data directly in UsersModel below because it won't sort
+// using the modified data.)
+class MangleModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    explicit MangleModel(QObject* parent=0);
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+};
+
+MangleModel::MangleModel(QObject* parent)
+  : QSortFilterProxyModel(parent)
+{
+    setSourceModel(new QLightDM::UsersModel(this));
+}
+
+QVariant MangleModel::data(const QModelIndex &index, int role) const
+{
+    QVariant data = QSortFilterProxyModel::data(index, role);
+
+    // If user's real name is empty, switch to unix name
+    if (role == QLightDM::UsersModel::RealNameRole && data.toString().isEmpty()) {
+        data = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);
+    } else if (role == QLightDM::UsersModel::BackgroundPathRole && data.toString().startsWith('#')) {
+        data = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + data.toString() + "'/></svg>";
+    }
+
+    return data;
+}
+
+// **** Now we continue with actual UsersModel class ****
+
+UsersModel::UsersModel(QObject* parent)
+  : UnitySortFilterProxyModelQML(parent)
+{
+    setModel(new MangleModel(this));
+    setSortCaseSensitivity(Qt::CaseInsensitive);
+    setSortLocaleAware(true);
+    setSortRole(QLightDM::UsersModel::RealNameRole);
+    sort(0);
+}
+
+#include "UsersModel.moc"

=== added file 'plugins/FullLightDM/UsersModel.h'
--- plugins/FullLightDM/UsersModel.h	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/UsersModel.h	2015-07-08 19:22:49 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2012,2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Terry <[e-mail]>
+ */
+
+/* This class is a really tiny filter around QLightDM::UsersModel.  There are
+   some operations that we want to edit a bit for the benefit of Qml.
+   Specifically, we want to sort users according to realName. */
+
+#ifndef UNITY_USERSMODEL_H
+#define UNITY_USERSMODEL_H
+
+#include <unitysortfilterproxymodelqml.h>
+#include <QtCore/QObject>
+
+class UsersModel : public UnitySortFilterProxyModelQML
+{
+    Q_OBJECT
+
+public:
+    explicit UsersModel(QObject* parent=0);
+};
+
+#endif

=== added file 'plugins/FullLightDM/plugin.cpp'
--- plugins/FullLightDM/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/plugin.cpp	2015-07-08 19:22:49 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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 "plugin.h"
+#include "DBusGreeter.h"
+#include "DBusGreeterList.h"
+#include "Greeter.h"
+#include "UsersModel.h"
+#include <libusermetricsoutput/ColorTheme.h>
+#include <libusermetricsoutput/UserMetrics.h>
+#include <QLightDM/UsersModel>
+
+#include <QAbstractItemModel>
+#include <QDBusConnection>
+#include <QtQml/qqml.h>
+
+static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    Greeter *greeter = new Greeter();
+    new DBusGreeter(greeter, "/");
+    new DBusGreeterList(greeter, "/list");
+
+    return greeter;
+}
+
+static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new UsersModel();
+}
+
+static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return UserMetricsOutput::UserMetrics::getInstance();
+}
+
+void FullLightDMPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QAbstractItemModel>();
+    qmlRegisterType<UserMetricsOutput::ColorTheme>();
+
+    Q_ASSERT(uri == QLatin1String("FullLightDM"));
+    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
+    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
+    qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);
+    qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
+    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
+    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
+}

=== added file 'plugins/FullLightDM/plugin.h'
--- plugins/FullLightDM/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/plugin.h	2015-07-08 19:22:49 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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
+ * 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 FULL_LIGHTDM_PLUGIN_H
+#define FULL_LIGHTDM_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class FullLightDMPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif /* FULL_LIGHTDM_PLUGIN_H */

=== added file 'plugins/FullLightDM/qmldir'
--- plugins/FullLightDM/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/FullLightDM/qmldir	2015-07-08 19:22:49 +0000
@@ -0,0 +1,3 @@
+module FullLightDM
+plugin FullLightDM-qml
+typeinfo FullLightDM.qmltypes

=== renamed directory 'plugins/LightDM' => 'plugins/IntegratedLightDM'
=== modified file 'plugins/IntegratedLightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2015-02-03 12:17:50 +0000
+++ plugins/IntegratedLightDM/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -1,6 +1,4 @@
 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)
 
@@ -8,8 +6,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
-    #${LIBLIGHTDM_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
     ${libunity8-private_SOURCE_DIR}
     ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
 )
@@ -23,18 +20,16 @@
     UsersModel.cpp
     )
 
-add_library(LightDM-qml MODULE
+add_library(IntegratedLightDM-qml MODULE
     ${QMLPLUGIN_SRC}
     )
 
-target_link_libraries(LightDM-qml
+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(LightDM-qml DBus Gui Qml)
+qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
 
-add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
+add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)

=== renamed file 'plugins/LightDM/LightDM.qmltypes' => 'plugins/IntegratedLightDM/IntegratedLightDM.qmltypes'
=== modified file 'plugins/IntegratedLightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2014-10-09 14:53:00 +0000
+++ plugins/IntegratedLightDM/plugin.cpp	2015-07-08 19:22:49 +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,8 +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: Gerry Boland <[e-mail]>
- *          Michael Terry <[e-mail]>
  */
 
 #include "plugin.h"
@@ -56,12 +54,12 @@
     return UserMetricsOutput::UserMetrics::getInstance();
 }
 
-void LightDMPlugin::registerTypes(const char *uri)
+void IntegratedLightDMPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<UserMetricsOutput::ColorTheme>();
 
-    Q_ASSERT(uri == QLatin1String("LightDM"));
+    Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
     qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
     qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
     qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

=== modified file 'plugins/IntegratedLightDM/plugin.h'
--- plugins/LightDM/plugin.h	2015-04-30 09:31:51 +0000
+++ plugins/IntegratedLightDM/plugin.h	2015-07-08 19:22:49 +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,17 +13,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authors: Gerry Boland <[e-mail]>
- *          Michael Terry <[e-mail]>
  */
 
-#ifndef LIGHTDM_PLUGIN_H
-#define LIGHTDM_PLUGIN_H
+#ifndef INTEGRATED_LIGHTDM_PLUGIN_H
+#define INTEGRATED_LIGHTDM_PLUGIN_H
 
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class LightDMPlugin : public QQmlExtensionPlugin
+class IntegratedLightDMPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -32,4 +30,4 @@
     void registerTypes(const char *uri) override;
 };
 
-#endif
+#endif /* INTEGRATED_LIGHTDM_PLUGIN_H */

=== modified file 'plugins/IntegratedLightDM/qmldir'
--- plugins/LightDM/qmldir	2014-05-02 22:57:00 +0000
+++ plugins/IntegratedLightDM/qmldir	2015-07-08 19:22:49 +0000
@@ -1,3 +1,3 @@
-module LightDM
-plugin LightDM-qml
-typeinfo LightDM.qmltypes
+module IntegratedLightDM
+plugin IntegratedLightDM-qml
+typeinfo IntegratedLightDM.qmltypes

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-03-26 15:24:04 +0000
+++ qml/Components/Dialogs.qml	2015-07-08 19:22:49 +0000
@@ -19,7 +19,7 @@
 import Unity.Application 0.1
 import Unity.Session 0.1
 import Ubuntu.Components 1.1
-import LightDM 0.1 as LightDM
+import "../Greeter"
 
 Item {
     id: root
@@ -62,6 +62,7 @@
         active: false
     }
 
+    LightDM{id: lightDM} // Provide backend access
     Component {
         id: logoutDialogComponent
         ShellDialog {
@@ -71,7 +72,7 @@
             Button {
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
-                    LightDM.Greeter.showGreeter()
+                    lightDM.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	2015-07-08 19:22:49 +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.3
+import 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	2015-06-12 16:07:43 +0000
+++ qml/Greeter/Greeter.qml	2015-07-08 19:22:49 +0000
@@ -16,7 +16,6 @@
 
 import QtQuick 2.3
 import AccountsService 0.1
-import LightDM 0.1 as LightDM
 import Ubuntu.Components 1.1
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
@@ -43,7 +42,7 @@
     readonly property bool hasLockedApp: lockedApp !== ""
 
     property bool forcedUnlock
-    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
+    readonly property bool locked: lightDM.greeter.active && !lightDM.greeter.authenticated && !forcedUnlock
 
     property bool tabletMode
     property url viewSource // only used for testing
@@ -106,10 +105,11 @@
         return d.startUnlock(true /* toTheRight */);
     }
 
+    LightDM{id:lightDM} // Provide backend access
     QtObject {
         id: d
 
-        readonly property bool multiUser: LightDM.Users.count > 1
+        readonly property bool multiUser: lightDM.users.count > 1
         property int currentIndex
         property bool waiting
 
@@ -133,15 +133,15 @@
                 loader.item.reset();
             }
             currentIndex = uid;
-            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
+            var user = lightDM.users.data(uid, lightDM.userRoles.NameRole);
             AccountsService.user = user;
             LauncherModel.setUser(user);
-            LightDM.Greeter.authenticate(user); // always resets auth state
+            lightDM.greeter.authenticate(user); // always resets auth state
         }
 
         function login() {
             enabled = false;
-            if (LightDM.Greeter.startSessionSync()) {
+            if (lightDM.greeter.startSessionSync()) {
                 sessionStarted();
                 if (loader.item) {
                     loader.item.notifyAuthenticationSucceeded();
@@ -228,7 +228,7 @@
             root.lockedApp = "";
             root.forceActiveFocus();
             d.selectUser(d.currentIndex, true);
-            LightDM.Infographic.readyForDataChange();
+            lightDM.infographic.readyForDataChange();
         }
 
         Connections {
@@ -238,9 +238,9 @@
             }
             onResponded: {
                 if (root.locked) {
-                    LightDM.Greeter.respond(response);
+                    lightDM.greeter.respond(response);
                 } else {
-                    if (LightDM.Greeter.active && !LightDM.Greeter.authenticated) { // could happen if forcedUnlock
+                    if (lightDM.greeter.active && !lightDM.greeter.authenticated) { // could happen if forcedUnlock
                         d.login();
                     }
                     loader.item.hide();
@@ -306,18 +306,18 @@
         Binding {
             target: loader.item
             property: "userModel"
-            value: LightDM.Users
+            value: lightDM.users
         }
 
         Binding {
             target: loader.item
             property: "infographicModel"
-            value: LightDM.Infographic
+            value: lightDM.infographic
         }
     }
 
     Connections {
-        target: LightDM.Greeter
+        target: lightDM.greeter
 
         onShowGreeter: root.forceShow()
 
@@ -327,7 +327,7 @@
         }
 
         onShowMessage: {
-            if (!LightDM.Greeter.active) {
+            if (!lightDM.greeter.active) {
                 return; // could happen if hideGreeter() comes in before we prompt
             }
 
@@ -346,7 +346,7 @@
         onShowPrompt: {
             d.waiting = false;
 
-            if (!LightDM.Greeter.active) {
+            if (!lightDM.greeter.active) {
                 return; // could happen if hideGreeter() comes in before we prompt
             }
 
@@ -356,14 +356,14 @@
         onAuthenticationComplete: {
             d.waiting = false;
 
-            if (LightDM.Greeter.authenticated) {
+            if (lightDM.greeter.authenticated) {
                 AccountsService.failedLogins = 0;
                 d.login();
-                if (!LightDM.Greeter.promptless) {
+                if (!lightDM.greeter.promptless) {
                     loader.item.hide();
                 }
             } else {
-                if (!LightDM.Greeter.promptless) {
+                if (!lightDM.greeter.promptless) {
                     AccountsService.failedLogins++;
                 }
 
@@ -384,7 +384,7 @@
                 }
 
                 loader.item.notifyAuthenticationFailed();
-                if (!LightDM.Greeter.promptless) {
+                if (!lightDM.greeter.promptless) {
                     d.selectUser(d.currentIndex, false);
                 }
             }
@@ -392,8 +392,8 @@
 
         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)) {
+            for (var i = 0; i < lightDM.users.count; i++) {
+                if (user === lightDM.users.data(i, lightDM.userRoles.NameRole)) {
                     d.selectUser(i, true);
                     return;
                 }
@@ -402,19 +402,19 @@
     }
 
     Binding {
-        target: LightDM.Greeter
+        target: lightDM.greeter
         property: "active"
         value: root.active
     }
 
     Binding {
-        target: LightDM.Infographic
+        target: lightDM.infographic
         property: "username"
-        value: AccountsService.statsWelcomeScreen ? LightDM.Users.data(d.currentIndex, LightDM.UserRoles.NameRole) : ""
+        value: AccountsService.statsWelcomeScreen ? lightDM.users.data(d.currentIndex, lightDM.userRoles.NameRole) : ""
     }
 
     Connections {
         target: i18n
-        onLanguageChanged: LightDM.Infographic.readyForDataChange()
+        onLanguageChanged: lightDM.infographic.readyForDataChange()
     }
 }

=== added file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	2015-07-08 19:22:49 +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.3
+import IntegratedLightDM 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
+
+}

=== added file 'qml/Greeter/LightDM.qml'
--- qml/Greeter/LightDM.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/LightDM.qml	2015-07-08 19:22:49 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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/>.
+ */
+
+/**
+ * Lightweight wrapper that allows for loading integrated/real LightDM
+ * plugin
+ */
+
+import QtQuick 2.3
+
+Loader {
+    id: loader
+
+    property var greeter: d.valid ? loader.item.greeter : null
+    property var infographic: d.valid ? loader.item.infographic : null
+    property var users: d.valid ? loader.item.users : null
+    property var userRoles: d.valid ? loader.item.userRoles : null
+
+    // TODO: Conditionally load RealLightDMImpl if shell.mode dictates it
+    source:  shell.mode === "greeter" ?
+        "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
+
+    QtObject {
+        id: d
+
+        property bool valid: loader.item !== null
+    }
+
+}

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-06-23 17:40:03 +0000
+++ qml/Shell.qml	2015-07-08 19:22:49 +0000
@@ -26,7 +26,6 @@
 import Unity.Connectivity 0.1
 import Unity.Launcher 0.1
 import Utils 0.1
-import LightDM 0.1 as LightDM
 import Powerd 0.1
 import SessionBroadcast 0.1
 import "Greeter"
@@ -167,6 +166,7 @@
         finishStartUpTimer.start();
     }
 
+    LightDM{id: lightDM} // Provide backend access
     VolumeControl {
         id: volumeControl
     }
@@ -358,8 +358,8 @@
             id: tutorial
             objectName: "tutorial"
             anchors.fill: parent
-            active: AccountsService.demoEdges
-            paused: LightDM.Greeter.active
+            active: AccountsService.demoEdges && shell.mode !== "greeter"
+            paused: lightDM.greeter.active
             launcher: launcher
             panel: panel
             edgeSize: shell.edgeSize
@@ -519,7 +519,7 @@
 
         greeter.notifyAboutToFocusApp("unity8-dash");
 
-        var animate = !LightDM.Greeter.active && !stages.shown
+        var animate = !lightDM.greeter.active && !stages.shown
         dash.setCurrentScope(0, animate, false)
         ApplicationManager.requestFocusApplication("unity8-dash")
     }

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2015-03-11 14:48:45 +0000
+++ qml/Wizard/Wizard.qml	2015-07-08 19:22:49 +0000
@@ -43,7 +43,7 @@
     Loader {
         id: loader
         anchors.fill: parent
-        active: System.wizardEnabled
+        active: System.wizardEnabled && shell.mode !== "greeter"
         source: "Pages.qml"
 
         Binding {

=== modified file 'src/main.cpp'
--- src/main.cpp	2015-06-23 12:08:32 +0000
+++ src/main.cpp	2015-07-08 19:22:49 +0000
@@ -22,6 +22,7 @@
 #include <QtQml/QQmlContext>
 #include <QLibrary>
 #include <QDebug>
+#include <QScreen>
 #include <csignal>
 #include <libintl.h>
 
@@ -118,7 +119,14 @@
     view->setSource(source);
     QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
 
-    if (isMirServer || parser.hasFullscreen()) {
+    // FIXME: This is a workaround to make the greeter fullscreen as
+    // view->showFullScreen() doesn't work quite right
+    if (parser.mode().compare("greeter") == 0) {
+        QSize primaryScreenSize = application->primaryScreen()->size();
+        view->setHeight(primaryScreenSize.height());
+        view->setWidth(primaryScreenSize.width());
+        view->show();
+    } else if (isMirServer || parser.hasFullscreen()) {
         view->showFullScreen();
     } else {
         view->show();

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2015-04-15 14:09:06 +0000
+++ tests/mocks/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -32,7 +32,7 @@
 add_subdirectory(GSettings.1.0)
 add_subdirectory(indicator-service)
 add_subdirectory(libusermetrics)
-add_subdirectory(LightDM)
+add_subdirectory(IntegratedLightDM)
 add_subdirectory(Lights)
 add_subdirectory(MeeGo)
 add_subdirectory(Powerd)

=== renamed directory 'tests/mocks/LightDM' => 'tests/mocks/IntegratedLightDM'
=== modified file 'tests/mocks/IntegratedLightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2015-04-01 11:25:54 +0000
+++ tests/mocks/IntegratedLightDM/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -10,16 +10,16 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
     ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
     ${libunity8-private_SOURCE_DIR}
 )
 
 set(QMLPLUGIN_SRC
-    ${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/UsersModel.cpp
+    ${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/Utils/unitysortfilterproxymodelqml.cpp
     MockGreeter.cpp
     MockUsersModel.cpp
@@ -42,7 +42,7 @@
 
 qt5_use_modules(MockLightDM-qml DBus Gui Qml)
 
-add_unity8_mock(LightDM 0.1 LightDM
+add_unity8_mock(IntegratedLightDM 0.1 IntegratedLightDM
     PREFIX mocks
     TARGETS MockLightDM-qml
     ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"

=== renamed file 'tests/mocks/LightDM/LightDM.qmltypes' => 'tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypes'
--- tests/mocks/LightDM/LightDM.qmltypes	2015-02-13 09:01:16 +0000
+++ tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypes	2015-07-08 19:22:49 +0000
@@ -4,7 +4,7 @@
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -notrelocatable LightDM 0.1 tests/mocks'
+// 'qmlplugindump -notrelocatable IntegratedLightDM 0.1 tests/mocks'
 
 Module {
     Component {
@@ -61,7 +61,7 @@
     Component {
         name: "MockGreeter"
         prototype: "Greeter"
-        exports: ["LightDM/Greeter 0.1"]
+        exports: ["IntegratedLightDM/Greeter 0.1"]
         isCreatable: false
         isSingleton: true
         exportMetaObjectRevisions: [0]
@@ -74,7 +74,7 @@
     Component {
         name: "MockUsersModel"
         prototype: "UsersModel"
-        exports: ["LightDM/Users 0.1"]
+        exports: ["IntegratedLightDM/Users 0.1"]
         isCreatable: false
         isSingleton: true
         exportMetaObjectRevisions: [0]
@@ -92,7 +92,7 @@
     Component {
         name: "QLightDM::UsersModel"
         prototype: "QAbstractListModel"
-        exports: ["LightDM/UserRoles 0.1"]
+        exports: ["IntegratedLightDM/UserRoles 0.1"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
@@ -207,7 +207,7 @@
     Component {
         name: "UserMetricsOutput::UserMetrics"
         prototype: "QObject"
-        exports: ["LightDM/Infographic 0.1"]
+        exports: ["IntegratedLightDM/Infographic 0.1"]
         isCreatable: false
         isSingleton: true
         exportMetaObjectRevisions: [0]
@@ -246,7 +246,7 @@
         }
         Signal {
             name: "currentDayChanged"
-            Parameter { name: "currentDay"; type: "int" }
+            Parameter { name: "length"; type: "int" }
         }
         Signal {
             name: "secondColorChanged"
@@ -264,8 +264,6 @@
         Signal { name: "dataChanged" }
         Signal { name: "dataAboutToDisappear" }
         Signal { name: "dataDisappeared" }
-        Method { name: "nextDataSourceSlot" }
-        Method { name: "readyForDataChangeSlot" }
     }
     Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
 }

=== modified file 'tests/mocks/IntegratedLightDM/plugin.cpp'
--- tests/mocks/LightDM/plugin.cpp	2015-01-20 11:50:19 +0000
+++ tests/mocks/IntegratedLightDM/plugin.cpp	2015-07-08 19:22:49 +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
@@ -53,12 +53,12 @@
     return UserMetricsOutput::UserMetrics::getInstance();
 }
 
-void LightDMPlugin::registerTypes(const char *uri)
+void IntegratedLightDMPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<UserMetricsOutput::ColorTheme>();
 
-    Q_ASSERT(uri == QLatin1String("LightDM"));
+    Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
     qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
     qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
     qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);

=== modified file 'tests/mocks/IntegratedLightDM/plugin.h'
--- tests/mocks/LightDM/plugin.h	2015-04-30 09:31:51 +0000
+++ tests/mocks/IntegratedLightDM/plugin.h	2015-07-08 19:22:49 +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
@@ -20,7 +20,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class LightDMPlugin : public QQmlExtensionPlugin
+class IntegratedLightDMPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

=== modified file 'tests/mocks/IntegratedLightDM/qmldir'
--- tests/mocks/LightDM/qmldir	2014-06-11 15:36:51 +0000
+++ tests/mocks/IntegratedLightDM/qmldir	2015-07-08 19:22:49 +0000
@@ -1,3 +1,3 @@
-module LightDM
+module IntegratedLightDM
 plugin MockLightDM-qml
-typeinfo LightDM.qmltypes
+typeinfo IntegratedLightDM.qmltypes

=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2015-04-24 11:06:05 +0000
+++ tests/plugins/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -1,6 +1,6 @@
 add_subdirectory(AccountsService)
 add_subdirectory(Greeter)
-add_subdirectory(LightDM)
+add_subdirectory(IntegratedLightDM)
 add_subdirectory(Dash)
 add_subdirectory(SessionGrabber)
 add_subdirectory(Ubuntu)

=== renamed directory 'tests/plugins/LightDM' => 'tests/plugins/IntegratedLightDM'
=== modified file 'tests/plugins/IntegratedLightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2015-06-17 12:14:27 +0000
+++ tests/plugins/IntegratedLightDM/CMakeLists.txt	2015-07-08 19:22:49 +0000
@@ -7,16 +7,16 @@
 
 add_executable(GreeterDBusTestExec
     dbus.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
     )
 qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
 target_link_libraries(GreeterDBusTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
+    -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
     -llightdm-qt5-2
     )
 target_include_directories(GreeterDBusTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
     )
 add_unity8_uitest(GreeterDBus dbus-test-runner
     ARG_PREFIX "--parameter"
@@ -28,34 +28,34 @@
 
 add_executable(GreeterPamTestExec
     pam.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm/GreeterPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/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/LightDM/liblightdm
+    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/liblightdm
     )
 add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
 
 add_executable(GreeterUsersModelTestExec
     usersmodel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
 qt5_use_modules(GreeterUsersModelTestExec Core Test)
 target_link_libraries(GreeterUsersModelTestExec
-    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
+    -L${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
     -llightdm-qt5-2
     )
 target_include_directories(GreeterUsersModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
     )
 add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
     ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
     DEPENDS MockLightDM
     LIGHTDM
-    )
\ No newline at end of file
+    )

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2015-03-02 21:34:02 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-07-08 19:22:49 +0000
@@ -20,7 +20,7 @@
 import "../../../qml/Greeter"
 import Ubuntu.Components 0.1
 import AccountsService 0.1
-import LightDM 0.1 as LightDM
+import IntegratedLightDM 0.1 as LightDM
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2015-01-20 11:50:19 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2015-07-08 19:22:49 +0000
@@ -20,7 +20,7 @@
 import "../../../qml/Greeter"
 import Ubuntu.Components 0.1
 import Unity.Test 0.1 as UT
-import LightDM 0.1 as LightDM
+import IntegratedLightDM 0.1 as LightDM
 
 Item {
     Binding {

=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
--- tests/qmltests/Greeter/tst_NarrowView.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2015-07-08 19:22:49 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import LightDM 0.1 as LightDM
+import IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 0.1
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2015-03-10 17:59:41 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2015-07-08 19:22:49 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import LightDM 0.1 as LightDM
+import IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 0.1
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-06-23 14:05:51 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-07-08 19:22:49 +0000
@@ -17,7 +17,8 @@
 import QtQuick 2.0
 import QtTest 1.0
 import AccountsService 0.1
-import LightDM 0.1 as LightDM
+import GSettings 1.0
+import IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 1.1
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-06-23 17:40:03 +0000
+++ tests/qmltests/tst_Shell.qml	2015-07-08 19:22:49 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import AccountsService 0.1
 import GSettings 1.0
-import LightDM 0.1 as LightDM
+import IntegratedLightDM 0.1 as LightDM
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Telephony 0.1 as Telephony

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2015-06-23 17:40:03 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2015-07-08 19:22:49 +0000
@@ -19,7 +19,7 @@
 import QtTest 1.0
 import AccountsService 0.1
 import GSettings 1.0
-import LightDM 0.1 as LightDM
+import IntegratedLightDM 0.1 as LightDM
 import Ubuntu.SystemImage 0.1
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Application 0.1