Merge branch 'master' into dev_multicall

[linphone] / gtk-glade / incall_view.c

diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c
index 10565e6c18cba71e55027b16cdc2f0cc156c172a..a17741ff4ae8f5ac5c04133854f140fa477a0d89 100644 (file)
--- a/gtk-glade/incall_view.c
+++ b/gtk-glade/incall_view.c
@@ -72,7 +72,7 @@ void linphone_gtk_show_idle_view(void){
 
 void display_peer_name_in_label(GtkWidget *label, const char *uri){
        LinphoneAddress *from;
-       char *displayname=NULL;
+       const char *displayname=NULL;
        char *id=NULL;
        char *uri_label;
 
@@ -83,14 +83,13 @@ void display_peer_name_in_label(GtkWidget *label, const char *uri){
 
        from=linphone_address_new(uri);
        if (from!=NULL){
-               displayname=linphone_address_get_display_name_unquoted (from);
+               displayname=linphone_address_get_display_name(from);
                id=linphone_address_as_string_uri_only(from);
        }else id=ms_strdup(uri);
 
        if (displayname!=NULL){
                uri_label=g_markup_printf_escaped("<span size=\"large\">%s</span>\n<i>%s</i>", 
                        displayname,id);
-               ms_free(displayname);
        }else
                uri_label=g_markup_printf_escaped("<span size=\"large\"><i>%s</i></span>\n",id);
        gtk_label_set_markup(GTK_LABEL(label),uri_label);