From 5811d62df7f7df3855815ef36d3aeab3a27f7223 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 26 Oct 2015 15:55:14 +0100 Subject: Drop hard-reference to uccs.canonica.com. Make default Remote Logon Service server configurable through gsettings. --- data/org.ArcticaProject.arctica-greeter.gschema.xml | 4 ++++ src/settings.vala | 1 + 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 @@ 300 Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout. + + 'service.arctica-project.org' + Default FQDN for host offering Remote Logon Service + 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 (); -- cgit v1.2.3