about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2022-05-03 18:34:07 +0200
committerMichael Vetter <jubalh@iodoru.org>2022-05-03 18:34:07 +0200
commitc8daee8c88669f6773aaaf11b08f1c9444da1815 (patch)
tree5c6615d0920c37ad6f5cdc827cfc9550ab3c6e20
parent794bd25cd9c81674f0a3cb0db1848a063efe26ab (diff)
downloadprofani-tty-c8daee8c88669f6773aaaf11b08f1c9444da1815.tar.gz
ox: use iq_id_handler_add instead of xmpp_id_handler_add
-rw-r--r--src/xmpp/ox.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xmpp/ox.c b/src/xmpp/ox.c
index 6f767550..0cfd4788 100644
--- a/src/xmpp/ox.c
+++ b/src/xmpp/ox.c
@@ -50,10 +50,10 @@
 #define KEYID_LENGTH 40
 
 static void _ox_metadata_node__public_key(const char* const fingerprint);
-static int _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata);
+static int _ox_metadata_result(xmpp_stanza_t* const stanza, void* const userdata);
 
 static void _ox_request_public_key(const char* const jid, const char* const fingerprint);
-static int _ox_public_key_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata);
+static int _ox_public_key_result(xmpp_stanza_t* const stanza, void* const userdata);
 
 /*!
  * \brief Current Date and Time.
@@ -199,7 +199,7 @@ ox_discover_public_key(const char* const jid)
     xmpp_stanza_add_child(pubsub, items);
     xmpp_stanza_add_child(iq, pubsub);
 
-    xmpp_id_handler_add(connection_get_conn(), _ox_metadata_result, id, strdup(jid));
+    iq_id_handler_add(xmpp_stanza_get_id(iq), _ox_metadata_result, NULL, NULL);
     iq_send_stanza(iq);
 
     xmpp_stanza_release(iq);
@@ -281,7 +281,7 @@ _ox_metadata_node__public_key(const char* const fingerprint)
 }
 
 static int
-_ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata)
+_ox_metadata_result(xmpp_stanza_t* const stanza, void* const userdata)
 {
     log_debug("[OX] Processing result %s's metadata.", (char*)userdata);
 
@@ -382,7 +382,7 @@ _ox_request_public_key(const char* const jid, const char* const fingerprint)
     xmpp_stanza_add_child(pubsub, items);
     xmpp_stanza_add_child(iq, pubsub);
 
-    xmpp_id_handler_add(connection_get_conn(), _ox_public_key_result, id, NULL);
+    iq_id_handler_add(xmpp_stanza_get_id(iq), _ox_public_key_result, NULL, NULL);
 
     iq_send_stanza(iq);
     xmpp_stanza_release(iq);
@@ -413,7 +413,7 @@ _ox_request_public_key(const char* const jid, const char* const fingerprint)
  */
 
 int
-_ox_public_key_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata)
+_ox_public_key_result(xmpp_stanza_t* const stanza, void* const userdata)
 {
     log_debug("[OX] Processing result public key");