jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#1911] check previous and new port

Browse Source
This commit is contained in:
Jérémy Quentin
2009-07-23 12:07:04 -04:00
parent e29efb92d2
commit 99acab01ed
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
View File

@ -57,7 +57,6 @@ void ConfigurationSkeleton::readConfig()
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance(); ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
// qDebug() << "configurationManager.getAudioManager4() = " << configurationManager.getAudioManager();
//////////////////////// ////////////////////////
////General settings//// ////General settings////
//////////////////////// ////////////////////////
@ -206,13 +205,13 @@ void ConfigurationSkeleton::writeConfig()
qDebug() << "Writing Display settings"; qDebug() << "Writing Display settings";
//Notification settings //Notification settings
// if(notifOnCalls() != configurationManager.getNotify()) configurationManager.setNotify(); if(notifOnCalls() != configurationManager.getNotify()) configurationManager.setNotify();
// if(notifOnMessages() != configurationManager.getMailNotify()) configurationManager.setMailNotify(); if(notifOnMessages() != configurationManager.getMailNotify()) configurationManager.setMailNotify();
//Window display settings //Window display settings
//WARNING états inversés //WARNING états inversés
// if(displayOnStart() == configurationManager.isStartHidden()) configurationManager.startHidden(); if(displayOnStart() == configurationManager.isStartHidden()) configurationManager.startHidden();
// if(displayOnCalls() != configurationManager.popupMode()) configurationManager.switchPopupMode(); if(displayOnCalls() != configurationManager.popupMode()) configurationManager.switchPopupMode();
///////////////////////// /////////////////////////
////Accounts settings//// ////Accounts settings////
@ -224,8 +223,8 @@ void ConfigurationSkeleton::writeConfig()
//Stun settings //Stun settings
// if(enableStun() != configurationManager.isStunEnabled()) configurationManager.enableStun(); if(enableStun() != configurationManager.isStunEnabled()) configurationManager.enableStun();
// configurationManager.setStunServer(stunServer()); configurationManager.setStunServer(stunServer());
////////////////////// //////////////////////
////Audio settings//// ////Audio settings////

12
sflphone-common/src/dbus/configurationmanager.cpp
View File

@ -78,7 +78,7 @@ ConfigurationManager::getAccountList()
return Manager::instance().getAccountList(); return Manager::instance().getAccountList();
} }
//TODO
std::vector< std::string > std::vector< std::string >
ConfigurationManager::getToneLocaleList() ConfigurationManager::getToneLocaleList()
{ {
@ -87,18 +87,16 @@ ConfigurationManager::getToneLocaleList()
return ret; return ret;
} }
//TODO
std::string std::string
ConfigurationManager::getVersion() ConfigurationManager::getVersion()
{ {
std::string ret (""); std::string ret ("");
_debug ("ConfigurationManager::getVersion received\n"); _debug ("ConfigurationManager::getVersion received\n");
return ret; return ret;
} }
//TODO
std::vector< std::string > std::vector< std::string >
ConfigurationManager::getRingtoneList() ConfigurationManager::getRingtoneList()
{ {
@ -112,14 +110,14 @@ ConfigurationManager::getRingtoneList()
std::vector< std::string > std::vector< std::string >
ConfigurationManager::getCodecList() ConfigurationManager::getCodecList()
{ {
_debug ("ConfigurationManager::getRingtoneList received\n"); _debug ("ConfigurationManager::getCodecList received\n");
return Manager::instance().getCodecList(); return Manager::instance().getCodecList();
} }
std::vector< std::string > std::vector< std::string >
ConfigurationManager::getCodecDetails (const int32_t& payload) ConfigurationManager::getCodecDetails (const int32_t& payload)
{ {
_debug ("ConfigurationManager::getRingtoneList received\n"); _debug ("ConfigurationManager::getCodecDetails received\n");
return Manager::instance().getCodecDetails (payload); return Manager::instance().getCodecDetails (payload);
} }

8
sflphone-common/src/managerimpl.cpp
View File

@ -2204,9 +2204,11 @@ void ManagerImpl::setMicVolume (unsigned short mic_vol)
void ManagerImpl::setSipPort (int port) void ManagerImpl::setSipPort (int port)
{ {
_debug("Setting to new port %d\n", port); _debug("Setting to new port %d\n", port);
setConfig(PREFERENCES, CONFIG_SIP_PORT, port); int prevPort = getConfigInt (PREFERENCES , CONFIG_SIP_PORT);
if(prevPort != port){
this->restartPJSIP (); setConfig(PREFERENCES, CONFIG_SIP_PORT, port);
this->restartPJSIP ();
}
} }
int ManagerImpl::getSipPort (void) int ManagerImpl::getSipPort (void)