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
ed9728d8
Commit
ed9728d8
authored
15 years ago
by
Jérémy Quentin
Browse files
Options
Downloads
Patches
Plain Diff
[#1312] Added new states for calls initialized by other clients
parent
03d715ca
Branches
Branches containing commit
Tags
Tags containing commit
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-client-kde/src/Call.cpp
+8
-0
8 additions, 0 deletions
sflphone-client-kde/src/Call.cpp
sflphone-client-kde/src/sflphone_const.h
+2
-0
2 additions, 0 deletions
sflphone-client-kde/src/sflphone_const.h
with
10 additions
and
0 deletions
sflphone-client-kde/src/Call.cpp
+
8
−
0
View file @
ed9728d8
...
...
@@ -275,6 +275,14 @@ call_state Call::getStartStateFromDaemonCallState(QString daemonCallState, QStri
{
return
CALL_STATE_RINGING
;
}
else
if
(
daemonCallState
==
DAEMON_CALL_STATE_INIT_INCOMING
)
{
return
CALL_STATE_INCOMING
;
}
else
if
(
daemonCallState
==
DAEMON_CALL_STATE_INIT_RINGING
)
{
return
CALL_STATE_RINGING
;
}
else
{
return
CALL_STATE_FAILURE
;
...
...
This diff is collapsed.
Click to expand it.
sflphone-client-kde/src/sflphone_const.h
+
2
−
0
View file @
ed9728d8
...
...
@@ -167,6 +167,8 @@
#define DAEMON_CALL_STATE_INIT_CURRENT "CURRENT"
#define DAEMON_CALL_STATE_INIT_HOLD "HOLD"
#define DAEMON_CALL_STATE_INIT_BUSY "BUSY"
#define DAEMON_CALL_STATE_INIT_INCOMING "INCOMING"
#define DAEMON_CALL_STATE_INIT_RINGING "RINGING"
#define DAEMON_CALL_STATE_INIT_INACTIVE "INACTIVE"
#define DAEMON_CALL_TYPE_INCOMING "0"
...
...
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