- string = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_PASSWORD, TRUE);
- if (string) {
- modest_server_account_settings_set_password (settings, string);
- g_free (string);
+ /* Username, password and URI. Note that the URI could include
+ the former two, so in this case there is no need to have
+ them */
+ username = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_USERNAME,TRUE);
+ if (username)
+ modest_server_account_settings_set_username (settings, username);
+
+ pwd = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_PASSWORD, TRUE);
+ if (pwd) {
+ modest_server_account_settings_set_password (settings, pwd);
+ g_free (pwd);