diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2011-07-19 14:44:22 +1000 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2011-07-19 14:44:22 +1000 |
| commit | 39f93a22f857505c0cb5f0fd53d72b2ef49b0ff5 (patch) | |
| tree | de466655193dc8059061aed09cda4662af34e81f /liblightdm-qt/greeter.cpp | |
| parent | d7523f3cf087f104f49d5734edb275ca5c485d20 (diff) | |
| download | lightdm-39f93a22f857505c0cb5f0fd53d72b2ef49b0ff5.tar.gz | |
Update liblightdm-qt API to match liblightdm-gobject
Diffstat (limited to 'liblightdm-qt/greeter.cpp')
| -rw-r--r-- | liblightdm-qt/greeter.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp index a9865138..249a910c 100644 --- a/liblightdm-qt/greeter.cpp +++ b/liblightdm-qt/greeter.cpp @@ -173,7 +173,7 @@ QString Greeter::readString(int *offset) void Greeter::connectToServer() { QDBusConnection busType = QDBusConnection::systemBus(); - QString ldmBus(qgetenv("LDM_BUS")); + QString ldmBus(qgetenv("LIGHTDM_BUS")); if(ldmBus == QLatin1String("SESSION")) { busType = QDBusConnection::sessionBus(); } @@ -360,14 +360,16 @@ void Greeter::onRead(int fd) switch (msg_style) { case PAM_PROMPT_ECHO_OFF: + emit showPrompt(msg, PROMPT_TYPE_SECRET); + break; case PAM_PROMPT_ECHO_ON: - emit showPrompt(msg); + emit showPrompt(msg, PROMPT_TYPE_QUESTION); break; case PAM_ERROR_MSG: - emit showError(msg); + emit showMessage(msg, MESSAGE_TYPE_ERROR); break; case PAM_TEXT_INFO: - emit showMessage(msg); + emit showMessage(msg, MESSAGE_TYPE_INFO); break; } } @@ -385,7 +387,7 @@ void Greeter::onRead(int fd) if(!d->isAuthenticated) { d->authenticationUser = ""; } - emit authenticationComplete(d->isAuthenticated); + emit authenticationComplete(); d->inAuthentication = false; } else |