From e7eaaf56d23b67b1c85ac1050c7d814dc7a2f695 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Mar 2016 16:55:02 +0100 Subject: [PATCH] Small improvement in friend migration + removed useless code in gtk app --- coreapi/friend.c | 7 +++---- gtk/main.c | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/coreapi/friend.c b/coreapi/friend.c index 161730c6d..41bac5edf 100644 --- a/coreapi/friend.c +++ b/coreapi/friend.c @@ -1378,11 +1378,10 @@ void linphone_core_migrate_friends_from_rc_to_db(LinphoneCore *lc) { if (!linphone_friend_create_vcard(lf, displayName)) { ms_warning("Couldn't create vCard for friend %s", linphone_address_as_string(addr)); - linphone_friend_unref(lf); - continue; + } else { + linphone_vcard_add_sip_address(linphone_friend_get_vcard(lf), linphone_address_as_string_uri_only(addr)); } - linphone_vcard_add_sip_address(linphone_friend_get_vcard(lf), linphone_address_as_string_uri_only(addr)); - + linphone_friend_list_add_friend(lfl, lf); linphone_friend_unref(lf); diff --git a/gtk/main.c b/gtk/main.c index c37966f74..f7384ea89 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1841,7 +1841,6 @@ void linphone_gtk_import_contacts(void) { GtkWidget *mw = linphone_gtk_get_main_window(); GtkWidget *dialog = gtk_file_chooser_dialog_new("Open vCard file", (GtkWindow *)mw, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - gtk_widget_show(dialog); if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { LinphoneCore *lc = linphone_gtk_get_core(); char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); @@ -1858,7 +1857,6 @@ void linphone_gtk_export_contacts(void) { GtkWidget *dialog = gtk_file_chooser_dialog_new("Save vCards as", (GtkWindow *)mw, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); - gtk_widget_show(dialog); if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { LinphoneCore *lc = linphone_gtk_get_core(); char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));