--- a/libpurple/protocols/jabber/adhoccommands.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/adhoccommands.c Mon Dec 12 23:41:40 2022 -0600
@@ -43,7 +43,8 @@
-static void do_adhoc_ignoreme(JabberStream *js, ...) {
+do_adhoc_ignoreme(G_GNUC_UNUSED JabberStream *js, ...) { /* we don't have to do anything */
@@ -93,8 +94,8 @@
jabber_adhoc_disco_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+ JabberIqType type, G_GNUC_UNUSED const char *id, + PurpleXmlNode *packet, G_GNUC_UNUSED gpointer data) @@ -147,9 +148,9 @@
-jabber_adhoc_parse(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_adhoc_parse(JabberStream *js, const char *from, JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *command = purple_xmlnode_get_child_with_namespace(packet, "command", "http://jabber.org/protocol/commands");
const char *status = purple_xmlnode_get_attrib(command,"status");
@@ -238,7 +239,8 @@
-jabber_adhoc_got_server_list(JabberStream *js, const char *from, PurpleXmlNode *query)
+jabber_adhoc_got_server_list(JabberStream *js, G_GNUC_UNUSED const char *from, @@ -270,8 +272,10 @@
jabber_adhoc_server_got_list_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+ G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *query = purple_xmlnode_get_child_with_namespace(packet, "query",
--- a/libpurple/protocols/jabber/buddy.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/buddy.c Mon Dec 12 23:41:40 2022 -0600
@@ -439,8 +439,8 @@
* Send vCard info to Jabber server
-jabber_set_info(PurpleProtocolServer *protocol_server, PurpleConnection *gc,
+jabber_set_info(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, + PurpleConnection *gc, const char *info) @@ -533,7 +533,7 @@
-jabber_set_buddy_icon(PurpleProtocolServer *protocol_server,
+jabber_set_buddy_icon(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, PurpleImage *img)
PurpleAccount *account = purple_connection_get_account(gc);
@@ -900,9 +900,10 @@
-static void jabber_vcard_save_mine(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_vcard_save_mine(JabberStream *js, G_GNUC_UNUSED const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + PurpleXmlNode *packet, G_GNUC_UNUSED gpointer data) PurpleXmlNode *vcard, *photo, *binval;
char *txt, *vcard_hash = NULL;
@@ -1237,9 +1238,10 @@
return purple_strequal(resource_1, resource_2);
-static void jabber_version_parse(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_version_parse(G_GNUC_UNUSED JabberStream *js, const char *from, + JabberIqType type, const char *id, PurpleXmlNode *packet, JabberBuddyInfo *jbi = data;
@@ -1356,9 +1358,10 @@
jabber_buddy_info_show_if_ready(jbi);
-static void jabber_last_offline_parse(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_last_offline_parse(G_GNUC_UNUSED JabberStream *js, + G_GNUC_UNUSED const char *from, JabberIqType type, + const char *id, PurpleXmlNode *packet, gpointer data) JabberBuddyInfo *jbi = data;
@@ -1385,9 +1388,10 @@
jabber_buddy_info_show_if_ready(jbi);
-static void jabber_time_parse(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_time_parse(G_GNUC_UNUSED JabberStream *js, const char *from, + JabberIqType type, const char *id, PurpleXmlNode *packet, JabberBuddyInfo *jbi = data;
JabberBuddyResource *jbr;
@@ -1608,7 +1612,7 @@
-jabber_buddy_get_info(PurpleProtocolServer *protocol_server,
+jabber_buddy_get_info(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, const char *who)
JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -1662,7 +1666,8 @@
purple_xmlnode_free(presence);
-static void jabber_buddy_make_invisible(PurpleBlistNode *node, gpointer data)
+jabber_buddy_make_invisible(PurpleBlistNode *node, G_GNUC_UNUSED gpointer data) @@ -1677,7 +1682,8 @@
jabber_buddy_set_invisibility(js, purple_buddy_get_name(buddy), TRUE);
-static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data)
+jabber_buddy_make_visible(PurpleBlistNode *node, G_GNUC_UNUSED gpointer data) @@ -1707,7 +1713,7 @@
jabber_buddy_cancel_presence_notification(PurpleBlistNode *node,
+ G_GNUC_UNUSED gpointer data) @@ -1730,7 +1736,8 @@
-static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data)
+jabber_buddy_rerequest_auth(PurpleBlistNode *node, G_GNUC_UNUSED gpointer data) @@ -1745,8 +1752,8 @@
jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "subscribe");
-static void jabber_buddy_unsubscribe(PurpleBlistNode *node, gpointer data)
+jabber_buddy_unsubscribe(PurpleBlistNode *node, G_GNUC_UNUSED gpointer data) @@ -1761,7 +1768,9 @@
jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "unsubscribe");
-static void jabber_buddy_login(PurpleBlistNode *node, gpointer data) {
+jabber_buddy_login(PurpleBlistNode *node, G_GNUC_UNUSED gpointer data) if(PURPLE_IS_BUDDY(node)) {
/* simply create a directed presence of the current status */
PurpleBuddy *buddy = (PurpleBuddy *) node;
@@ -1787,7 +1796,9 @@
-static void jabber_buddy_logout(PurpleBlistNode *node, gpointer data) {
+jabber_buddy_logout(PurpleBlistNode *node, G_GNUC_UNUSED gpointer data) if(PURPLE_IS_BUDDY(node)) {
/* simply create a directed unavailable presence */
PurpleBuddy *buddy = (PurpleBuddy *) node;
@@ -1893,7 +1904,8 @@
-jabber_blist_node_menu(PurpleProtocolClient *client, PurpleBlistNode *node)
+jabber_blist_node_menu(G_GNUC_UNUSED PurpleProtocolClient *client, if(PURPLE_IS_BUDDY(node)) {
return jabber_buddy_menu((PurpleBuddy *) node);
@@ -1903,16 +1915,20 @@
-static void user_search_result_add_buddy_cb(PurpleConnection *gc, GList *row, void *user_data)
+user_search_result_add_buddy_cb(PurpleConnection *gc, GList *row, + G_GNUC_UNUSED gpointer user_data) /* XXX find out the jid */
purple_blist_request_add_buddy(purple_connection_get_account(gc),
g_list_nth_data(row, 0), NULL, NULL);
-static void user_search_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+user_search_result_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, + G_GNUC_UNUSED gpointer data) PurpleNotifySearchResults *results;
PurpleNotifySearchColumn *column;
@@ -2052,7 +2068,9 @@
-static void user_search_cancel_cb(struct user_search_info *usi, PurpleRequestFields *fields)
+user_search_cancel_cb(struct user_search_info *usi, + G_GNUC_UNUSED PurpleRequestFields *fields) g_free(usi->directory_server);
@@ -2090,9 +2108,11 @@
-static void user_search_fields_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+user_search_fields_result_cb(JabberStream *js, const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *query, *x;
--- a/libpurple/protocols/jabber/chat.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/chat.c Mon Dec 12 23:41:40 2022 -0600
@@ -32,8 +32,8 @@
-jabber_chat_info(PurpleProtocolChat *protocol_chat,
- PurpleConnection *connection)
+jabber_chat_info(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, + G_GNUC_UNUSED PurpleConnection *connection) PurpleProtocolChatEntry *pce;
@@ -112,7 +112,7 @@
-find_by_id_cb(gpointer key, gpointer value, gpointer user_data)
+find_by_id_cb(G_GNUC_UNUSED gpointer key, gpointer value, gpointer user_data) JabberChat *chat = value;
@@ -194,7 +194,9 @@
void jabber_chat_member_free(JabberChatMember *jcm);
-jabber_get_chat_name(PurpleProtocolChat *protocol_chat, GHashTable *data) {
+jabber_get_chat_name(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, char *room, *server, *chat_name = NULL;
room = g_hash_table_lookup(data, "room");
@@ -212,9 +214,10 @@
g_hash_table_insert(hash_table, g_strdup(key), g_strdup(value));
-static JabberChat *jabber_chat_new(JabberStream *js, const char *room,
- const char *server, const char *handle,
- const char *password, GHashTable *data)
+jabber_chat_new(JabberStream *js, const char *room, const char *server, + const char *handle, G_GNUC_UNUSED const char *password, @@ -372,8 +375,8 @@
-jabber_chat_leave(PurpleProtocolChat *protocol_chat, PurpleConnection *gc,
+jabber_chat_leave(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, + PurpleConnection *gc, gint id) JabberStream *js = purple_connection_get_protocol_data(gc);
JabberChat *chat = jabber_chat_find_by_id(js, id);
@@ -417,7 +420,7 @@
-jabber_chat_user_real_name(PurpleProtocolChat *protocol_chat,
+jabber_chat_user_real_name(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, PurpleConnection *gc, gint id, const gchar *who)
JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -455,9 +458,11 @@
-static void jabber_chat_room_configure_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_chat_room_configure_cb(JabberStream *js, const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *query, *x;
@@ -569,9 +574,12 @@
-jabber_chat_register_x_data_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_chat_register_x_data_result_cb(JabberStream *js, + G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED gpointer data) if (type == JABBER_IQ_ERROR) {
char *msg = jabber_parse_error(js, packet, NULL);
@@ -605,9 +613,10 @@
-static void jabber_chat_register_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_chat_register_cb(JabberStream *js, const char *from, JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *query, *x;
@@ -701,7 +710,7 @@
-jabber_chat_set_topic(PurpleProtocolChat *protocol_chat,
+jabber_chat_set_topic(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, PurpleConnection *gc, gint id, const gchar *topic)
JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -768,9 +777,10 @@
-static void roomlist_disco_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+roomlist_disco_result_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + PurpleXmlNode *packet, G_GNUC_UNUSED gpointer data) @@ -826,7 +836,8 @@
-static void roomlist_cancel_cb(JabberStream *js, const char *server) {
+roomlist_cancel_cb(JabberStream *js, G_GNUC_UNUSED const char *server) { purple_roomlist_set_in_progress(js->roomlist, FALSE);
g_object_unref(js->roomlist);
@@ -861,7 +872,7 @@
-jabber_roomlist_get_list(PurpleProtocolRoomlist *protocol_roomlist,
+jabber_roomlist_get_list(G_GNUC_UNUSED PurpleProtocolRoomlist *protocol_roomlist, JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -884,7 +895,7 @@
-jabber_roomlist_cancel(PurpleProtocolRoomlist *protocol_roomlist,
+jabber_roomlist_cancel(G_GNUC_UNUSED PurpleProtocolRoomlist *protocol_roomlist, @@ -904,7 +915,7 @@
-jabber_roomlist_room_serialize(PurpleProtocolRoomlist *protocol_roomlist,
+jabber_roomlist_room_serialize(G_GNUC_UNUSED PurpleProtocolRoomlist *protocol_roomlist, PurpleRoomlistRoom *room)
const gchar *room_name = NULL, *server = NULL;
@@ -922,8 +933,10 @@
-void jabber_chat_track_handle(JabberChat *chat, const char *handle,
- const char *jid, const char *affiliation, const char *role)
+jabber_chat_track_handle(JabberChat *chat, const char *handle, const char *jid, + G_GNUC_UNUSED const char *affiliation, + G_GNUC_UNUSED const char *role) JabberChatMember *jcm = g_new0(JabberChatMember, 1);
@@ -1011,8 +1024,10 @@
-jabber_chat_affiliation_list_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
+jabber_chat_affiliation_list_cb(JabberStream *js, + G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, gpointer data)
@@ -1106,9 +1121,10 @@
-static void jabber_chat_role_list_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_chat_role_list_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + PurpleXmlNode *packet, gpointer data) PurpleXmlNode *query, *item;
@@ -1167,9 +1183,12 @@
-static void jabber_chat_disco_traffic_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_chat_disco_traffic_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED PurpleXmlNode *packet, int chat_id = GPOINTER_TO_INT(data);
--- a/libpurple/protocols/jabber/disco.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/disco.c Mon Dec 12 23:41:40 2022 -0600
@@ -51,7 +51,8 @@
jabber_disco_bytestream_server_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
+ G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, gpointer data)
JabberBytestreamsStreamhost *sh = data;
@@ -168,9 +169,10 @@
-static void jabber_disco_info_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_disco_info_cb(JabberStream *js, const char *from, JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, struct _jabber_disco_info_cb_data *jdicd = data;
@@ -420,8 +422,10 @@
jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+ G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *query, *child;
@@ -503,8 +507,10 @@
jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+ G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *query, *child;
--- a/libpurple/protocols/jabber/jabber.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/jabber.c Mon Dec 12 23:41:40 2022 -0600
@@ -102,9 +102,10 @@
-jabber_session_initialized_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_session_initialized_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED PurpleXmlNode *packet, + G_GNUC_UNUSED gpointer data) if (type == JABBER_IQ_RESULT) {
jabber_disco_items_server(js);
@@ -128,9 +129,10 @@
-static void jabber_bind_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_bind_result_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + JabberIqType type, G_GNUC_UNUSED const char *id, + PurpleXmlNode *packet, G_GNUC_UNUSED gpointer data) @@ -403,8 +405,8 @@
-jabber_send_raw(PurpleProtocolServer *protocol_server, JabberStream *js,
- const gchar *data, gint len)
+jabber_send_raw(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, + JabberStream *js, const char *data, gint len) @@ -509,7 +511,7 @@
-jabber_protocol_send_raw(PurpleProtocolServer *protocol_server,
+jabber_protocol_send_raw(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, const gchar *buf, gint len)
JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -567,7 +569,9 @@
-jabber_keepalive(PurpleProtocolServer *protocol_server, PurpleConnection *gc) {
+jabber_keepalive(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, JabberStream *js = purple_connection_get_protocol_data(gc);
if (js->keepalive_timeout == 0) {
@@ -578,7 +582,8 @@
-jabber_get_keepalive_interval(PurpleProtocolServer *protocol_server) {
+jabber_get_keepalive_interval(G_GNUC_UNUSED PurpleProtocolServer *protocol_server) @@ -671,7 +676,7 @@
jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING);
source = g_pollable_input_stream_create_source(
G_POLLABLE_INPUT_STREAM(js->input), js->cancellable);
- g_source_set_callback(source, (GSourceFunc)jabber_recv_cb, js->gc, NULL);
+ g_source_set_callback(source, G_SOURCE_FUNC(jabber_recv_cb), js->gc, NULL); js->inpa = g_source_attach(source, NULL);
@@ -1165,8 +1170,8 @@
-jabber_idle_set(PurpleProtocolServer *protocol_server, PurpleConnection *gc,
+jabber_idle_set(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, + PurpleConnection *gc, gint idle) JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -1177,9 +1182,12 @@
jabber_presence_send(js, FALSE);
-void jabber_blocklist_parse_push(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
+jabber_blocklist_parse_push(G_GNUC_UNUSED JabberStream *js, + G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, + G_GNUC_UNUSED PurpleXmlNode *child) @@ -1282,7 +1290,8 @@
-void jabber_request_block_list(JabberStream *js)
+jabber_request_block_list(G_GNUC_UNUSED JabberStream *js) @@ -1531,7 +1540,8 @@
-jabber_list_emblem(PurpleProtocolClient *client, PurpleBuddy *b) {
+jabber_list_emblem(G_GNUC_UNUSED PurpleProtocolClient *client, PurpleBuddy *b) PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(b));
@@ -1574,7 +1584,8 @@
-jabber_status_text(PurpleProtocolClient *client, PurpleBuddy *b) {
+jabber_status_text(G_GNUC_UNUSED PurpleProtocolClient *client, PurpleBuddy *b) PurpleAccount *account = purple_buddy_get_account(b);
@@ -1767,7 +1778,7 @@
jabber_status_types(G_GNUC_UNUSED PurpleProtocol *protocol,
- PurpleAccount *account)
+ G_GNUC_UNUSED PurpleAccount *account) @@ -1889,8 +1900,10 @@
-jabber_password_change_result_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
+jabber_password_change_result_cb(JabberStream *js, + G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, gpointer data)
if (type == JABBER_IQ_RESULT) {
@@ -2000,13 +2013,14 @@
-xmpp_protocol_actions_get_prefix(PurpleProtocolActions *actions) {
+xmpp_protocol_actions_get_prefix(G_GNUC_UNUSED PurpleProtocolActions *actions) -xmpp_protocol_actions_get_action_group(PurpleProtocolActions *actions,
- PurpleConnection *connection)
+xmpp_protocol_actions_get_action_group(G_GNUC_UNUSED PurpleProtocolActions *actions, + PurpleConnection *connection) JabberStream *js = purple_connection_get_protocol_data(connection);
GSimpleActionGroup *group = NULL;
@@ -2047,7 +2061,7 @@
-xmpp_protocol_actions_get_menu(PurpleProtocolActions *actions) {
+xmpp_protocol_actions_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions) { @@ -2084,8 +2098,8 @@
-jabber_find_blist_chat(PurpleProtocolClient *client, PurpleAccount *account,
+jabber_find_blist_chat(G_GNUC_UNUSED PurpleProtocolClient *client, + PurpleAccount *account, const char *name) PurpleBlistNode *gnode, *cnode;
@@ -2126,8 +2140,8 @@
-jabber_convo_closed(PurpleProtocolClient *client, PurpleConnection *gc,
+jabber_convo_closed(G_GNUC_UNUSED PurpleProtocolClient *client, + PurpleConnection *gc, const char *who) JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -2147,8 +2161,8 @@
-jabber_client_normalize(PurpleProtocolClient *client, PurpleAccount *account,
+jabber_client_normalize(G_GNUC_UNUSED PurpleProtocolClient *client, + PurpleAccount *account, const char *who) return jabber_normalize(account, who);
@@ -2323,8 +2337,10 @@
-static PurpleCmdRet jabber_cmd_chat_config(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_config(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + G_GNUC_UNUSED char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2335,8 +2351,11 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_register(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_register(PurpleConversation *conv, + G_GNUC_UNUSED const char *cmd, + G_GNUC_UNUSED char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2347,8 +2366,10 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_topic(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_topic(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2376,8 +2397,9 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_nick(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_nick(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, char **error, G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2395,8 +2417,10 @@
return PURPLE_CMD_RET_FAILED;
-static PurpleCmdRet jabber_cmd_chat_part(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_part(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2407,8 +2431,9 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_ban(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_ban(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, char **error, G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2423,8 +2448,10 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_affiliate(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_affiliate(PurpleConversation *conv, + G_GNUC_UNUSED const char *cmd, char **args, + char **error, G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2459,8 +2486,9 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_role(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_role(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, char **error, G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2494,8 +2522,10 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_invite(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_invite(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED gpointer data) return PURPLE_CMD_RET_FAILED;
@@ -2507,8 +2537,9 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_join(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_join(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, char **error, G_GNUC_UNUSED gpointer data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2554,8 +2585,9 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_kick(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_kick(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, char **error, G_GNUC_UNUSED void *data) JabberChat *chat = jabber_chat_find_by_conv(PURPLE_CHAT_CONVERSATION(conv));
@@ -2570,8 +2602,10 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_chat_msg(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_chat_msg(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED void *data) PurpleAccount *account = NULL;
PurpleConnection *pc = NULL;
@@ -2599,8 +2633,9 @@
return PURPLE_CMD_RET_OK;
-static PurpleCmdRet jabber_cmd_ping(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_ping(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, char **error, G_GNUC_UNUSED void *data) @@ -2620,12 +2655,15 @@
-jabber_offline_message(PurpleProtocolClient *client, PurpleBuddy *buddy) {
+jabber_offline_message(G_GNUC_UNUSED PurpleProtocolClient *client, + G_GNUC_UNUSED PurpleBuddy *buddy) -jabber_audio_enabled(JabberStream *js, const char *namespace)
+jabber_audio_enabled(G_GNUC_UNUSED JabberStream *js, + G_GNUC_UNUSED const char *namespace) PurpleMediaManager *manager = purple_media_manager_get();
PurpleMediaCaps caps = purple_media_manager_get_ui_caps(manager);
@@ -2634,7 +2672,8 @@
-jabber_video_enabled(JabberStream *js, const char *namespace)
+jabber_video_enabled(G_GNUC_UNUSED JabberStream *js, + G_GNUC_UNUSED const char *namespace) PurpleMediaManager *manager = purple_media_manager_get();
PurpleMediaCaps caps = purple_media_manager_get_ui_caps(manager);
@@ -2652,7 +2691,7 @@
jabber_media_cancel_cb(JabberMediaRequest *request,
- PurpleRequestFields *fields)
+ G_GNUC_UNUSED PurpleRequestFields *fields) @@ -2814,8 +2853,8 @@
-jabber_get_media_caps(PurpleProtocolMedia *media, PurpleAccount *account,
+jabber_get_media_caps(G_GNUC_UNUSED PurpleProtocolMedia *media, + PurpleAccount *account, const char *who) PurpleConnection *gc = purple_account_get_connection(account);
JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -2897,8 +2936,8 @@
-jabber_can_receive_file(PurpleProtocolXfer *prplxfer, PurpleConnection *gc,
+jabber_can_receive_file(G_GNUC_UNUSED PurpleProtocolXfer *prplxfer, + PurpleConnection *gc, const char *who) JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -2947,8 +2986,9 @@
-jabber_cmd_mood(PurpleConversation *conv,
- const char *cmd, char **args, char **error, void *data)
+jabber_cmd_mood(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd, + char **args, G_GNUC_UNUSED char **error, + G_GNUC_UNUSED gpointer data) PurpleAccount *account = purple_conversation_get_account(conv);
JabberStream *js = purple_connection_get_protocol_data(purple_account_get_connection(account));
@@ -3103,7 +3143,8 @@
static void cmds_free_func(gpointer value)
GSList *commands = value;
- g_slist_free_full(commands, (GDestroyNotify)purple_cmd_unregister);
+ g_slist_free_full(commands, + (GDestroyNotify)(GCallback)purple_cmd_unregister); static void jabber_unregister_commands(PurpleProtocol *protocol)
@@ -3155,7 +3196,7 @@
if (g_ascii_strcasecmp(proto, "xmpp"))
acct_id = g_hash_table_lookup(params, "account");
@@ -3431,7 +3472,7 @@
static PurpleBuddyIconSpec *
-jabber_protocol_get_buddy_icon_spec(PurpleProtocol *protocol) {
+jabber_protocol_get_buddy_icon_spec(G_GNUC_UNUSED PurpleProtocol *protocol) { return purple_buddy_icon_spec_new("png",
@@ -3439,7 +3480,7 @@
-jabber_protocol_init(JabberProtocol *self) {
+jabber_protocol_init(G_GNUC_UNUSED JabberProtocol *self) { @@ -3507,7 +3548,7 @@
-jabber_protocol_chat_info_defaults(PurpleProtocolChat *protocol_chat,
+jabber_protocol_chat_info_defaults(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, PurpleConnection *connection,
@@ -3515,14 +3556,14 @@
-jabber_protocol_chat_join(PurpleProtocolChat *protocol_chat,
+jabber_protocol_chat_join(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, PurpleConnection *connection, GHashTable *components)
jabber_chat_join(connection, components);
-jabber_protocol_chat_invite(PurpleProtocolChat *protocol_chat,
+jabber_protocol_chat_invite(G_GNUC_UNUSED PurpleProtocolChat *protocol_chat, PurpleConnection *connection, gint id,
const gchar *message, const gchar *who)
@@ -3589,7 +3630,7 @@
jabber_protocol_xfer_iface_init))
static GPluginPluginInfo *
-jabber_query(GError **error)
+jabber_query(G_GNUC_UNUSED GError **error) return purple_plugin_info_new(
@@ -3643,7 +3684,8 @@
-jabber_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
+jabber_unload(G_GNUC_UNUSED GPluginPlugin *plugin, + G_GNUC_UNUSED gboolean shutdown, GError **error) PurpleProtocolManager *manager = purple_protocol_manager_get_default();
--- a/libpurple/protocols/jabber/jingle/rtp.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/jingle/rtp.c Mon Dec 12 23:41:40 2022 -0600
@@ -132,8 +132,8 @@
-jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid,
- JingleSession *session)
+jingle_rtp_codecs_changed_cb(G_GNUC_UNUSED PurpleMedia *media, char *sid, + JingleSession *session) purple_debug_info("jingle-rtp", "jingle_rtp_codecs_changed_cb: "
"session_id: %s jingle_session: %p\n", sid, session);
@@ -141,7 +141,10 @@
-jingle_rtp_new_candidate_cb(PurpleMedia *media, gchar *sid, gchar *name, PurpleMediaCandidate *candidate, JingleSession *session)
+jingle_rtp_new_candidate_cb(G_GNUC_UNUSED PurpleMedia *media, char *sid, + G_GNUC_UNUSED char *name, + PurpleMediaCandidate *candidate, + JingleSession *session) JingleContent *content = jingle_session_find_content(session, sid, NULL);
JingleTransport *transport;
@@ -168,9 +171,10 @@
-jingle_rtp_initiate_ack_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jingle_rtp_initiate_ack_cb(G_GNUC_UNUSED JabberStream *js, + G_GNUC_UNUSED const char *from, JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, JingleSession *session = data;
@@ -182,8 +186,9 @@
-jingle_rtp_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
- gchar *sid, gchar *name, JingleSession *session)
+jingle_rtp_state_changed_cb(G_GNUC_UNUSED PurpleMedia *media, + PurpleMediaState state, char *sid, char *name, + G_GNUC_UNUSED JingleSession *session) purple_debug_info("jingle-rtp", "state-changed: state %d "
"id: %s name: %s\n", state, sid ? sid : "(null)",
@@ -192,8 +197,8 @@
jingle_rtp_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
- gchar *sid, gchar *name, gboolean local,
- JingleSession *session)
+ char *sid, char *name, G_GNUC_UNUSED gboolean local, + JingleSession *session) purple_debug_info("jingle-rtp", "stream-info: type %d "
"id: %s name: %s\n", type, sid ? sid : "(null)",
@@ -684,7 +689,7 @@
*****************************************************************************/
-jingle_rtp_init (JingleRtp *rtp)
+jingle_rtp_init(G_GNUC_UNUSED JingleRtp *rtp) @@ -742,7 +747,7 @@
-jingle_rtp_class_finalize(JingleRtpClass *klass) {
+jingle_rtp_class_finalize(G_GNUC_UNUSED JingleRtpClass *klass) { --- a/libpurple/protocols/jabber/meson.build Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/meson.build Mon Dec 12 23:41:40 2022 -0600
@@ -101,7 +101,9 @@
c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-XMPP"'],
link_args : jabber_link_args,
dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, libsoup, glib, gio, math, ws2_32],
- install : true, install_dir : PURPLE_PLUGINDIR)
+ install_dir : PURPLE_PLUGINDIR, + override_options : ['c_std=c99', 'warning_level=2']) devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir())
--- a/libpurple/protocols/jabber/presence.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/presence.c Mon Dec 12 23:41:40 2022 -0600
@@ -70,8 +70,9 @@
return JABBER_PRESENCE_AVAILABLE;
-static void chats_send_presence_foreach(gpointer key, gpointer val,
+chats_send_presence_foreach(G_GNUC_UNUSED gpointer key, gpointer val, PurpleXmlNode *presence = user_data;
@@ -143,7 +144,7 @@
-jabber_set_status(PurpleProtocolServer *protocol_server,
+jabber_set_status(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleAccount *account, PurpleStatus *status)
@@ -367,7 +368,7 @@
deny_add_cb(G_GNUC_UNUSED PurpleAuthorizationRequest *request,
- const char *message, gpointer data)
+ G_GNUC_UNUSED const char *message, gpointer data) struct _jabber_add_permit *jap = data;
@@ -382,8 +383,9 @@
jabber_vcard_parse_avatar(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer blah)
+ G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, + G_GNUC_UNUSED gpointer data) PurpleXmlNode *vcard, *photo, *binval, *fn, *nick;
@@ -1109,7 +1111,8 @@
/* Incoming presence handlers */
-parse_priority(JabberStream *js, JabberPresence *presence, PurpleXmlNode *priority)
+parse_priority(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, + PurpleXmlNode *priority) char *p = purple_xmlnode_get_data(priority);
@@ -1125,7 +1128,8 @@
-parse_show(JabberStream *js, JabberPresence *presence, PurpleXmlNode *show)
+parse_show(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, @@ -1145,7 +1149,8 @@
-parse_status(JabberStream *js, JabberPresence *presence, PurpleXmlNode *status)
+parse_status(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, /* TODO: Check/track language attribute? */
@@ -1154,7 +1159,8 @@
-parse_delay(JabberStream *js, JabberPresence *presence, PurpleXmlNode *delay)
+parse_delay(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, GTimeZone *tz = g_time_zone_new_utc();
const char *stamp = purple_xmlnode_get_attrib(delay, "stamp");
@@ -1166,7 +1172,8 @@
-parse_idle(JabberStream *js, JabberPresence *presence, PurpleXmlNode *query)
+parse_idle(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, const gchar *seconds = purple_xmlnode_get_attrib(query, "seconds");
@@ -1180,7 +1187,8 @@
-parse_caps(JabberStream *js, JabberPresence *presence, PurpleXmlNode *c)
+parse_caps(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, /* TODO: Move the rest of the caps handling in here, after changing the
* the "do we have details about this (node, ver) and exts" to not
@@ -1190,14 +1198,16 @@
-parse_nickname(JabberStream *js, JabberPresence *presence, PurpleXmlNode *nick)
+parse_nickname(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, g_free(presence->nickname);
presence->nickname = purple_xmlnode_get_data(nick);
-parse_vcard_avatar(JabberStream *js, JabberPresence *presence, PurpleXmlNode *x)
+parse_vcard_avatar(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, PurpleXmlNode *photo = purple_xmlnode_get_child(x, "photo");
@@ -1210,7 +1220,8 @@
-parse_muc_user(JabberStream *js, JabberPresence *presence, PurpleXmlNode *x)
+parse_muc_user(G_GNUC_UNUSED JabberStream *js, JabberPresence *presence, --- a/libpurple/protocols/jabber/roster.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/roster.c Mon Dec 12 23:41:40 2022 -0600
@@ -45,9 +45,10 @@
return g_string_free(out, FALSE);
-static void roster_request_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+roster_request_cb(JabberStream *js, const char *from, JabberIqType type, + const char *id, PurpleXmlNode *packet, + G_GNUC_UNUSED gpointer data) @@ -336,9 +337,10 @@
-jabber_roster_add_buddy(PurpleProtocolServer *protocol_server,
+jabber_roster_add_buddy(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, PurpleBuddy *buddy,
- PurpleGroup *group, const gchar *message)
+ G_GNUC_UNUSED PurpleGroup *group, + G_GNUC_UNUSED const char *message) JabberStream *js = purple_connection_get_protocol_data(gc);
@@ -402,7 +404,7 @@
-jabber_roster_alias_change(PurpleProtocolServer *protocol_server,
+jabber_roster_alias_change(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, const gchar *name,
@@ -419,7 +421,7 @@
-jabber_roster_group_change(PurpleProtocolServer *protocol_server,
+jabber_roster_group_change(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, const gchar *name,
const gchar *old_group, const gchar *new_group)
@@ -458,7 +460,7 @@
-jabber_roster_remove_buddy(PurpleProtocolServer *protocol_server,
+jabber_roster_remove_buddy(G_GNUC_UNUSED PurpleProtocolServer *protocol_server, PurpleConnection *gc, PurpleBuddy *buddy,
--- a/libpurple/protocols/jabber/si.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/si.c Mon Dec 12 23:41:40 2022 -0600
@@ -745,7 +745,7 @@
-jabber_si_xfer_bytestreams_send_connected_cb(GSocketService *service,
+jabber_si_xfer_bytestreams_send_connected_cb(G_GNUC_UNUSED GSocketService *service, GSocketConnection *connection,
G_GNUC_UNUSED gpointer data)
@@ -771,7 +771,7 @@
jabber_si_connect_proxy_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
+ JabberIqType type, G_GNUC_UNUSED const char *id, PurpleXmlNode *packet, gpointer data)
@@ -1252,9 +1252,11 @@
-static void jabber_si_xfer_send_method_cb(JabberStream *js, const char *from,
- JabberIqType type, const char *id,
- PurpleXmlNode *packet, gpointer data)
+jabber_si_xfer_send_method_cb(JabberStream *js, G_GNUC_UNUSED const char *from, + G_GNUC_UNUSED JabberIqType type, + G_GNUC_UNUSED const char *id, + PurpleXmlNode *packet, gpointer data) PurpleXmlNode *si, *feature, *x, *field, *value;
@@ -1465,7 +1467,9 @@
-static void resource_select_cancel_cb(PurpleXfer *xfer, PurpleRequestFields *fields)
+resource_select_cancel_cb(PurpleXfer *xfer, + G_GNUC_UNUSED PurpleRequestFields *fields) purple_xfer_cancel_local(xfer);
@@ -1645,7 +1649,9 @@
-PurpleXfer *jabber_si_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *gc, const char *who)
+jabber_si_new_xfer(G_GNUC_UNUSED PurpleProtocolXfer *prplxfer, + PurpleConnection *gc, const char *who) @@ -1696,8 +1702,9 @@
-jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
- const char *id, PurpleXmlNode *si)
+jabber_si_parse(JabberStream *js, const char *from, + G_GNUC_UNUSED JabberIqType type, const char *id, PurpleXmlNode *file, *feature, *x, *field, *option, *value;
@@ -1859,7 +1866,7 @@
-jabber_si_xfer_class_finalize(JabberSIXferClass *klass) {
+jabber_si_xfer_class_finalize(G_GNUC_UNUSED JabberSIXferClass *klass) { --- a/libpurple/protocols/jabber/xdata.c Mon Dec 12 23:38:47 2022 -0600
+++ b/libpurple/protocols/jabber/xdata.c Mon Dec 12 23:41:40 2022 -0600
@@ -40,7 +40,7 @@
struct jabber_x_data_data {
- jabber_x_data_action_cb cb;
@@ -49,7 +49,7 @@
static void jabber_x_data_ok_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) {
PurpleXmlNode *result = purple_xmlnode_new("x");
- jabber_x_data_action_cb cb = data->cb;
+ GCallback cb = data->cb; gpointer user_data = data->user_data;
JabberStream *js = data->js;
@@ -146,17 +146,21 @@
g_list_free_full(data->actions, g_free);
- cb(js, result, actionhandle, user_data);
+ ((jabber_x_data_action_cb)cb)(js, result, actionhandle, user_data); ((jabber_x_data_cb)cb)(js, result, user_data);
-static void jabber_x_data_cancel_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) {
+jabber_x_data_cancel_cb(struct jabber_x_data_data *data, + G_GNUC_UNUSED PurpleRequestFields *fields) PurpleXmlNode *result = purple_xmlnode_new("x");
- jabber_x_data_action_cb cb = data->cb;
+ GCallback cb = data->cb; gpointer user_data = data->user_data;
JabberStream *js = data->js;
gboolean hasActions = (data->actions != NULL);
@@ -168,15 +172,18 @@
purple_xmlnode_set_namespace(result, "jabber:x:data");
purple_xmlnode_set_attrib(result, "type", "cancel");
- cb(js, result, NULL, user_data);
+ ((jabber_x_data_action_cb)cb)(js, result, NULL, user_data); ((jabber_x_data_cb)cb)(js, result, user_data);
void *jabber_x_data_request(JabberStream *js, PurpleXmlNode *packet, jabber_x_data_cb cb, gpointer user_data)
- return jabber_x_data_request_with_actions(js, packet, NULL, 0, (jabber_x_data_action_cb)cb, user_data);
+ return jabber_x_data_request_with_actions(js, packet, NULL, 0, + (jabber_x_data_action_cb)(GCallback)cb, void *jabber_x_data_request_with_actions(JabberStream *js, PurpleXmlNode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data)
@@ -194,7 +201,7 @@
data->fields = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
data->user_data = user_data;
+ data->cb = G_CALLBACK(cb); fields = purple_request_fields_new();