aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into sublist

Browse Source
This commit is contained in:
James Booth 2012-11-28 01:05:37 +00:00
commit ce0e96edf5
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/contact_list.c
View File

@ -72,6 +72,12 @@ contact_list_add(const char * const jid, const char * const name,
return added;
}
void
contact_list_remove(const char * const jid)
{
g_hash_table_remove(contacts, jid);
}
gboolean
contact_list_update_contact(const char * const jid, const char * const presence,
const char * const status)
@ -103,7 +109,9 @@ contact_list_update_subscription(const char * const jid,
PContact contact = g_hash_table_lookup(contacts, jid);
if (contact == NULL) {
return;
contact = p_contact_new(jid, NULL, "offline", NULL, subscription,
pending_out);
g_hash_table_insert(contacts, strdup(jid), contact);
} else {
p_contact_set_subscription(contact, subscription);
p_contact_set_pending_out(contact, pending_out);

1
src/contact_list.h
View File

@ -30,6 +30,7 @@
void contact_list_init(void);
void contact_list_clear(void);
void contact_list_reset_search_attempts(void);
void contact_list_remove(const char * const jid);
gboolean contact_list_add(const char * const jid, const char * const name,
const char * const presence, const char * const status,
const char * const subscription, gboolean pending_out);

5
src/jabber.c
View File

@ -802,6 +802,11 @@ _iq_handler(xmpp_conn_t * const conn,
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);
return TRUE;
}
gboolean pending_out = FALSE;
const char *ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK);
if ((ask != NULL) && (strcmp(ask, "subscribe") == 0)) {