Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
69f114e5
Commit
69f114e5
authored
Apr 28, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/components/chat/ChatModel): handle aborted call events
parent
9d8b2632
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
16 deletions
+23
-16
ChatModel.cpp
linphone-desktop/src/components/chat/ChatModel.cpp
+12
-6
CallControls.qml
linphone-desktop/ui/modules/Linphone/Calls/CallControls.qml
+11
-10
No files found.
linphone-desktop/src/components/chat/ChatModel.cpp
View file @
69f114e5
...
...
@@ -518,6 +518,18 @@ void ChatModel::removeEntry (ChatEntryData &pair) {
}
void
ChatModel
::
insertCall
(
const
shared_ptr
<
linphone
::
CallLog
>
&
callLog
)
{
linphone
::
CallStatus
status
=
callLog
->
getStatus
();
switch
(
status
)
{
case
linphone
:
:
CallStatusAborted
:
case
linphone
:
:
CallStatusEarlyAborted
:
return
;
// Ignore aborted calls.
case
linphone
:
:
CallStatusSuccess
:
case
linphone
:
:
CallStatusMissed
:
case
linphone
:
:
CallStatusDeclined
:
break
;
}
auto
insertEntry
=
[
this
](
const
ChatEntryData
&
pair
,
const
QList
<
ChatEntryData
>::
iterator
*
start
=
NULL
...
...
@@ -538,12 +550,6 @@ void ChatModel::insertCall (const shared_ptr<linphone::CallLog> &callLog) {
return
it
;
};
linphone
::
CallStatus
status
=
callLog
->
getStatus
();
// Ignore aborted calls.
if
(
status
==
linphone
::
CallStatusAborted
)
return
;
// Add start call.
QVariantMap
start
;
fillCallStartEntry
(
start
,
callLog
);
...
...
linphone-desktop/ui/modules/Linphone/Calls/CallControls.qml
View file @
69f114e5
...
...
@@ -35,6 +35,17 @@ Rectangle {
onClicked
:
callControls
.
clicked
()
}
Icon
{
id
:
signIcon
anchors
{
left
:
parent
.
left
top
:
parent
.
top
}
iconSize
:
CallControlsStyle
.
signSize
}
RowLayout
{
anchors
{
fill
:
parent
...
...
@@ -66,14 +77,4 @@ Rectangle {
// ---------------------------------------------------------------------------
Icon
{
id
:
signIcon
anchors
{
left
:
parent
.
left
top
:
parent
.
top
}
iconSize
:
CallControlsStyle
.
signSize
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment