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
d44fbd52
Commit
d44fbd52
authored
3 years ago
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
account: check autoAnswerEnabled property when necessary
Change-Id: Ic8264b3b2b6f9cc3c4f92274830c49ed7fe3f87c
parent
1aa3e8a0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/account.h
+2
-0
2 additions, 0 deletions
src/account.h
src/manager.cpp
+1
-1
1 addition, 1 deletion
src/manager.cpp
with
3 additions
and
1 deletion
src/account.h
+
2
−
0
View file @
d44fbd52
...
...
@@ -283,6 +283,8 @@ public:
bool
isRendezVous
()
const
{
return
isRendezVous_
;
}
bool
isAutoAnswerEnabled
()
const
{
return
autoAnswerEnabled_
;
}
void
attachCall
(
const
std
::
string
&
id
);
void
detachCall
(
const
std
::
string
&
id
);
...
...
This diff is collapsed.
Click to expand it.
src/manager.cpp
+
1
−
1
View file @
d44fbd52
...
...
@@ -2798,7 +2798,7 @@ Manager::ManagerPimpl::processIncomingCall(Call& incomCall, const std::string& a
emitSignal
<
DRing
::
CallSignal
::
ConferenceCreated
>
(
conf
->
getConfID
());
});
}
else
if
(
autoAnswer_
)
{
}
else
if
(
autoAnswer_
||
account
->
isAutoAnswerEnabled
()
)
{
dht
::
ThreadPool
::
io
().
run
([
incomCallId
]
{
Manager
::
instance
().
answerCall
(
incomCallId
);
});
}
else
if
(
currentCall
&&
currentCall
->
getCallId
()
!=
incomCallId
)
{
// Test if already calling this person
...
...
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