diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-05-11 20:43:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-05-11 20:43:15 +0200 |
| commit | 606273e4343ff3bad3f4525f2e2cf6f9fbbd491a (patch) | |
| tree | 9fe778ba800a3e91c1bc3c6e840897a8a665f7f5 | |
| parent | b54ac1c26655ea178dbd2bed2c69648d521a62ec (diff) | |
| download | arctica-greeter-606273e4343ff3bad3f4525f2e2cf6f9fbbd491a.tar.gz arctica-greeter-606273e4343ff3bad3f4525f2e2cf6f9fbbd491a.tar.bz2 arctica-greeter-606273e4343ff3bad3f4525f2e2cf6f9fbbd491a.zip | |
src/user-list.vala: Rename gsettings key remote-service-fqdn to remote-service-configure-uri. Support an empty string as value and show a more intelligent message if it's empty.
| -rw-r--r-- | data/org.ArcticaProject.arctica-greeter.gschema.xml | 4 | ||||
| -rw-r--r-- | src/settings.vala | 2 | ||||
| -rw-r--r-- | src/user-list.vala | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml index 95ab139..b7991a4 100644 --- a/data/org.ArcticaProject.arctica-greeter.gschema.xml +++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml @@ -115,8 +115,8 @@ <default>'auto'</default> <summary>Whether to enable HiDPI support</summary> </key> - <key name="remote-service-fqdn" type="s"> - <default>'service.arctica-project.org'</default> + <key name="remote-service-configure-uri" type="s"> + <default>''</default> <summary>Default FQDN for host offering Remote Logon Service</summary> </key> <key name="activate-numlock" type="b"> diff --git a/src/settings.vala b/src/settings.vala index 441035b..0372721 100644 --- a/src/settings.vala +++ b/src/settings.vala @@ -44,7 +44,7 @@ public class AGSettings public const string KEY_GROUP_FILTER = "group-filter"; public const string KEY_IDLE_TIMEOUT = "idle-timeout"; public const string KEY_ACTIVATE_NUMLOCK = "activate-numlock"; - public const string KEY_REMOTE_SERVICE_FQDN = "remote-service-fqdn"; + public const string KEY_REMOTE_SERVICE_CONFIGURE_URI = "remote-service-configure-uri"; public const string KEY_TOGGLEBOX_FONT_FGCOLOR = "togglebox-font-fgcolor"; public const string KEY_TOGGLEBOX_BUTTON_BGCOLOR = "togglebox-button-bgcolor"; public const string KEY_ENABLE_HIDPI = "enable-hidpi"; diff --git a/src/user-list.vala b/src/user-list.vala index cb2be6e..0991703 100644 --- a/src/user-list.vala +++ b/src/user-list.vala @@ -561,7 +561,10 @@ public class UserList : GreeterList else { dialog.add_button (_("OK"), 0); - dialog.text = _("You need a Remote Logon account to use this service. Visit https://%s to set up an account.").printf(AGSettings.get_string (AGSettings.KEY_REMOTE_SERVICE_FQDN)); + if ("" != AGSettings.get_string (AGSettings.KEY_REMOTE_SERVICE_CONFIGURE_URI)) + dialog.text = _("You need a Remote Logon account to use this service. Visit %s to request an account.").printf(AGSettings.get_string (AGSettings.KEY_REMOTE_SERVICE_CONFIGURE_URI)); + else + dialog.text = _("You need a Remote Logon account to use this service. Please ask your site administrator for details."); } dialog.show_all (); |