diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2011-06-10 10:46:53 +1000 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2011-06-10 10:46:53 +1000 |
commit | f7046152759530d5ea1372c065be22c0d98ec6b1 (patch) | |
tree | b23908e3c72e94db3f702edd48179a796ae42b9a /tests | |
parent | 6a111512744e477ccb54fddd639d943e1b40c4f0 (diff) | |
download | lightdm-f7046152759530d5ea1372c065be22c0d98ec6b1.tar.gz |
Configure username/password simpler
Diffstat (limited to 'tests')
-rw-r--r-- | tests/data/themes/login-alice/index.theme | 3 | ||||
-rw-r--r-- | tests/src/test-gobject-greeter.c | 34 |
2 files changed, 13 insertions, 24 deletions
diff --git a/tests/data/themes/login-alice/index.theme b/tests/data/themes/login-alice/index.theme index 3353f865..96118bcf 100644 --- a/tests/data/themes/login-alice/index.theme +++ b/tests/data/themes/login-alice/index.theme @@ -1,3 +1,4 @@ [theme] engine=test-gobject-greeter -login=alice:password +username=alice +password=password diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index ebb5b4fa..55e9a627 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -5,33 +5,18 @@ #include "status.h" -static gchar *login_username = NULL, *login_password = NULL; - static void connected_cb (LdmGreeter *greeter) { - gchar *login; + gchar *username; notify_status ("GREETER CONNECTED-TO-DAEMON"); - login = ldm_greeter_get_string_property (greeter, "login"); - if (login) + username = ldm_greeter_get_string_property (greeter, "username"); + if (username) { - gchar **items; - items = g_strsplit (login, ":", -1); - if (items[0]) - { - login_username = g_strdup (items[0]); - if (items[1]) - login_password = g_strdup (items[1]); - } - g_free (login); - } - - if (login_username) - { - notify_status ("GREETER LOGIN USERNAME=%s", login_username); - ldm_greeter_login (greeter, login_username); + notify_status ("GREETER LOGIN USERNAME=%s", username); + ldm_greeter_login (greeter, username); } } @@ -50,12 +35,15 @@ show_error_cb (LdmGreeter *greeter, const gchar *text) static void show_prompt_cb (LdmGreeter *greeter, const gchar *text) { + gchar *password; + notify_status ("GREETER SHOW-PROMPT TEXT=\"%s\"", text); - if (login_password) + password = ldm_greeter_get_string_property (greeter, "password"); + if (password) { - notify_status ("GREETER PROVIDE-SECRET TEXT=\"%s\"", login_password); - ldm_greeter_provide_secret (greeter, login_password); + notify_status ("GREETER PROVIDE-SECRET TEXT=\"%s\"", password); + ldm_greeter_provide_secret (greeter, password); } } |