From dacbe25d93ebc7b6bb60fac8f25e7ff7ea8c9adc Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 23 Aug 2019 09:50:53 +0200 Subject: [PATCH] Remove duplicate code in roster_update Part of what `roster_update()` does manually is actually done in `roster_change_name()`. --- src/xmpp/roster_list.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/xmpp/roster_list.c b/src/xmpp/roster_list.c index dee7e362..82c2f073 100644 --- a/src/xmpp/roster_list.c +++ b/src/xmpp/roster_list.c @@ -303,15 +303,7 @@ roster_update(const char *const barejid, const char *const name, GSList *groups, p_contact_set_subscription(contact, subscription); p_contact_set_pending_out(contact, pending_out); - const char * const new_name = name; - char * current_name = NULL; - if (p_contact_name(contact)) { - current_name = strdup(p_contact_name(contact)); - } - - p_contact_set_name(contact, new_name); - _replace_name(current_name, new_name, barejid); - free(current_name); + roster_change_name(contact, name); GSList *curr_new_group = groups; while (curr_new_group) {