Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
60c143f6
Commit
60c143f6
authored
12 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #24789: daemon: return true if hangupCall succeeded
parent
d13a09c2
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/managerimpl.cpp
+4
-2
4 additions, 2 deletions
daemon/src/managerimpl.cpp
daemon/src/managerimpl.h
+1
-1
1 addition, 1 deletion
daemon/src/managerimpl.h
with
5 additions
and
3 deletions
daemon/src/managerimpl.cpp
+
4
−
2
View file @
60c143f6
...
...
@@ -390,7 +390,7 @@ bool ManagerImpl::answerCall(const std::string& call_id)
}
//THREAD=Main
void
ManagerImpl
::
hangupCall
(
const
std
::
string
&
callId
)
bool
ManagerImpl
::
hangupCall
(
const
std
::
string
&
callId
)
{
// store the current call id
std
::
string
currentCallId
(
getCurrentCallId
());
...
...
@@ -408,7 +408,7 @@ void ManagerImpl::hangupCall(const std::string& callId)
/* We often get here when the call was hungup before being created */
if
(
not
isValidCall
(
callId
)
and
not
isIPToIP
(
callId
))
{
DEBUG
(
"Could not hang up call %s, call not valid"
,
callId
.
c_str
());
return
;
return
false
;
}
// Disconnect streams
...
...
@@ -433,6 +433,7 @@ void ManagerImpl::hangupCall(const std::string& callId)
}
}
catch
(
const
VoipLinkException
&
e
)
{
ERROR
(
"%s"
,
e
.
what
());
return
false
;
}
}
else
{
std
::
string
accountId
(
getAccountFromCall
(
callId
));
...
...
@@ -447,6 +448,7 @@ void ManagerImpl::hangupCall(const std::string& callId)
}
getMainBuffer
().
dumpInfo
();
return
true
;
}
bool
ManagerImpl
::
hangupConference
(
const
std
::
string
&
id
)
...
...
This diff is collapsed.
Click to expand it.
daemon/src/managerimpl.h
+
1
−
1
View file @
60c143f6
...
...
@@ -178,7 +178,7 @@ class ManagerImpl {
* Hangup the call
* @param id The call identifier
*/
void
hangupCall
(
const
std
::
string
&
id
);
bool
hangupCall
(
const
std
::
string
&
id
);
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment