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

[Albert Astals Cid]

Do not use the R-L-S cache when retrying user and password and had an error

Do not use the R-L-S cache when retrying user and password and had an error

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-09-12 14:32:39 +0000
+++ src/user-list.vala	2012-09-17 08:45:35 +0000
@@ -401,7 +401,11 @@
                 else
                 {
                     string data_type;
-                    yield remote_login_service.get_servers_for_login (url, email, password_field.text, true, out login_success, out data_type, out server_list);
+                    bool allowcache = true;
+                    // If we had an error and are retrying the same user and server, do not use the cache on R-L-S
+                    if (selected_entry.has_errors && currently_browsing_server_email == email && currently_browsing_server_url == url)
+                        allowcache = false;
+                    yield remote_login_service.get_servers_for_login (url, email, password_field.text, allowcache, out login_success, out data_type, out server_list);
                 }
                 currently_browsing_server_url = url;
                 currently_browsing_server_email = email;