* #6547: do not throw exceptions if some settings are not present in config file

sflphone-common/src/managerimpl.cpp

@@ -4219,13 +4219,7 @@ void ManagerImpl::loadIptoipProfile()
 
             // if ID is IP2IP, unserialize
             if (accountid == "IP2IP") {
-
-                try {
                 _directIpAccount->unserialize (map);
-                } catch (SipAccountException &e) {
-                    _error ("Manager: %s", e.what());
-                }
-
                 break;
             }
 
@@ -4303,14 +4297,7 @@ short ManagerImpl::loadAccountMap()
 
         // Fill account with configuration preferences
         if (tmpAccount != NULL) {
-
-            try {
-
             tmpAccount->unserialize (map);
-            } catch (SipAccountException &e) {
-                _error ("Manager: %s", e.what());
-            }
-
             _accountMap[accountid] = tmpAccount;
 
             tmpAccount->setVoIPLink();

sflphone-common/src/sip/sipaccount.cpp

@@ -340,30 +340,24 @@ void SIPAccount::unserialize (Conf::MappingNode *map)
 
     // get srtp submap
     srtpMap = (Conf::MappingNode *) (map->getValue (srtpKey));
-    if (!srtpMap)
-        throw SipAccountException (" did not found srtp map");
-
+    if (srtpMap) {
         srtpMap->getValue(srtpEnableKey, &_srtpEnabled);
         srtpMap->getValue(keyExchangeKey, &_srtpKeyExchange);
         srtpMap->getValue(rtpFallbackKey, &_srtpFallback);
-
+    }
 
     // get zrtp submap
     zrtpMap = (Conf::MappingNode *) (map->getValue (zrtpKey));
-    if (!zrtpMap)
-        throw SipAccountException (" did not found zrtp map");
-
+    if (zrtpMap) {
         zrtpMap->getValue(displaySasKey, &_zrtpDisplaySas);
         zrtpMap->getValue(displaySasOnceKey, &_zrtpDisplaySasOnce);
         zrtpMap->getValue(helloHashEnabledKey, &_zrtpHelloHash);
         zrtpMap->getValue(notSuppWarningKey, &_zrtpNotSuppWarning);
-
+    }
 
     // get tls submap
     tlsMap = (Conf::MappingNode *) (map->getValue (tlsKey));
-    if (!tlsMap)
-        throw SipAccountException (" did not found tls map");
-
+    if (tlsMap) {
         tlsMap->getValue(tlsEnableKey, &_tlsEnable);
         tlsMap->getValue(tlsPortKey, &_tlsPortStr);
         tlsMap->getValue(certificateKey, &_tlsCertificateFile);
@@ -380,6 +374,7 @@ void SIPAccount::unserialize (Conf::MappingNode *map)
         tlsMap->getValue(timeoutKey, &_tlsNegotiationTimeoutSec);
         tlsMap->getValue(timeoutKey, &_tlsNegotiationTimeoutMsec);
     }
+}
 
 
 void SIPAccount::setAccountDetails (std::map<std::string, std::string> details)