diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-10-26 15:55:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-10-26 15:55:14 +0100 |
| commit | 5811d62df7f7df3855815ef36d3aeab3a27f7223 (patch) | |
| tree | 4880565855bcf554a8cf29283525b68dabd3ea31 | |
| parent | 1cfbd06c9fd8b1e45391e64df0e62d67c6cf905c (diff) | |
| download | arctica-greeter-5811d62df7f7df3855815ef36d3aeab3a27f7223.tar.gz arctica-greeter-5811d62df7f7df3855815ef36d3aeab3a27f7223.tar.bz2 arctica-greeter-5811d62df7f7df3855815ef36d3aeab3a27f7223.zip | |
Drop hard-reference to uccs.canonica.com. Make default Remote Logon Service server configurable through gsettings.
| -rw-r--r-- | data/org.ArcticaProject.arctica-greeter.gschema.xml | 4 | ||||
| -rw-r--r-- | src/settings.vala | 1 | ||||
| -rw-r--r-- | src/user-list.vala | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml index 70b4e38..b4a8d59 100644 --- a/data/org.ArcticaProject.arctica-greeter.gschema.xml +++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml @@ -98,5 +98,9 @@ <default>300</default> <summary>Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout.</summary> </key> + <key name="remote-service-fqdn" type="s"> + <default>'service.arctica-project.org'</default> + <summary>Default FQDN for host offering Remote Logon Service</summary> + </key> </schema> </schemalist> diff --git a/src/settings.vala b/src/settings.vala index 29d4136..6757b9c 100644 --- a/src/settings.vala +++ b/src/settings.vala @@ -41,6 +41,7 @@ public class AGSettings public static const string KEY_INDICATORS = "indicators"; public static const string KEY_HIDDEN_USERS = "hidden-users"; public static const string KEY_IDLE_TIMEOUT = "idle-timeout"; + public static const string KEY_REMOTE_SERVICE_FQDN = "remote-service-fqdn"; public static bool get_boolean (string key) { diff --git a/src/user-list.vala b/src/user-list.vala index 13b4bf9..c944926 100644 --- a/src/user-list.vala +++ b/src/user-list.vala @@ -554,12 +554,12 @@ public class UserList : GreeterList dialog.add_button (_("Cancel"), 0); var b = dialog.add_button (_("Set Up…"), 1); b.grab_focus (); - dialog.text = _("You need an Ubuntu Remote Login account to use this service. Would you like to set up an account now?"); + dialog.text = _("You need a Remote Logon account to use this service. Would you like to set up an account now?"); } else { dialog.add_button (_("OK"), 0); - dialog.text = _("You need an Ubuntu Remote Login account to use this service. Visit uccs.canonical.com to set up an account."); + dialog.text = _("You need a Remote Logon account to use this service. Visit https://%s to set up an account.", AGSettings.get_string (AGSettings.KEY_REMOTE_SERVICE_FQDN)); } dialog.show_all (); |