Skip to content
Snippets Groups Projects
Commit 34e0564a authored by Rafaël Carré's avatar Rafaël Carré
Browse files

* #6558 : Account::loadConfig() : move IAX code to IAXAccount

parent 1b36722c
Branches
Tags
No related merge requests found
...@@ -54,18 +54,6 @@ Account::~Account() ...@@ -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) void Account::setRegistrationState (RegistrationState state)
{ {
if (state != _registrationState) { if (state != _registrationState) {
......
...@@ -177,7 +177,7 @@ class Account : public Serializable ...@@ -177,7 +177,7 @@ class Account : public Serializable
/** /**
* Load the settings for this account. * Load the settings for this account.
*/ */
virtual void loadConfig(); virtual void loadConfig() = 0;
/** /**
* Get the account ID * Get the account ID
......
...@@ -201,6 +201,8 @@ IAXAccount::unregisterVoIPLink() ...@@ -201,6 +201,8 @@ IAXAccount::unregisterVoIPLink()
void void
IAXAccount::loadConfig() IAXAccount::loadConfig()
{ {
// Account generic // If IAX is not supported, do not register this account
Account::loadConfig(); #ifndef USE_IAX
_enabled = false;
#endif
} }
...@@ -751,9 +751,6 @@ void SIPAccount::loadConfig() ...@@ -751,9 +751,6 @@ void SIPAccount::loadConfig()
} else { } else {
_transportType = PJSIP_TRANSPORT_UDP; _transportType = PJSIP_TRANSPORT_UDP;
} }
// Account generic
Account::loadConfig();
} }
bool SIPAccount::fullMatch (const std::string& username, const std::string& hostname) const bool SIPAccount::fullMatch (const std::string& username, const std::string& hostname) const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment