diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2011-07-19 16:40:33 +1000 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2011-07-19 16:40:33 +1000 |
commit | afa0ab56faa78e7ac6eef409ec2a89992e153896 (patch) | |
tree | ff960ffb270895a520c8b242ae6ebaec58596a3a /liblightdm-qt/greeter.cpp | |
parent | bb700a166d0416462e511189c9804634f11e5d16 (diff) | |
download | lightdm-afa0ab56faa78e7ac6eef409ec2a89992e153896.tar.gz |
Really tidy up liblightdm
Diffstat (limited to 'liblightdm-qt/greeter.cpp')
-rw-r--r-- | liblightdm-qt/greeter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp index 249a910c..89ea1808 100644 --- a/liblightdm-qt/greeter.cpp +++ b/liblightdm-qt/greeter.cpp @@ -35,8 +35,8 @@ typedef enum { GREETER_MESSAGE_CONNECT = 0, - GREETER_MESSAGE_LOGIN, - GREETER_MESSAGE_LOGIN_AS_GUEST, + GREETER_MESSAGE_AUTHENTICATE, + GREETER_MESSAGE_AUTHENTICATE_AS_GUEST, GREETER_MESSAGE_CONTINUE_AUTHENTICATION, GREETER_MESSAGE_START_SESSION, GREETER_MESSAGE_CANCEL_AUTHENTICATION @@ -209,21 +209,21 @@ void Greeter::connectToServer() flush(); } -void Greeter::login(const QString &username) +void Greeter::authenticate(const QString &username) { d->inAuthentication = true; d->isAuthenticated = false; d->cancellingAuthentication = false; d->authenticationUser = username; qDebug() << "Starting authentication for user " << username << "..."; - writeHeader(GREETER_MESSAGE_LOGIN, intLength() + stringLength(username)); + writeHeader(GREETER_MESSAGE_AUTHENTICATE, intLength() + stringLength(username)); d->authenticateSequenceNumber++; writeInt(d->authenticateSequenceNumber); writeString(username); flush(); } -void Greeter::loginAsGuest() +void Greeter::authenticateAsGuest() { d->authenticateSequenceNumber++; d->inAuthentication = true; @@ -231,7 +231,7 @@ void Greeter::loginAsGuest() d->cancellingAuthentication = false; d->authenticationUser = ""; qDebug() << "Starting authentication for guest account"; - writeHeader(GREETER_MESSAGE_LOGIN_AS_GUEST, intLength()); + writeHeader(GREETER_MESSAGE_AUTHENTICATE_AS_GUEST, intLength()); writeInt(d->authenticateSequenceNumber); flush(); } |