Commit 85a0ab37 authored by Tristan Matthews's avatar Tristan Matthews

Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
parents 2fce6bfc f2762ba6
......@@ -107,12 +107,10 @@ YamlNode *MappingNode::getValue(const std::string &key) const
{
Mapping::const_iterator it = map_.find(key);
if (it != map_.end()) {
if (it != map_.end())
return it->second;
} else {
DEBUG("MappingNode: Could not find %s", key.c_str());
else
return NULL;
}
}
void MappingNode::getValue(const std::string &key, bool *b) const
......
......@@ -524,9 +524,6 @@ void SIPVoIPLink::sendRegister(Account *a)
std::string contact(account->getContactHeader());
pj_str_t pjContact = pj_str((char*) contact.c_str());
std::string received(account->getReceivedParameter());
pj_str_t pjReceived = pj_str((char *) received.c_str());
if (pjsip_regc_init(regc, &pjSrv, &pjFrom, &pjFrom, 1, &pjContact, account->getRegistrationExpire()) != PJ_SUCCESS)
throw VoipLinkException("Unable to initialize account registration structure");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment