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

Renamed contact_list_ functions to roster_

Browse Source
This commit is contained in:
James Booth
2013-05-06 22:32:58 +01:00
parent 097ea18dab
commit 05f2d29396
14 changed files with 151 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/xmpp/connection.c
View File

@@ -29,7 +29,6 @@
#include "chat_session.h"
#include "common.h"
#include "config/preferences.h"
#include "contact_list.h"
#include "jid.h"
#include "log.h"
#include "muc.h"

2
src/xmpp/iq.c
View File

@@ -163,7 +163,7 @@ _iq_handle_version_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza
if (muc_room_is_active(jidp)) {
contact = muc_get_participant(jidp->barejid, jidp->resourcepart);
} else {
contact = contact_list_get_contact(jidp->barejid);
contact = roster_get_contact(jidp->barejid);
}
Resource *resource = p_contact_get_resource(contact, jidp->resourcepart);

6
src/xmpp/roster.c
View File

@@ -72,7 +72,7 @@ _roster_handle_set(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
const char *jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
const char *sub = xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION);
if (g_strcmp0(sub, "remove") == 0) {
contact_list_remove(jid);
roster_remove(jid);
return 1;
}
@@ -82,7 +82,7 @@ _roster_handle_set(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
pending_out = TRUE;
}
contact_list_update_subscription(jid, sub, pending_out);
roster_update_subscription(jid, sub, pending_out);
return 1;
}
@@ -109,7 +109,7 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
pending_out = TRUE;
}
gboolean added = contact_list_add(barejid, name, sub, NULL, pending_out);
gboolean added = roster_add(barejid, name, sub, NULL, pending_out);
if (!added) {
log_warning("Attempt to add contact twice: %s", barejid);