Merge lp:~aacid/unity-greeter/unsupported_servers into lp:unity-greeter

[Albert Astals Cid]

Show message + disable input for servers we don't support

[lp:~aacid/unity-greeter/unsupported_servers]

551. By Albert Astals Cid on 2012-08-30

introduce a different non supported server so we can test the combos

552. By Albert Astals Cid on 2012-08-30

unchange this string

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2012-08-27 22:30:33 +0000
+++ src/greeter-list.vala	2012-08-30 15:36:19 +0000
@@ -275,7 +275,7 @@
         focus_prompt ();
     }
 
-    public void focus_prompt ()
+    public virtual void focus_prompt ()
     {
         selected_entry.sensitive = true;
         selected_entry.grab_focus ();

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-08-30 13:01:54 +0000
+++ src/user-list.vala	2012-08-30 15:36:19 +0000
@@ -589,6 +589,14 @@
         {
             if (remote_server.url == url)
             {
+                if (selected_entry.id.has_prefix ("*remote_login"))
+                {
+                    if (!is_supported_remote_session (remote_server.type))
+                    {
+                        show_message (_("Server type not supported."), true);
+                    }
+                }
+
                 var fields = new List<RemoteServerField?> ();
                 foreach (var field in remote_server.fields)
                     fields.append (field);
@@ -705,6 +713,27 @@
         }
     }
 
+    public override void focus_prompt ()
+    {
+        if (selected_entry.id.has_prefix ("*remote_login"))
+        {
+            var url = url_from_remote_loding_server_list_name(selected_entry.id);
+            foreach (var remote_server in remote_login_server_list)
+            {
+                if (remote_server.url == url)
+                {
+                    if (!is_supported_remote_session (remote_server.type))
+                    {
+                        selected_entry.sensitive = false;
+                        return;
+                    }
+                }
+            }
+        }
+
+        base.focus_prompt ();
+    }
+
     public override void show_authenticated (bool successful = true)
     {
         if (successful)
@@ -826,6 +855,9 @@
 
     private bool is_supported_remote_session (string session_internal_name)
     {
+        if (UnityGreeter.test_mode)
+            return session_internal_name == "rdp";
+
         var found = false;
 #if HAVE_REMOTE_LIGHTDM
         foreach (var session in LightDM.get_remote_sessions ())
@@ -1166,10 +1198,25 @@
 
         remote_server3.fields = {field31, field32, field33};
 
-        server_list.resize (3);
+        RemoteServer remote_server4 = RemoteServer ();
+        remote_server4.type = "notsupported";
+        remote_server4.name = "Not supported server";
+        remote_server4.url = "http://notsupportedserver.com";
+        remote_server4.fields = {};
+        RemoteServerField field41 = RemoteServerField ();
+        field41.type = "username";
+        RemoteServerField field42 = RemoteServerField ();
+        field42.type = "password";
+        RemoteServerField field43 = RemoteServerField ();
+        field43.type = "domain";
+
+        remote_server4.fields = {field41, field42, field43};
+
+        server_list.resize (4);
         server_list[0] = remote_server1;
         server_list[1] = remote_server2;
         server_list[2] = remote_server3;
+        server_list[3] = remote_server4;
     }
 
     private bool test_key_press_cb (Gdk.EventKey event)