Merge lp:~mterry/unity-greeter/remote-login-hint into lp:unity-greeter

[Michael Terry]

This is greeter follow-on for https://code.launchpad.net/~mterry/lightdm/remote-login-hint/+merge/123797

[lp:~mterry/unity-greeter/remote-login-hint]

573. By Michael Terry on 2012-09-17

merge from trunk

=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2012-08-21 14:49:00 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2012-09-17 18:00:47 +0000
@@ -82,9 +82,5 @@
       <default>true</default>
       <summary>Whether to play sound when greeter is ready</summary>
     </key>
-    <key name="enable-remote-login" type="b">
-      <default>false</default>
-      <summary>Whether to enable Remote Login or not</summary>
-    </key>
   </schema>
 </schemalist>

=== modified file 'src/settings.vala'
--- src/settings.vala	2012-08-27 22:30:33 +0000
+++ src/settings.vala	2012-09-17 18:00:47 +0000
@@ -37,7 +37,6 @@
     public static const string KEY_HIGH_CONTRAST = "high-contrast";
     public static const string KEY_SCREEN_READER = "screen-reader";
     public static const string KEY_PLAY_READY_SOUND = "play-ready-sound";
-    public static const string KEY_ENABLE_REMOTE_LOGIN = "enable-remote-login";
 
     public static bool get_boolean (string key)
     {

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-09-04 14:45:06 +0000
+++ src/unity-greeter.vala	2012-09-17 18:00:47 +0000
@@ -247,6 +247,11 @@
         return greeter.show_manual_login_hint;
     }
 
+    public bool show_remote_login_hint ()
+    {
+        return greeter.show_remote_login_hint;
+    }
+
     public bool hide_users_hint ()
     {
         return greeter.hide_users_hint;

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-09-17 17:12:13 +0000
+++ src/user-list.vala	2012-09-17 18:00:47 +0000
@@ -129,7 +129,8 @@
 
         connect_to_lightdm ();
 
-        if (!UnityGreeter.singleton.test_mode && UGSettings.get_boolean (UGSettings.KEY_ENABLE_REMOTE_LOGIN))
+        if (!UnityGreeter.singleton.test_mode &&
+            UnityGreeter.singleton.show_remote_login_hint ())
             remote_login_service_watch = Bus.watch_name (BusType.SESSION,
                                             "com.canonical.RemoteLogin",
                                             BusNameWatcherFlags.AUTO_START,

=== modified file 'tests/unity-greeter.vala'
--- tests/unity-greeter.vala	2012-09-05 13:25:39 +0000
+++ tests/unity-greeter.vala	2012-09-17 18:00:47 +0000
@@ -77,6 +77,11 @@
         return false;
     }
 
+    public bool show_remote_login_hint ()
+    {
+        return true;
+    }
+
     public bool hide_users_hint ()
     {
         return false;