diff --git a/sflphone-common/src/account.cpp b/sflphone-common/src/account.cpp index a06c8c76174c021ae401136fbdbe1e05423c5c69..283164a61ddac817d6573f4bf898442165fb4e9b 100644 --- a/sflphone-common/src/account.cpp +++ b/sflphone-common/src/account.cpp @@ -54,18 +54,6 @@ Account::~Account() { } -void Account::loadConfig() -{ - - // If IAX is not supported, do not register this account -#ifndef USE_IAX - - if (_type == "IAX") - _enabled = false; - -#endif -} - void Account::setRegistrationState (RegistrationState state) { if (state != _registrationState) { diff --git a/sflphone-common/src/account.h b/sflphone-common/src/account.h index a263128e371b47c457fa1f0a39dccd8d34569d58..46f63a56879014a1c44dc3f29beb43303b86eebb 100644 --- a/sflphone-common/src/account.h +++ b/sflphone-common/src/account.h @@ -177,7 +177,7 @@ class Account : public Serializable /** * Load the settings for this account. */ - virtual void loadConfig(); + virtual void loadConfig() = 0; /** * Get the account ID diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/sflphone-common/src/iax/iaxaccount.cpp index a1e8ac5530f7f1a5d502078d63296e73ee2a0446..3e2907d33a4c86b3a83846fad42f0a77cf9ec64f 100644 --- a/sflphone-common/src/iax/iaxaccount.cpp +++ b/sflphone-common/src/iax/iaxaccount.cpp @@ -201,6 +201,8 @@ IAXAccount::unregisterVoIPLink() void IAXAccount::loadConfig() { - // Account generic - Account::loadConfig(); + // If IAX is not supported, do not register this account +#ifndef USE_IAX + _enabled = false; +#endif } diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp index d0bce5bb150998b33a9407884cd919c00187ea64..54751c53b874c7775708f9d379fea04c19c309c1 100644 --- a/sflphone-common/src/sip/sipaccount.cpp +++ b/sflphone-common/src/sip/sipaccount.cpp @@ -751,9 +751,6 @@ void SIPAccount::loadConfig() } else { _transportType = PJSIP_TRANSPORT_UDP; } - - // Account generic - Account::loadConfig(); } bool SIPAccount::fullMatch (const std::string& username, const std::string& hostname) const