diff --git a/src/account.cpp b/src/account.cpp index 6c9a82be1be1f19590a48be3dab198d1ba8f3df8..e20c569d53a36330f09768982739f8c4e20cee4c 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -37,21 +37,6 @@ Account::~Account() } -void -Account::initConfig(Conf::ConfigTree& config) { - /* - std::string section(_accountID); - std::string type_str("string"); - std::string type_int("int"); - - config.addConfigTreeItem(section, Conf::ConfigTreeItem(CONFIG_ACCOUNT_ENABLE,"1", type_int)); - config.addConfigTreeItem(section, Conf::ConfigTreeItem(CONFIG_ACCOUNT_AUTO_REGISTER, "1", type_int)); - config.addConfigTreeItem(section, Conf::ConfigTreeItem(CONFIG_ACCOUNT_ALIAS, _("My account"), type_str)); - */ -} - - - void Account::loadConfig() { diff --git a/src/account.h b/src/account.h index e09437652cc9156a6fa333f54f8f16564641eee4..1023cf3fb49962dcb56cffa84440ac815926873d 100644 --- a/src/account.h +++ b/src/account.h @@ -57,14 +57,9 @@ typedef std::string AccountID; */ class Account{ public: - Account(const AccountID& accountID); + Account(const AccountID& accountID); - virtual ~Account(); - - /** - * Load the default properties for the account - */ - virtual void initConfig(Conf::ConfigTree& config); + virtual ~Account(); /** * Load the settings for this account. diff --git a/src/iaxaccount.cpp b/src/iaxaccount.cpp index 7ee53768e0972556c021fc9025f634552aba8362..146132d4ab2ec1c702a3bc88140cfc0cb28995d9 100644 --- a/src/iaxaccount.cpp +++ b/src/iaxaccount.cpp @@ -71,26 +71,6 @@ IAXAccount::terminate() return true; } -void -IAXAccount::initConfig(Conf::ConfigTree& config) -{ - /* - std::string section(_accountID); - std::string type_str("string"); - std::string type_int("int"); - - // Account generic - Account::initConfig(config); - - // IAX specific - config.verifyConfigTreeItem(section, CONFIG_ACCOUNT_TYPE, "IAX", type_str); - config.verifyConfigTreeItem(section, IAX_FULL_NAME, "", type_str); - config.verifyConfigTreeItem(section, IAX_HOST, "", type_str); - config.verifyConfigTreeItem(section, IAX_USER, "", type_str); - config.verifyConfigTreeItem(section, IAX_PASS, "", type_str); - */ -} - void IAXAccount::loadConfig() { diff --git a/src/iaxaccount.h b/src/iaxaccount.h index e1812d6c6cd9253b2158981c4fde0e137e5c63ec..b51d1740acb9cafc922db31e4d3405136a69b86c 100644 --- a/src/iaxaccount.h +++ b/src/iaxaccount.h @@ -34,8 +34,6 @@ public: ~IAXAccount(); - /* virtual Account function implementation */ - void initConfig(Conf::ConfigTree& config); /** Actually unuseful, since config loading is done in init() */ void loadConfig(); void registerVoIPLink(); diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp index 38f74bb47663dcbfe649f7cd3f8f9ee494867227..f96ae389b993585ffbc8aa01ccb52e91f6426b02 100644 --- a/src/managerimpl.cpp +++ b/src/managerimpl.cpp @@ -1070,8 +1070,6 @@ ManagerImpl::initConfigFile (void) fill_config_str(VOICEMAIL_NUM, DFT_VOICEMAIL); fill_config_int(CONFIG_ZEROCONF, CONFIG_ZEROCONF_DEFAULT_STR); - initConfigAccount(); - if (createSettingsPath() == 1) { _exist = _config.populateFromFile(_path); } @@ -2007,16 +2005,6 @@ ManagerImpl::getAccountLink(const AccountID& accountID) return 0; } -void -ManagerImpl::initConfigAccount() { - AccountMap::iterator iter = _accountMap.begin(); - while ( iter != _accountMap.end() ) { - if (iter->second!=0) { - iter->second->initConfig(_config); - } - iter++; - } -} #ifdef TEST /** diff --git a/src/managerimpl.h b/src/managerimpl.h index e097bc70d84cb8e30cb25d35c63926851adb1efc..3b1be8aee8d34b2f3cc940ad31dba46775be04c4 100644 --- a/src/managerimpl.h +++ b/src/managerimpl.h @@ -584,11 +584,6 @@ private: */ VoIPLink* getAccountLink(const AccountID& accountID); - /** - * load default account variable for each protocol - */ - void initConfigAccount(); - #ifdef TEST bool testCallAccountMap(); diff --git a/src/sipaccount.cpp b/src/sipaccount.cpp index 722943f084c7e69a8e7d0b75bbdae420bb6f2879..e4235f6af5f52f8f7e6f55656c352a8fc6d4f48a 100644 --- a/src/sipaccount.cpp +++ b/src/sipaccount.cpp @@ -81,30 +81,6 @@ SIPAccount::terminate() return true; } -void -SIPAccount::initConfig(Conf::ConfigTree& config) -{ - /* - std::string section(_accountID); - std::string type_str("string"); - std::string type_int("int"); - - // Account generic - Account::initConfig(config); - - // SIP specific - config.verifyConfigTreeItem(section, CONFIG_ACCOUNT_TYPE, "SIP", type_str); - config.verifyConfigTreeItem(section, SIP_FULL_NAME, "", type_str); - config.verifyConfigTreeItem(section, SIP_USER_PART, "", type_str); - config.verifyConfigTreeItem(section, SIP_HOST_PART, "", type_str); - config.verifyConfigTreeItem(section, SIP_AUTH_NAME, "", type_str); - config.verifyConfigTreeItem(section, SIP_PASSWORD, "", type_str); - config.verifyConfigTreeItem(section, SIP_PROXY, "", type_str); - config.verifyConfigTreeItem(section, SIP_STUN_SERVER, "stun.fwdnet.net:3478", type_str); - config.verifyConfigTreeItem(section, SIP_USE_STUN, "0", type_int); - */ -} - void SIPAccount::loadConfig() { diff --git a/src/sipaccount.h b/src/sipaccount.h index a86346bb41d1e8a317a34f318a8015e6c1e4970f..8c532fa5813675dd1db9ffa0475be219dbdcd649 100644 --- a/src/sipaccount.h +++ b/src/sipaccount.h @@ -34,8 +34,6 @@ public: virtual ~SIPAccount(); - /* virtual Account function implementation */ - void initConfig(Conf::ConfigTree& config); /** Actually unuseful, since config loading is done in init() */ void loadConfig(); void registerVoIPLink();