From 846bc61d0da2a1a64922c30d397eb44a0c4f840d Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@msavard.(none)>
Date: Tue, 21 Jun 2011 14:07:52 -0400
Subject: [PATCH] #6233: Handle wrong numbers in
createConferenceFromParticipantList
---
sflphone-common/src/managerimpl.cpp | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index b986824ad3..dc09c3a851 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -310,16 +310,18 @@ bool ManagerImpl::outgoingCall (const std::string& account_id,
}
Call *call = NULL;
- call = getAccountLink(account_id)->newOutgoingCall (call_id, to_cleaned);
- if (call) {
+ try {
+ call = getAccountLink(account_id)->newOutgoingCall (call_id, to_cleaned);
+
switchCall (call_id);
- } else {
+
+ call->setConfId(conf_id);
+ } catch (VoipLinkException &e) {
callFailure (call_id);
- _debug ("Manager: Error: An error occur, the call was not created");
+ _error ("Manager: %s", e.what());
+ return false;
}
- call->setConfId(conf_id);
-
getMainBuffer()->stateInfo();
return true;
@@ -499,7 +501,7 @@ bool ManagerImpl::hangupConference (const ConfID& id)
ParticipantSet::iterator iter_participant = participants.begin();
while (iter_participant != participants.end()) {
- _debug ("Manager: Hangup onference participant %s", (*iter_participant).c_str());
+ _debug ("Manager: Hangup conference participant %s", (*iter_participant).c_str());
hangupCall (*iter_participant);
--
GitLab