diff options
| author | James Booth <boothj5@gmail.com> | 2014-10-26 20:53:33 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-10-26 20:53:33 +0000 |
| commit | d7911664e1fe0a000c06b5cf953992745341a56a (patch) | |
| tree | 91f8a275e4190274e00125f167ee7ff50d622d11 /src/xmpp | |
| parent | be7c4f5a0051b61252001c5ae6cf46eed63b3bc0 (diff) | |
| parent | fea8945953056012926285ecd7205b69e2a520e6 (diff) | |
| download | profani-tty-d7911664e1fe0a000c06b5cf953992745341a56a.tar.gz | |
Merge branch 'master' into symlinks
Diffstat (limited to 'src/xmpp')
| -rw-r--r-- | src/xmpp/iq.c | 4 | ||||
| -rw-r--r-- | src/xmpp/xmpp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index b8530b7c..a33f2291 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -234,7 +234,7 @@ _iq_confirm_instant_room(const char * const room_jid) } static void -_iq_destroy_instant_room(const char * const room_jid) +_iq_destroy_room(const char * const room_jid) { xmpp_conn_t * const conn = connection_get_conn(); xmpp_ctx_t * const ctx = connection_get_ctx(); @@ -1241,7 +1241,7 @@ iq_init_module(void) iq_send_software_version = _iq_send_software_version; iq_set_autoping = _iq_set_autoping; iq_confirm_instant_room = _iq_confirm_instant_room; - iq_destroy_instant_room = _iq_destroy_instant_room; + iq_destroy_room = _iq_destroy_room; iq_send_ping = _iq_send_ping; iq_request_room_config_form = _iq_request_room_config_form; iq_room_config_cancel = _iq_room_config_cancel; diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 1d391cbc..15f0a7a5 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -185,7 +185,7 @@ void (*iq_disco_info_request)(gchar *jid); void (*iq_disco_items_request)(gchar *jid); void (*iq_set_autoping)(int seconds); void (*iq_confirm_instant_room)(const char * const room_jid); -void (*iq_destroy_instant_room)(const char * const room_jid); +void (*iq_destroy_room)(const char * const room_jid); void (*iq_request_room_config_form)(const char * const room_jid); void (*iq_submit_room_config)(const char * const room, DataForm *form); void (*iq_room_config_cancel)(const char * const room_jid); |