From c66d03539dbe0019149a51e6aa0c68c5d5acb394 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 11 Oct 2014 23:37:04 +0100
Subject: Removed /room info command, covered by /info

---
 src/command/command.c  |  1 -
 src/command/commands.c | 16 +++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/command')

diff --git a/src/command/command.c b/src/command/command.c
index e8697920..b131dcf9 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1291,7 +1291,6 @@ cmd_init(void)
     autocomplete_add(room_ac, "accept");
     autocomplete_add(room_ac, "destroy");
     autocomplete_add(room_ac, "config");
-    autocomplete_add(room_ac, "info");
     autocomplete_add(room_ac, "role");
     autocomplete_add(room_ac, "affiliation");
 
diff --git a/src/command/commands.c b/src/command/commands.c
index 3f927407..89afc05c 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1501,6 +1501,7 @@ cmd_info(gchar **args, struct cmd_help_t help)
     win_type_t win_type = ui_current_win_type();
     PContact pcontact = NULL;
     Occupant *occupant = NULL;
+    char *room = NULL;
 
     if (conn_status != JABBER_CONNECTED) {
         cons_show("You are not currently connected.");
@@ -1510,6 +1511,7 @@ cmd_info(gchar **args, struct cmd_help_t help)
     switch (win_type)
     {
         case WIN_MUC:
+            room = ui_current_recipient();
             if (usr) {
                 char *room = ui_current_recipient();
                 occupant = muc_roster_item(room, usr);
@@ -1519,7 +1521,10 @@ cmd_info(gchar **args, struct cmd_help_t help)
                     ui_current_print_line("No such occupant \"%s\" in room.", usr);
                 }
             } else {
-                ui_current_print_line("You must specify a nickname.");
+                ProfWin *window = wins_get_by_recipient(room);
+                iq_room_info_request(room);
+                ui_show_room_info(window, room);
+                return TRUE;
             }
             break;
         case WIN_CHAT:
@@ -2237,8 +2242,7 @@ cmd_room(gchar **args, struct cmd_help_t help)
             (g_strcmp0(args[0], "destroy") != 0) &&
             (g_strcmp0(args[0], "config") != 0) &&
             (g_strcmp0(args[0], "role") != 0) &&
-            (g_strcmp0(args[0], "affiliation") != 0) &&
-            (g_strcmp0(args[0], "info") != 0)) {
+            (g_strcmp0(args[0], "affiliation") != 0)) {
         cons_show("Usage: %s", help.usage);
         return TRUE;
     }
@@ -2252,12 +2256,6 @@ cmd_room(gchar **args, struct cmd_help_t help)
         ui_index = 0;
     }
 
-    if (g_strcmp0(args[0], "info") == 0) {
-        iq_room_info_request(room);
-        ui_show_room_info(window, room);
-        return TRUE;
-    }
-
     if (g_strcmp0(args[0], "affiliation") == 0) {
         char *cmd = args[1];
         if (cmd == NULL) {
-- 
cgit 1.4.1-2-gfad0

<td class='hashes'><div class='alt'><pre><span class='oid'><a title='author  Kartik Agaram &lt;vc@akkartik.com&gt;  2020-03-29 12:48:49 -0700
committer  Kartik Agaram &lt;vc@akkartik.com&gt;  2020-03-29 13:25:00 -0700

6175 - syntax highlighting for dte' href='/akkartik/mu/commit/mu.dte?h=hlt&amp;id=b3b3237391ae9c60860bbdd8fa12dfd73214f692'>b3b32373</a></span> <a title='Blame the previous revision' href='/akkartik/mu/blame/mu.dte?h=hlt&amp;id=6efd1778e195cbadb71fbb718e182e229e5dff40'>^</a>




























</pre></div></td>
<td class='linenumbers'><div class='alt'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
</pre></div></td>
<td class='lines'><div><div><div class='alt'><pre>




























                                                            </pre></div></div><pre><code>