From c014bb34b3d9e839306c29b68dcbe7ed194aea9e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Thu, 23 Oct 2014 23:33:12 +0100
Subject: [PATCH] Renamed room destroy function

---
 TODO_045               | 1 +
 src/command/commands.c | 2 +-
 src/xmpp/iq.c          | 4 ++--
 src/xmpp/xmpp.h        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TODO_045 b/TODO_045
index 7994927c..ecfb5ea9 100644
--- a/TODO_045
+++ b/TODO_045
@@ -1,4 +1,5 @@
 Review room config/admin commands and output
+    /room destroy should show message to owner, and to participants
 Update /prefs
 Update inline help
 Build with latest libstrophe
diff --git a/src/command/commands.c b/src/command/commands.c
index fa0a423e..670bc1a5 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -2383,7 +2383,7 @@ cmd_room(gchar **args, struct cmd_help_t help)
     }
 
     if (g_strcmp0(args[0], "destroy") == 0) {
-        iq_destroy_instant_room(room);
+        iq_destroy_room(room);
         return TRUE;
     }
 
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);