From fff015572a066cbc5f92fedb84ae5eb66b284cbe Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Mon, 27 Sep 2010 18:03:04 -0400
Subject: [PATCH] [#4116] Test alias OR accountid
---
sflphone-common/src/managerimpl.cpp | 16 ++++++++--------
sflphone-common/test/sflphoned-sample.yml | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 3e9411566f..e903d15b01 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -3833,19 +3833,19 @@ short ManagerImpl::loadAccountMap()
if (val)
accountid = val->getValue();
- // search for alias (to get rid of the "ghost" account)
- val = NULL;
- val = (Conf::ScalarNode *) (map->getValue (alias));
- Conf::Value accountAlias;
+ // search for alias (to get rid of the "ghost" account)
+ val = NULL;
+ val = (Conf::ScalarNode *) (map->getValue (alias));
+ Conf::Value accountAlias;
- if (val)
- accountAlias = val->getValue();
+ if (val)
+ accountAlias = val->getValue();
// do not insert in account map if id or alias is empty
if (accountid.empty() || accountAlias.empty()) {
- iterSeq++;
+ iterSeq++;
continue;
- }
+ }
// Create a default account for specific type
if (accountType == "SIP" && accountid != "IP2IP") {
diff --git a/sflphone-common/test/sflphoned-sample.yml b/sflphone-common/test/sflphoned-sample.yml
index adb99d126e..1ff29e0eab 100644
--- a/sflphone-common/test/sflphoned-sample.yml
+++ b/sflphone-common/test/sflphoned-sample.yml
@@ -54,7 +54,7 @@ preferences:
historyMaxCalls: 20
md5Hash: false
notifyMails: false
- order: Account:1285265589/Account:1285257971/Account:1285253592/Account:1285252571/Account:1285251984/Account:1285251811/Account:1285251597/Account:1285192081/Account:1285184087/Account:1285182355/
+ order: Account:1285624877/Account:1285265589/Account:1285257971/Account:1285253592/Account:1285252571/Account:1285251984/Account:1285251811/Account:1285251597/Account:1285192081/Account:1285184087/Account:1285182355/
portNum: 5060
registrationExpire: 180
searchBarDisplay: true
--
GitLab