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
8f72f491
Commit
8f72f491
authored
15 years ago
by
Jérémy Quentin
Browse files
Options
Downloads
Patches
Plain Diff
[#1794] Can't use the interface during a call
Tried with random generated call ids.
parent
371b5ebd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-client-kde/src/CallList.cpp
+6
-6
6 additions, 6 deletions
sflphone-client-kde/src/CallList.cpp
sflphone-client-kde/src/CallList.h
+1
-2
1 addition, 2 deletions
sflphone-client-kde/src/CallList.h
with
7 additions
and
8 deletions
sflphone-client-kde/src/CallList.cpp
+
6
−
6
View file @
8f72f491
...
...
@@ -31,7 +31,6 @@ CallList::CallList()
ConfigurationManagerInterface
&
configurationManager
=
ConfigurationManagerInterfaceSingleton
::
getInstance
();
QStringList
callList
=
callManager
.
getCallList
();
qDebug
()
<<
"Call List = "
<<
callList
;
callIdCpt
=
0
;
calls
=
new
QVector
<
Call
*>
();
for
(
int
i
=
0
;
i
<
callList
.
size
()
;
i
++
)
{
...
...
@@ -49,7 +48,7 @@ CallList::CallList()
QString
name
=
param
[
2
];
uint
stopTimeStamp
=
param
[
3
].
toUInt
();
QString
account
=
param
[
4
];
calls
->
append
(
Call
::
buildHistoryCall
(
ge
tAndInc
CallId
(),
startTimeStamp
,
stopTimeStamp
,
account
,
name
,
number
,
type
));
calls
->
append
(
Call
::
buildHistoryCall
(
ge
nerate
CallId
(),
startTimeStamp
,
stopTimeStamp
,
account
,
name
,
number
,
type
));
}
}
...
...
@@ -127,10 +126,11 @@ Call * CallList::operator[](int ind)
return
(
*
calls
)[
ind
];
}
QString
CallList
::
getAndIncCallId
()
QString
CallList
::
generateCallId
()
{
QString
res
=
QString
::
number
(
callIdCpt
++
);
int
id
=
qrand
(
);
QString
res
=
QString
::
number
(
id
);
return
res
;
}
...
...
@@ -141,7 +141,7 @@ int CallList::size()
Call
*
CallList
::
addDialingCall
(
const
QString
&
peerName
,
QString
account
)
{
Call
*
call
=
Call
::
buildDialingCall
(
ge
tAndInc
CallId
(),
peerName
,
account
);
Call
*
call
=
Call
::
buildDialingCall
(
ge
nerate
CallId
(),
peerName
,
account
);
calls
->
append
(
call
);
return
call
;
}
...
...
This diff is collapsed.
Click to expand it.
sflphone-client-kde/src/CallList.h
+
1
−
2
View file @
8f72f491
...
...
@@ -35,7 +35,6 @@ Q_OBJECT
private:
QVector
<
Call
*>
*
calls
;
int
callIdCpt
;
public:
...
...
@@ -58,7 +57,7 @@ public:
Call
*
addRingingCall
(
const
QString
&
callId
);
//GSetter
QString
ge
tAndInc
CallId
();
QString
ge
nerate
CallId
();
public
slots
:
void
clearHistory
();
...
...
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