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
24c38591
Commit
24c38591
authored
15 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#2399] Fix dialing display problem
parent
476d255b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-client-gnome/src/contacts/calltree.c
+66
-6
66 additions, 6 deletions
sflphone-client-gnome/src/contacts/calltree.c
with
66 additions
and
6 deletions
sflphone-client-gnome/src/contacts/calltree.c
+
66
−
6
View file @
24c38591
...
...
@@ -583,33 +583,68 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
if
(
c
->
_state
==
CALL_STATE_TRANSFERT
)
{
if
(
g_strcmp0
(
""
,
c
->
_peer_name
)
==
0
){
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>Transfert to:%s</i> "
,
c
->
_peer_number
,
c
->
_peer_name
,
c
->
_trsft_to
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>Transfert to:%s</i> "
,
c
->
_peer_name
,
c
->
_peer_number
,
c
->
_trsft_to
);
}
}
else
{
// c->_zrtp_confirmed == FALSE : Hack explained in callable_obj.h
if
((
c
->
_sas
!=
NULL
)
&&
(
display_sas
==
TRUE
)
&&
(
c
->
_srtp_state
==
SRTP_STATE_SAS_UNCONFIRMED
)
&&
(
c
->
_zrtp_confirmed
==
FALSE
))
{
if
(
g_strcmp0
(
""
,
c
->
_peer_name
)
==
0
){
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>Confirm SAS <b>%s</b> ?</i> "
,
c
->
_peer_number
,
c
->
_peer_name
,
c
->
_sas
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>Confirm SAS <b>%s</b> ?</i> "
,
c
->
_peer_name
,
c
->
_peer_number
,
c
->
_sas
);
}
}
else
{
DEBUG
(
"Updating state code %d %s"
,
c
->
_state_code
,
c
->
_state_code_description
);
if
(
c
->
_state_code
)
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s (%d)</i> <i>%s</i>"
,
if
(
g_strcmp0
(
""
,
c
->
_peer_name
)
==
0
){
if
(
c
->
_state_code
)
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s (%d)</i> <i>%s</i>"
,
c
->
_peer_number
,
c
->
_peer_name
,
c
->
_state_code_description
,
c
->
_state_code
,
audio_codec
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s</i>"
,
c
->
_peer_number
,
c
->
_peer_name
,
audio_codec
);
}
}
else
{
if
(
c
->
_state_code
)
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s (%d)</i> <i>%s</i>"
,
c
->
_peer_name
,
c
->
_peer_number
,
c
->
_state_code_description
,
c
->
_state_code
,
audio_codec
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s</i>"
,
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s</i>"
,
c
->
_peer_name
,
c
->
_peer_number
,
audio_codec
);
}
}
}
}
...
...
@@ -721,18 +756,33 @@ void calltree_add_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
if
(
c
->
_state_code
==
0
)
{
if
(
g_strcmp0
(
""
,
c
->
_peer_name
)
==
0
)
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>"
,
c
->
_peer_name
,
c
->
_peer_number
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>"
,
c
->
_peer_name
,
c
->
_peer_number
);
}
}
else
{
if
(
g_strcmp0
(
""
,
c
->
_peer_name
)
==
0
)
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s (%d)</i>"
,
c
->
_peer_number
,
c
->
_peer_name
,
c
->
_state_code_description
,
c
->
_state_code
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>
\n
<i>%s (%d)</i>"
,
c
->
_peer_name
,
c
->
_peer_number
,
c
->
_state_code_description
,
c
->
_state_code
);
}
}
gtk_tree_store_prepend
(
tab
->
store
,
&
iter
,
parent
);
...
...
@@ -839,9 +889,19 @@ void calltree_add_history_entry (callable_obj_t * c)
// New call in the list
gchar
*
description
,
*
date
=
""
,
*
duration
=
""
;
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>"
,
if
(
g_strcmp0
(
""
,
c
->
_peer_name
)
==
0
)
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>"
,
c
->
_peer_number
,
c
->
_peer_name
);
}
else
{
description
=
g_markup_printf_escaped
(
"<b>%s</b> <i>%s</i>"
,
c
->
_peer_name
,
c
->
_peer_number
);
}
gtk_tree_store_prepend
(
history
->
store
,
&
iter
,
NULL
);
...
...
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