diff options
21 files changed, 40 insertions, 38 deletions
@@ -3,6 +3,8 @@ Overview of changes in lightdm 0.4.4 * Simplify Vala bindings * Allow a null username to log in with - the system will prompt for a username. + * Rename ldm_greeter_provide_secret to ldm_greeter_respond - responses + may not be secrets. Overview of changes in lightdm 0.4.3 diff --git a/doc/lightdm-gobject-0-sections.txt b/doc/lightdm-gobject-0-sections.txt index dfc3b451..fdd0deac 100644 --- a/doc/lightdm-gobject-0-sections.txt +++ b/doc/lightdm-gobject-0-sections.txt @@ -126,7 +126,7 @@ ldm_greeter_cancel_timed_login ldm_greeter_login ldm_greeter_login_with_user_prompt ldm_greeter_login_as_guest -ldm_greeter_provide_secret +ldm_greeter_respond ldm_greeter_cancel_authentication ldm_greeter_get_in_authentication ldm_greeter_get_is_authenticated diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml index 6e25e18b..3cd62f42 100644 --- a/doc/tmpl/greeter.sgml +++ b/doc/tmpl/greeter.sgml @@ -33,7 +33,7 @@ static void show_prompt_cb (LdmGreeter *greeter, const char *text) gchar *secret = prompt_user (text); // Give the result to the user - ldm_greeter_provide_secret (greeter, secret); + ldm_greeter_respond (greeter, secret); } static void authentication_complete_cb (LdmGreeter *greeter) @@ -448,13 +448,13 @@ g_object_connect (G_OBJECT (greeter), "quit", G_CALLBACK (quit_cb), NULL); @greeter: -<!-- ##### FUNCTION ldm_greeter_provide_secret ##### --> +<!-- ##### FUNCTION ldm_greeter_respond ##### --> <para> </para> @greeter: -@secret: +@response: <!-- ##### FUNCTION ldm_greeter_cancel_authentication ##### --> diff --git a/greeters/gtk/lightdm-example-gtk-greeter.c b/greeters/gtk/lightdm-example-gtk-greeter.c index b9dc75e0..b39cce9f 100644 --- a/greeters/gtk/lightdm-example-gtk-greeter.c +++ b/greeters/gtk/lightdm-example-gtk-greeter.c @@ -144,7 +144,7 @@ login_cb (GtkWidget *widget) if (!ldm_greeter_get_in_authentication (greeter)) start_authentication (gtk_entry_get_text (GTK_ENTRY (prompt_entry))); else - ldm_greeter_provide_secret (greeter, gtk_entry_get_text (GTK_ENTRY (prompt_entry))); + ldm_greeter_respond (greeter, gtk_entry_get_text (GTK_ENTRY (prompt_entry))); gtk_entry_set_text (GTK_ENTRY (prompt_entry), ""); } diff --git a/greeters/python-gtk/lightdm-example-python-gtk-greeter b/greeters/python-gtk/lightdm-example-python-gtk-greeter index abed7e0f..e920e31f 100755 --- a/greeters/python-gtk/lightdm-example-python-gtk-greeter +++ b/greeters/python-gtk/lightdm-example-python-gtk-greeter @@ -237,7 +237,7 @@ class Greeter: def password_activate_cb(self, widget): self.password_entry.set_sensitive(False) - self.greeter.provide_secret(self.password_entry.get_text()) + self.greeter.respond(self.password_entry.get_text()) def show_prompt_cb(self, greeter, text): self.password_entry.show() diff --git a/greeters/qt/loginprompt.cpp b/greeters/qt/loginprompt.cpp index fb632985..2f9d57b0 100644 --- a/greeters/qt/loginprompt.cpp +++ b/greeters/qt/loginprompt.cpp @@ -64,5 +64,5 @@ void LoginPrompt::onAuthenticationComplete(bool success) void LoginPrompt::prompt(const QString &message) { qDebug() << message; - m_greeter->provideSecret(ui->password->text()); + m_greeter->respond(ui->password->text()); } diff --git a/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala b/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala index f3794831..b628caa5 100644 --- a/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala +++ b/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala @@ -31,7 +31,7 @@ class Greeter private void password_activate_cb (Gtk.Entry entry) { password_entry.sensitive = false; - greeter.provide_secret (password_entry.text); + greeter.respond (password_entry.text); } private void connect_cb (LightDM.Greeter greeter) diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c index 9bbd3d75..e2be576a 100644 --- a/liblightdm-gobject/greeter.c +++ b/liblightdm-gobject/greeter.c @@ -1327,26 +1327,26 @@ ldm_greeter_login_as_guest (LdmGreeter *greeter) } /** - * ldm_greeter_provide_secret: + * ldm_greeter_respond: * @greeter: A #LdmGreeter - * @secret: Response to a prompt + * @response: Response to a prompt * - * Provide secret information from a prompt. + * Provide response to a prompt. **/ void -ldm_greeter_provide_secret (LdmGreeter *greeter, const gchar *secret) +ldm_greeter_respond (LdmGreeter *greeter, const gchar *response) { guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; g_return_if_fail (LDM_IS_GREETER (greeter)); - g_return_if_fail (secret != NULL); + g_return_if_fail (response != NULL); - g_debug ("Providing secret to display manager"); - write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_CONTINUE_AUTHENTICATION, int_length () + string_length (secret), &offset); - // FIXME: Could be multiple secrets required + g_debug ("Providing response to display manager"); + write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_CONTINUE_AUTHENTICATION, int_length () + string_length (response), &offset); + // FIXME: Could be multiple responses required write_int (message, MAX_MESSAGE_LENGTH, 1, &offset); - write_string (message, MAX_MESSAGE_LENGTH, secret, &offset); + write_string (message, MAX_MESSAGE_LENGTH, response, &offset); write_message (greeter, message, offset); } @@ -1933,7 +1933,7 @@ ldm_greeter_class_init (LdmGreeterClass *klass) * prompt to the user. The given text should be displayed and an input * field for the user to provide a response. * - * Call ldm_greeter_provide_secret() with the resultant input or + * Call ldm_greeter_respond() with the resultant input or * ldm_greeter_cancel_authentication() to abort the authentication. **/ signals[SHOW_PROMPT] = diff --git a/liblightdm-gobject/liblightdm-gobject-0.vapi b/liblightdm-gobject/liblightdm-gobject-0.vapi index c91c96f6..cf3b7bf3 100644 --- a/liblightdm-gobject/liblightdm-gobject-0.vapi +++ b/liblightdm-gobject/liblightdm-gobject-0.vapi @@ -27,7 +27,7 @@ namespace LightDM { public void hibernate (); public void start_session (string? session); public void start_default_session (); - public void provide_secret (string secret); + public void respond (string response); public void set_layout (string layout); public void login_as_guest (); public unowned string default_language { get; } diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h index db8848fb..c7e66f9a 100644 --- a/liblightdm-gobject/lightdm/greeter.h +++ b/liblightdm-gobject/lightdm/greeter.h @@ -107,7 +107,7 @@ void ldm_greeter_login_with_user_prompt (LdmGreeter *greeter); void ldm_greeter_login_as_guest (LdmGreeter *greeter); -void ldm_greeter_provide_secret (LdmGreeter *greeter, const gchar *secret); +void ldm_greeter_respond (LdmGreeter *greeter, const gchar *response); void ldm_greeter_cancel_authentication (LdmGreeter *greeter); diff --git a/liblightdm-qt/QLightDM/greeter.cpp b/liblightdm-qt/QLightDM/greeter.cpp index c4cb4c31..92f1c5fe 100644 --- a/liblightdm-qt/QLightDM/greeter.cpp +++ b/liblightdm-qt/QLightDM/greeter.cpp @@ -236,13 +236,13 @@ void Greeter::loginAsGuest() flush(); } -void Greeter::provideSecret(const QString &secret) +void Greeter::respond(const QString &response) { - qDebug() << "Providing secret to display manager"; - writeHeader(GREETER_MESSAGE_CONTINUE_AUTHENTICATION, intLength() + stringLength(secret)); - // FIXME: Could be multiple secrets required + qDebug() << "Providing response to display manager"; + writeHeader(GREETER_MESSAGE_CONTINUE_AUTHENTICATION, intLength() + stringLength(response)); + // FIXME: Could be multiple response required writeInt(1); - writeString(secret); + writeString(response); flush(); } diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h index b387ecc8..50808b7e 100644 --- a/liblightdm-qt/QLightDM/greeter.h +++ b/liblightdm-qt/QLightDM/greeter.h @@ -80,7 +80,7 @@ namespace QLightDM void cancelTimedLogin(); void login(const QString &username); void loginAsGuest(); - void provideSecret(const QString &secret); + void respond(const QString &response); void cancelAuthentication(); void startSession(const QString &session=QString()); diff --git a/tests/scripts/login-gobject-invalid-user.script b/tests/scripts/login-gobject-invalid-user.script index cc9fce8f..65a23e5d 100644 --- a/tests/scripts/login-gobject-invalid-user.script +++ b/tests/scripts/login-gobject-invalid-user.script @@ -9,7 +9,7 @@ GREETER CONNECT-TO-DAEMON GREETER CONNECTED-TO-DAEMON GREETER LOGIN USERNAME=notauser GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE *STOP-DAEMON # Don't know what order they will terminate diff --git a/tests/scripts/login-gobject-logout.script b/tests/scripts/login-gobject-logout.script index ae4bb0b0..2461802d 100644 --- a/tests/scripts/login-gobject-logout.script +++ b/tests/scripts/login-gobject-logout.script @@ -9,7 +9,7 @@ GREETER CONNECT-TO-DAEMON GREETER CONNECTED-TO-DAEMON GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE GREETER QUIT SESSION START USER=alice diff --git a/tests/scripts/login-gobject-manual.script b/tests/scripts/login-gobject-manual.script index 6433ca03..98b231e3 100644 --- a/tests/scripts/login-gobject-manual.script +++ b/tests/scripts/login-gobject-manual.script @@ -15,9 +15,9 @@ GREETER CONNECTED-TO-DAEMON # Login as alice, but let lightdm prompt for a username GREETER LOGIN GREETER SHOW-PROMPT TEXT="login:" -GREETER PROVIDE-SECRET TEXT="alice" +GREETER RESPOND TEXT="alice" GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE # Greeter quits and session starts diff --git a/tests/scripts/login-gobject-session-crash.script b/tests/scripts/login-gobject-session-crash.script index e677fcf1..ff19a5b7 100644 --- a/tests/scripts/login-gobject-session-crash.script +++ b/tests/scripts/login-gobject-session-crash.script @@ -9,7 +9,7 @@ GREETER CONNECT-TO-DAEMON GREETER CONNECTED-TO-DAEMON GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE GREETER QUIT SESSION START USER=alice diff --git a/tests/scripts/login-gobject-wrong-password.script b/tests/scripts/login-gobject-wrong-password.script index 74b8568b..085dd597 100644 --- a/tests/scripts/login-gobject-wrong-password.script +++ b/tests/scripts/login-gobject-wrong-password.script @@ -9,7 +9,7 @@ GREETER CONNECT-TO-DAEMON GREETER CONNECTED-TO-DAEMON GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="rubbish" +GREETER RESPOND TEXT="rubbish" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE *STOP-DAEMON # Don't know what order they will terminate diff --git a/tests/scripts/login-gobject-xserver-crash.script b/tests/scripts/login-gobject-xserver-crash.script index e03a8d66..6b2a79bc 100644 --- a/tests/scripts/login-gobject-xserver-crash.script +++ b/tests/scripts/login-gobject-xserver-crash.script @@ -15,7 +15,7 @@ GREETER CONNECTED-TO-DAEMON # Log in as alice GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE # Greeter quits, and session starts diff --git a/tests/scripts/login-gobject.script b/tests/scripts/login-gobject.script index 59075191..ef6d9f0b 100644 --- a/tests/scripts/login-gobject.script +++ b/tests/scripts/login-gobject.script @@ -9,7 +9,7 @@ GREETER CONNECT-TO-DAEMON GREETER CONNECTED-TO-DAEMON GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE GREETER QUIT SESSION START USER=alice diff --git a/tests/scripts/switch-to-user.script b/tests/scripts/switch-to-user.script index 256fcc41..8ff2c89f 100644 --- a/tests/scripts/switch-to-user.script +++ b/tests/scripts/switch-to-user.script @@ -16,7 +16,7 @@ GREETER CONNECTED-TO-DAEMON # Alice is logged in GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE GREETER QUIT SESSION START USER=alice @@ -43,7 +43,7 @@ GREETER CONNECTED-TO-DAEMON # Log in as alice GREETER LOGIN USERNAME=alice GREETER SHOW-PROMPT TEXT="Password:" -GREETER PROVIDE-SECRET TEXT="password" +GREETER RESPOND TEXT="password" GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE # New display should quit, and first login should be actived diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index e470051d..a7870eff 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -70,8 +70,8 @@ show_prompt_cb (LdmGreeter *greeter, const gchar *text) if (response) { - notify_status ("GREETER PROVIDE-SECRET TEXT=\"%s\"", response); - ldm_greeter_provide_secret (greeter, response); + notify_status ("GREETER RESPOND TEXT=\"%s\"", response); + ldm_greeter_respond (greeter, response); } g_free (username); |