From 4e15c49452d02ca37adefba4235648542e1a53e0 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Mon, 17 Feb 2014 17:26:08 +0100 Subject: [PATCH] Fix friendlist contact name --- gtk/friendlist.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gtk/friendlist.c b/gtk/friendlist.c index 0316dd699..f86f8b4c6 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -910,7 +910,11 @@ void linphone_gtk_contact_ok(GtkWidget *button){ linphone_friend_set_inc_subscribe_policy(lf,allow_presence ? LinphoneSPAccept : LinphoneSPDeny); linphone_friend_send_subscribe(lf,show_presence); } - name=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"name"))); + + name = NULL; + if(gtk_entry_get_text_length(GTK_ENTRY(linphone_gtk_get_widget(w,"name"))) != 0){ + name=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"name"))); + } uri=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"sip_address"))); show_presence=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"show_presence"))); allow_presence=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"allow_presence"))); @@ -919,9 +923,10 @@ void linphone_gtk_contact_ok(GtkWidget *button){ linphone_gtk_display_something(GTK_MESSAGE_WARNING,_("Invalid sip contact !")); return ; } - linphone_address_set_display_name(friend_address,name); - linphone_friend_set_address(lf,friend_address); + linphone_address_set_display_name(friend_address,name); + linphone_friend_set_name(lf,name); + linphone_friend_set_address(lf,friend_address); linphone_friend_send_subscribe(lf,show_presence); linphone_friend_set_inc_subscribe_policy(lf,allow_presence==TRUE ? LinphoneSPAccept : LinphoneSPDeny); if (linphone_friend_in_list(lf)) { @@ -931,7 +936,6 @@ void linphone_gtk_contact_ok(GtkWidget *button){ lf2=linphone_core_get_friend_by_address(linphone_gtk_get_core(),uri); ms_free(uri); if(lf2==NULL){ - linphone_friend_set_name(lf,name); linphone_core_add_friend(linphone_gtk_get_core(),lf); } } @@ -1112,4 +1116,4 @@ gboolean linphone_gtk_contact_list_button_pressed(GtkWidget *widget, GdkEventBut void linphone_gtk_buddy_info_updated(LinphoneCore *lc, LinphoneFriend *lf){ /*refresh the entire list*/ linphone_gtk_show_friends(); -} \ No newline at end of file +}