From 24c38591b0f0b2d5bc123a9271ff182292f30943 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@alexandresavard-desktop.(none)>
Date: Thu, 19 Nov 2009 13:26:45 -0500
Subject: [PATCH] [#2399] Fix dialing display problem
---
sflphone-client-gnome/src/contacts/calltree.c | 72 +++++++++++++++++--
1 file changed, 66 insertions(+), 6 deletions(-)
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 6d2083b0cc..5505e21d97 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -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);
--
GitLab