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

Rename ProfIdCallback into ProfIqCallback

Browse Source 
Goal is to create other kind of callback no based on id cmp
This commit is contained in:
Paul Fariello 2019-02-22 10:40:41 +01:00
parent fdc5f25f2d
commit 2d28725c85
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xmpp/iq.c
View File

@ -77,11 +77,11 @@ typedef struct p_room_info_data_t {
gboolean display; gboolean display;
} ProfRoomInfoData; } ProfRoomInfoData;
typedef struct p_id_handle_t { typedef struct p_iq_handle_t {
ProfIdCallback func; ProfIqCallback func;
ProfIdFreeCallback free_func; ProfIqFreeCallback free_func;
void *userdata; void *userdata;
} ProfIdHandler; } ProfIqHandler;
typedef struct privilege_set_t { typedef struct privilege_set_t {
char *item; char *item;
@ -205,7 +205,7 @@ _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const us
const char *id = xmpp_stanza_get_id(stanza); const char *id = xmpp_stanza_get_id(stanza);
if (id) { if (id) {
ProfIdHandler *handler = g_hash_table_lookup(id_handlers, id); ProfIqHandler *handler = g_hash_table_lookup(id_handlers, id);
if (handler) { if (handler) {
int keep = handler->func(stanza, handler->userdata); int keep = handler->func(stanza, handler->userdata);
if (!keep) { if (!keep) {
@ -234,7 +234,7 @@ iq_handlers_init(void)
GList *keys = g_hash_table_get_keys(id_handlers); GList *keys = g_hash_table_get_keys(id_handlers);
GList *curr = keys; GList *curr = keys;
while (curr) { while (curr) {
ProfIdHandler *handler = g_hash_table_lookup(id_handlers, curr->data); ProfIqHandler *handler = g_hash_table_lookup(id_handlers, curr->data);
if (handler->free_func && handler->userdata) { if (handler->free_func && handler->userdata) {
handler->free_func(handler->userdata); handler->free_func(handler->userdata);
} }
@ -248,9 +248,9 @@ iq_handlers_init(void)
} }
void void
iq_id_handler_add(const char *const id, ProfIdCallback func, ProfIdFreeCallback free_func, void *userdata) iq_id_handler_add(const char *const id, ProfIqCallback func, ProfIqFreeCallback free_func, void *userdata)
{ {
ProfIdHandler *handler = malloc(sizeof(ProfIdHandler)); ProfIqHandler *handler = malloc(sizeof(ProfIqHandler));
handler->func = func; handler->func = func;
handler->free_func = free_func; handler->free_func = free_func;
handler->userdata = userdata; handler->userdata = userdata;
@ -438,7 +438,7 @@ iq_room_info_request(const char *const room, gboolean display_result)
cb_data->room = strdup(room); cb_data->room = strdup(room);
cb_data->display = display_result; cb_data->display = display_result;
iq_id_handler_add(id, _room_info_response_id_handler, (ProfIdFreeCallback)_iq_free_room_data, cb_data); iq_id_handler_add(id, _room_info_response_id_handler, (ProfIqFreeCallback)_iq_free_room_data, cb_data);
free(id); free(id);
@ -651,7 +651,7 @@ iq_room_affiliation_set(const char *const room, const char *const jid, char *aff
affiliation_set->item = strdup(jid); affiliation_set->item = strdup(jid);
affiliation_set->privilege = strdup(affiliation); affiliation_set->privilege = strdup(affiliation);
iq_id_handler_add(id, _room_affiliation_set_result_id_handler, (ProfIdFreeCallback)_iq_free_affiliation_set, affiliation_set); iq_id_handler_add(id, _room_affiliation_set_result_id_handler, (ProfIqFreeCallback)_iq_free_affiliation_set, affiliation_set);
iq_send_stanza(iq); iq_send_stanza(iq);
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
@ -670,7 +670,7 @@ iq_room_role_set(const char *const room, const char *const nick, char *role,
role_set->item = strdup(nick); role_set->item = strdup(nick);
role_set->privilege = strdup(role); role_set->privilege = strdup(role);
iq_id_handler_add(id, _room_role_set_result_id_handler, (ProfIdFreeCallback)_iq_free_affiliation_set, role_set); iq_id_handler_add(id, _room_role_set_result_id_handler, (ProfIqFreeCallback)_iq_free_affiliation_set, role_set);
iq_send_stanza(iq); iq_send_stanza(iq);
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
@ -697,7 +697,7 @@ iq_send_ping(const char *const target)
const char *id = xmpp_stanza_get_id(iq); const char *id = xmpp_stanza_get_id(iq);
GDateTime *now = g_date_time_new_now_local(); GDateTime *now = g_date_time_new_now_local();
iq_id_handler_add(id, _manual_pong_id_handler, (ProfIdFreeCallback)g_date_time_unref, now); iq_id_handler_add(id, _manual_pong_id_handler, (ProfIqFreeCallback)g_date_time_unref, now);
iq_send_stanza(iq); iq_send_stanza(iq);
xmpp_stanza_release(iq); xmpp_stanza_release(iq);

6
src/xmpp/iq.h
View File

@ -35,12 +35,12 @@
#ifndef XMPP_IQ_H #ifndef XMPP_IQ_H
#define XMPP_IQ_H #define XMPP_IQ_H
typedef int(*ProfIdCallback)(xmpp_stanza_t *const stanza, void *const userdata); typedef int(*ProfIqCallback)(xmpp_stanza_t *const stanza, void *const userdata);
typedef void(*ProfIdFreeCallback)(void *userdata); typedef void(*ProfIqFreeCallback)(void *userdata);
void iq_handlers_init(void); void iq_handlers_init(void);
void iq_send_stanza(xmpp_stanza_t *const stanza); void iq_send_stanza(xmpp_stanza_t *const stanza);
void iq_id_handler_add(const char *const id, ProfIdCallback func, ProfIdFreeCallback free_func, void *userdata); void iq_id_handler_add(const char *const id, ProfIqCallback func, ProfIqFreeCallback free_func, void *userdata);
void iq_disco_info_request_onconnect(gchar *jid); void iq_disco_info_request_onconnect(gchar *jid);
void iq_disco_items_request_onconnect(gchar *jid); void iq_disco_items_request_onconnect(gchar *jid);
void iq_send_caps_request(const char *const to, const char *const id, const char *const node, const char *const ver); void iq_send_caps_request(const char *const to, const char *const id, const char *const node, const char *const ver);

4
src/xmpp/roster.c
View File

@ -137,7 +137,7 @@ roster_send_add_to_group(const char *const group, PContact contact)
} }
xmpp_ctx_t * const ctx = connection_get_ctx(); xmpp_ctx_t * const ctx = connection_get_ctx();
iq_id_handler_add(unique_id, _group_add_id_handler, (ProfIdFreeCallback)_free_group_data, data); iq_id_handler_add(unique_id, _group_add_id_handler, (ProfIqFreeCallback)_free_group_data, data);
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact), xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact),
p_contact_name(contact), new_groups); p_contact_name(contact), new_groups);
iq_send_stanza(iq); iq_send_stanza(iq);
@ -180,7 +180,7 @@ roster_send_remove_from_group(const char *const group, PContact contact)
data->name = strdup(p_contact_barejid(contact)); data->name = strdup(p_contact_barejid(contact));
} }
iq_id_handler_add(unique_id, _group_remove_id_handler, (ProfIdFreeCallback)_free_group_data, data); iq_id_handler_add(unique_id, _group_remove_id_handler, (ProfIqFreeCallback)_free_group_data, data);
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact), xmpp_stanza_t *iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact),
p_contact_name(contact), new_groups); p_contact_name(contact), new_groups);
iq_send_stanza(iq); iq_send_stanza(iq);