Viewing all changes in revision 1691.
- Committer: Robert Ancell
- Date: 2014-11-12 03:55:28 UTC
- mfrom: (1685.2.408 trunk)
- Revision ID: robert.ancell@canonical.com-20141112035528-oh1lj884yquxih4l
Merge with trunk
- files added:
- common
- files removed:
- data/lightdm-set-defaults.1
- utils
- files renamed:
- src/configuration.c => common/configuration.c
- src/configuration.h => common/configuration.h
- src/dmrc.c => common/dmrc.c
- src/dmrc.h => common/dmrc.h
- src/privileges.c => common/privileges.c
- src/privileges.h => common/privileges.h
- liblightdm-gobject/user.c => common/user-list.c
- debian/guest-account => debian/guest-account.sh
- utils/dm-tool.c => src/dm-tool.c
- src/lightdm-guest-session-wrapper.c => src/lightdm-guest-session.c
- tests/scripts/pam.conf => tests/scripts/autologin-pam.conf
- tests/scripts/script-hook-fail-display-setup.conf => tests/scripts/script-hook-display-setup-fail.conf
- tests/scripts/script-hook-fail-greeter-setup.conf => tests/scripts/script-hook-greeter-setup-fail.conf
- tests/scripts/script-hook-fail-session-setup.conf => tests/scripts/script-hook-session-setup-fail.conf
- tests/test-autologin-gobject-guest-timeout => tests/test-autologin-guest-timeout-gobject
- tests/test-autologin-python-guest-timeout => tests/test-autologin-guest-timeout-python
- tests/test-autologin-qt4-guest-timeout => tests/test-autologin-guest-timeout-qt4
- tests/test-autologin-qt5-guest-timeout => tests/test-autologin-guest-timeout-qt5
- tests/test-pam => tests/test-autologin-pam
- tests/test-autologin-gobject-timeout => tests/test-autologin-timeout-gobject
- tests/test-autologin-python-timeout => tests/test-autologin-timeout-python
- tests/test-autologin-qt4-timeout => tests/test-autologin-timeout-qt4
- tests/test-autologin-qt5-timeout => tests/test-autologin-timeout-qt5
- tests/test-gobject-cancel-authentication => tests/test-cancel-authentication-gobject
- tests/test-python-cancel-authentication => tests/test-cancel-authentication-python
- tests/test-qt4-cancel-authentication => tests/test-cancel-authentication-qt4
- tests/test-qt5-cancel-authentication => tests/test-cancel-authentication-qt5
- tests/test-login-gobject-guest-disabled => tests/test-login-guest-disabled-gobject
- tests/test-login-python-guest-disabled => tests/test-login-guest-disabled-python
- tests/test-login-qt4-guest-disabled => tests/test-login-guest-disabled-qt4
- tests/test-login-qt5-guest-disabled => tests/test-login-guest-disabled-qt5
- tests/test-login-gobject-guest-fail-setup-script => tests/test-login-guest-fail-setup-script-gobject
- tests/test-login-python-guest-fail-setup-script => tests/test-login-guest-fail-setup-script-python
- tests/test-login-qt4-guest-fail-setup-script => tests/test-login-guest-fail-setup-script-qt4
- tests/test-login-qt5-guest-fail-setup-script => tests/test-login-guest-fail-setup-script-qt5
- tests/test-login-gobject-guest => tests/test-login-guest-gobject
- tests/test-login-gobject-guest-logout => tests/test-login-guest-logout-gobject
- tests/test-login-python-guest-logout => tests/test-login-guest-logout-python
- tests/test-login-qt4-guest-logout => tests/test-login-guest-logout-qt4
- tests/test-login-qt5-guest-logout => tests/test-login-guest-logout-qt5
- tests/test-login-gobject-guest-no-setup-script => tests/test-login-guest-no-setup-script-gobject
- tests/test-login-python-guest-no-setup-script => tests/test-login-guest-no-setup-script-python
- tests/test-login-qt4-guest-no-setup-script => tests/test-login-guest-no-setup-script-qt4
- tests/test-login-qt5-guest-no-setup-script => tests/test-login-guest-no-setup-script-qt5
- tests/test-login-python-guest => tests/test-login-guest-python
- tests/test-login-qt4-guest => tests/test-login-guest-qt4
- tests/test-login-qt5-guest => tests/test-login-guest-qt5
- tests/test-login-gobject-info-prompt => tests/test-login-info-prompt-gobject
- tests/test-login-python-info-prompt => tests/test-login-info-prompt-python
- tests/test-login-qt4-info-prompt => tests/test-login-info-prompt-qt4
- tests/test-login-qt5-info-prompt => tests/test-login-info-prompt-qt5
- tests/test-login-gobject-invalid-session => tests/test-login-invalid-session-gobject
- tests/test-login-python-invalid-session => tests/test-login-invalid-session-python
- tests/test-login-qt4-invalid-session => tests/test-login-invalid-session-qt4
- tests/test-login-qt5-invalid-session => tests/test-login-invalid-session-qt5
- tests/test-login-gobject-invalid-user => tests/test-login-invalid-user-gobject
- tests/test-login-python-invalid-user => tests/test-login-invalid-user-python
- tests/test-login-qt4-invalid-user => tests/test-login-invalid-user-qt4
- tests/test-login-qt5-invalid-user => tests/test-login-invalid-user-qt5
- tests/test-login-gobject-logout => tests/test-login-logout-gobject
- tests/test-login-python-logout => tests/test-login-logout-python
- tests/test-login-qt4-logout => tests/test-login-logout-qt4
- tests/test-login-qt5-logout => tests/test-login-logout-qt5
- tests/test-login-gobject-long-password => tests/test-login-long-password-gobject
- tests/test-login-python-long-password => tests/test-login-long-password-python
- tests/test-login-qt4-long-password => tests/test-login-long-password-qt4
- tests/test-login-qt5-long-password => tests/test-login-long-password-qt5
- tests/test-login-gobject-long-username => tests/test-login-long-username-gobject
- tests/test-login-python-long-username => tests/test-login-long-username-python
- tests/test-login-qt4-long-username => tests/test-login-long-username-qt4
- tests/test-login-qt5-long-username => tests/test-login-long-username-qt5
- tests/test-login-gobject-manual => tests/test-login-manual-gobject
- tests/test-login-gobject-manual-previous-session => tests/test-login-manual-previous-session-gobject
- tests/test-login-python-manual-previous-session => tests/test-login-manual-previous-session-python
- tests/test-login-qt4-manual-previous-session => tests/test-login-manual-previous-session-qt4
- tests/test-login-qt5-manual-previous-session => tests/test-login-manual-previous-session-qt5
- tests/test-login-python-manual => tests/test-login-manual-python
- tests/test-login-qt4-manual => tests/test-login-manual-qt4
- tests/test-login-qt5-manual => tests/test-login-manual-qt5
- tests/test-login-gobject-manual-remember-session => tests/test-login-manual-remember-session-gobject
- tests/test-login-python-manual-remember-session => tests/test-login-manual-remember-session-python
- tests/test-login-qt4-manual-remember-session => tests/test-login-manual-remember-session-qt4
- tests/test-login-qt5-manual-remember-session => tests/test-login-manual-remember-session-qt5
- tests/test-login-gobject-multi-info-prompt => tests/test-login-multi-info-prompt-gobject
- tests/test-login-python-multi-info-prompt => tests/test-login-multi-info-prompt-python
- tests/test-login-qt4-multi-info-prompt => tests/test-login-multi-info-prompt-qt4
- tests/test-login-qt5-multi-info-prompt => tests/test-login-multi-info-prompt-qt5
- tests/test-login-gobject-multi-prompt => tests/test-login-multi-prompt-gobject
- tests/test-login-gobject-new-authtok => tests/test-login-new-authtok-gobject
- tests/test-login-python-new-authtok => tests/test-login-new-authtok-python
- tests/test-login-qt4-new-authtok => tests/test-login-new-authtok-qt4
- tests/test-login-qt5-new-authtok => tests/test-login-new-authtok-qt5
- tests/test-login-gobject-no-password => tests/test-login-no-password-gobject
- tests/test-login-python-no-password => tests/test-login-no-password-python
- tests/test-login-qt4-no-password => tests/test-login-no-password-qt4
- tests/test-login-qt5-no-password => tests/test-login-no-password-qt5
- tests/test-login-gobject-pick-session => tests/test-login-pick-session-gobject
- tests/test-login-python-pick-session => tests/test-login-pick-session-python
- tests/test-login-qt4-pick-session => tests/test-login-pick-session-qt4
- tests/test-login-qt5-pick-session => tests/test-login-pick-session-qt5
- tests/test-login-gobject-previous-session => tests/test-login-previous-session-gobject
- tests/test-login-python-previous-session => tests/test-login-previous-session-python
- tests/test-login-qt4-previous-session => tests/test-login-previous-session-qt4
- tests/test-login-qt5-previous-session => tests/test-login-previous-session-qt5
- tests/test-login-gobject-remember-session => tests/test-login-remember-session-gobject
- tests/test-login-python-remember-session => tests/test-login-remember-session-python
- tests/test-login-qt4-remember-session => tests/test-login-remember-session-qt4
- tests/test-login-qt5-remember-session => tests/test-login-remember-session-qt5
- tests/test-login-gobject-remote-session => tests/test-login-remote-session-gobject
- tests/test-login-python-remote-session => tests/test-login-remote-session-python
- tests/test-login-qt4-remote-session => tests/test-login-remote-session-qt4
- tests/test-login-qt5-remote-session => tests/test-login-remote-session-qt5
- tests/test-login-gobject-two-factor => tests/test-login-two-factor-gobject
- tests/test-login-python-two-factor => tests/test-login-two-factor-python
- tests/test-login-qt4-two-factor => tests/test-login-two-factor-qt4
- tests/test-login-qt5-two-factor => tests/test-login-two-factor-qt5
- tests/test-login-gobject-wrong-password => tests/test-login-wrong-password-gobject
- tests/test-login-python-wrong-password => tests/test-login-wrong-password-python
- tests/test-login-qt4-wrong-password => tests/test-login-wrong-password-qt4
- tests/test-login-qt5-wrong-password => tests/test-login-wrong-password-qt5
- tests/test-gobject-power => tests/test-power-gobject
- tests/test-gobject-power-no-console-kit => tests/test-power-no-console-kit-gobject
- tests/test-python-power-no-console-kit => tests/test-power-no-console-kit-python
- tests/test-qt4-power-no-console-kit => tests/test-power-no-console-kit-qt4
- tests/test-qt5-power-no-console-kit => tests/test-power-no-console-kit-qt5
- tests/test-gobject-power-no-login1 => tests/test-power-no-login1-gobject
- tests/test-python-power-no-login1 => tests/test-power-no-login1-python
- tests/test-qt4-power-no-login1 => tests/test-power-no-login1-qt4
- tests/test-qt5-power-no-login1 => tests/test-power-no-login1-qt5
- tests/test-gobject-power-no-services => tests/test-power-no-services-gobject
- tests/test-python-power-no-services => tests/test-power-no-services-python
- tests/test-qt4-power-no-services => tests/test-power-no-services-qt4
- tests/test-qt5-power-no-services => tests/test-power-no-services-qt5
- tests/test-python-power => tests/test-power-python
- tests/test-qt4-power => tests/test-power-qt4
- tests/test-qt5-power => tests/test-power-qt5
- tests/test-script-hook-fail-display-setup => tests/test-script-hook-display-setup-fail
- tests/test-script-hook-fail-greeter-setup => tests/test-script-hook-greeter-setup-fail
- tests/test-script-hook-fail-session-setup => tests/test-script-hook-session-setup-fail
- files modified:
- .bzrignore
expand all
collapse all
added
removed
