Merge lp:~tintou/pantheon-mail/poa-no-overwrite into lp:~elementary-apps/pantheon-mail/trunk

[Corentin Noël]

Don't overwrite custom settings not available in the POA plugin.

[Rico Tzschichholz (ricotz)]

Cache retrieved (property-) values instead of getting them twice or more.

[lp:~tintou/pantheon-mail/poa-no-overwrite]

2166. By Corentin Noël on 2016-09-13

Don't overwrite custom settings not available in the POA plugin.

[Corentin Noël (tintou)]

done

=== modified file 'src/engine/api/OnlineAccountsWrapper.vala'
--- src/engine/api/OnlineAccountsWrapper.vala	2016-07-30 10:18:28 +0000
+++ src/engine/api/OnlineAccountsWrapper.vala	2016-09-13 13:12:28 +0000
@@ -70,8 +70,16 @@
 
 
         string real_name = Environment.get_real_name();
-        account_information.real_name = real_name == "Unknown" ? "" : real_name;
-        account_information.nickname = user_name;
+        var actual_real_name = account_information.real_name;
+        if (actual_real_name == null || actual_real_name == "") {
+            account_information.real_name = real_name == "Unknown" ? "" : real_name;
+        }
+
+        var actual_nickname = account_information.nickname;
+        if (actual_nickname == null || actual_nickname == "") {
+            account_information.nickname = user_name;
+        }
+
         account_information.imap_remember_password = true;
         account_information.smtp_remember_password = true;
         account_information.service_provider = Geary.ServiceProvider.OTHER;