- if (modest_account_mgr_get_enabled (self->account_manager,
- self->account_name)) {
- gchar *incoming_account_name = NULL, *outgoing_account_name = NULL;
-
- incoming_account_name =
- modest_account_mgr_get_server_account_name (self->account_manager,
- self->account_name,
- TNY_ACCOUNT_TYPE_STORE);
- outgoing_account_name =
- modest_account_mgr_get_server_account_name (self->account_manager,
- self->account_name,
- TNY_ACCOUNT_TYPE_TRANSPORT);
-
- if (incoming_account_name) {
+ if (modest_account_settings_get_account_name (self->settings) != NULL) {
+ ModestServerAccountSettings *store_settings;
+ ModestServerAccountSettings *transport_settings;
+ const gchar *store_account_name;
+ const gchar *transport_account_name;
+
+
+ store_settings = modest_account_settings_get_store_settings (self->settings);
+ transport_settings = modest_account_settings_get_transport_settings (self->settings);
+ store_account_name = modest_server_account_settings_get_account_name (store_settings);
+ transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
+
+ if (store_account_name) {