devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Refactored roster add/update

Browse Source
This commit is contained in:
James Booth
2014-01-05 23:54:29 +00:00
parent 76484665fd
commit db973457d0
8 changed files with 103 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/xmpp/roster.c
View File

@@ -255,7 +255,15 @@ _roster_handle_push(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
GSList *groups = _get_groups_from_item(item);
// update the local roster
roster_update(barejid, name, groups, sub, pending_out);
PContact contact = roster_get_contact(barejid);
if (contact == NULL) {
gboolean added = roster_add(barejid, name, groups, sub, pending_out);
if (added) {
handle_roster_add(barejid, name);
}
} else {
roster_update(barejid, name, groups, sub, pending_out);
}
}
return 1;
@@ -289,7 +297,7 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
GSList *groups = _get_groups_from_item(item);
gboolean added = roster_add(barejid, name, groups, sub, pending_out, TRUE);
gboolean added = roster_add(barejid, name, groups, sub, pending_out);
if (!added) {
log_warning("Attempt to add contact twice: %s", barejid);