diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp index 40365957d6c92e4f3007744707486f528e7bedad..d403decbfbc64f3676ff252f57731ebc9aead025 100644 --- a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp +++ b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp @@ -57,7 +57,6 @@ void ConfigurationSkeleton::readConfig() ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); -// qDebug() << "configurationManager.getAudioManager4() = " << configurationManager.getAudioManager(); //////////////////////// ////General settings//// //////////////////////// @@ -206,13 +205,13 @@ void ConfigurationSkeleton::writeConfig() qDebug() << "Writing Display settings"; //Notification settings -// if(notifOnCalls() != configurationManager.getNotify()) configurationManager.setNotify(); -// if(notifOnMessages() != configurationManager.getMailNotify()) configurationManager.setMailNotify(); + if(notifOnCalls() != configurationManager.getNotify()) configurationManager.setNotify(); + if(notifOnMessages() != configurationManager.getMailNotify()) configurationManager.setMailNotify(); //Window display settings //WARNING états inversés -// if(displayOnStart() == configurationManager.isStartHidden()) configurationManager.startHidden(); -// if(displayOnCalls() != configurationManager.popupMode()) configurationManager.switchPopupMode(); + if(displayOnStart() == configurationManager.isStartHidden()) configurationManager.startHidden(); + if(displayOnCalls() != configurationManager.popupMode()) configurationManager.switchPopupMode(); ///////////////////////// ////Accounts settings//// @@ -224,8 +223,8 @@ void ConfigurationSkeleton::writeConfig() //Stun settings -// if(enableStun() != configurationManager.isStunEnabled()) configurationManager.enableStun(); -// configurationManager.setStunServer(stunServer()); + if(enableStun() != configurationManager.isStunEnabled()) configurationManager.enableStun(); + configurationManager.setStunServer(stunServer()); ////////////////////// ////Audio settings//// diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp index c9dfc7d52959332e208fcf41ef16bc1672366611..7afc9cb250eacae12e0490b5145f1eeae9aec89e 100644 --- a/sflphone-common/src/dbus/configurationmanager.cpp +++ b/sflphone-common/src/dbus/configurationmanager.cpp @@ -78,7 +78,7 @@ ConfigurationManager::getAccountList() return Manager::instance().getAccountList(); } - +//TODO std::vector< std::string > ConfigurationManager::getToneLocaleList() { @@ -87,18 +87,16 @@ ConfigurationManager::getToneLocaleList() return ret; } - - +//TODO std::string ConfigurationManager::getVersion() { std::string ret (""); _debug ("ConfigurationManager::getVersion received\n"); return ret; - } - +//TODO std::vector< std::string > ConfigurationManager::getRingtoneList() { @@ -112,14 +110,14 @@ ConfigurationManager::getRingtoneList() std::vector< std::string > ConfigurationManager::getCodecList() { - _debug ("ConfigurationManager::getRingtoneList received\n"); + _debug ("ConfigurationManager::getCodecList received\n"); return Manager::instance().getCodecList(); } std::vector< std::string > ConfigurationManager::getCodecDetails (const int32_t& payload) { - _debug ("ConfigurationManager::getRingtoneList received\n"); + _debug ("ConfigurationManager::getCodecDetails received\n"); return Manager::instance().getCodecDetails (payload); } diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp index d7d337d084f2ba68a5ccdb12f5de27d5240562d6..858ff6ae44a91656b2c28b422a48be916fbe2791 100644 --- a/sflphone-common/src/managerimpl.cpp +++ b/sflphone-common/src/managerimpl.cpp @@ -2204,9 +2204,11 @@ void ManagerImpl::setMicVolume (unsigned short mic_vol) void ManagerImpl::setSipPort (int port) { _debug("Setting to new port %d\n", port); - setConfig(PREFERENCES, CONFIG_SIP_PORT, port); - - this->restartPJSIP (); + int prevPort = getConfigInt (PREFERENCES , CONFIG_SIP_PORT); + if(prevPort != port){ + setConfig(PREFERENCES, CONFIG_SIP_PORT, port); + this->restartPJSIP (); + } } int ManagerImpl::getSipPort (void)