aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-11-28 16:23:40 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-11-28 16:23:40 +0100
commit2bddd36ebbded26ea25df00d3a5e028f50564267 (patch)
tree6e9536a3f96c91d47803bc01970110e53279ad13
parentc3ad1ba6d691d3b0d227652afc4f0cdb10a21a27 (diff)
downloadarctica-greeter-2bddd36ebbded26ea25df00d3a5e028f50564267.tar.gz
arctica-greeter-2bddd36ebbded26ea25df00d3a5e028f50564267.tar.bz2
arctica-greeter-2bddd36ebbded26ea25df00d3a5e028f50564267.zip
We also allow usernames for UCCS login.
-rw-r--r--debian/changelog1
-rw-r--r--src/user-list.vala2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bd63fd3..466a7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ unity-greeter-x2go (14.04.10-0x2go1) UNRELEASED; urgency=medium
- Make lightdm-xsession the default session to launch.
- If normal user sessions _and_ guest sessions are disabled,
make sure the remote login services gets activated.
+ - We also allow usernames for UCCS login.
* debian/control:
+ Add to S: lightdm-remote-session-x2go.
+ Drop from S: lightdm-remote-session-uccsconfigure.
diff --git a/src/user-list.vala b/src/user-list.vala
index 017ed6c..3cb341a 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -788,7 +788,7 @@ public class UserList : GreeterList
debug ("Calling get_cached_domains_for_server in com.canonical.RemoteLogin dbus service failed. Error: %s", e.message);
}
- var entry = add_prompt (_("Email address:"));
+ var entry = add_prompt (_("Email:") + " / " + _("Username:"));
entry.text = default_value;
widget = entry;
if (email_domains.length > 0)