Revert "Added an interface for the listing of existing chatrooms"

This reverts commit 659df4e333f2f524350dd131e430faaeb66dd91a.

6 files changed, 6 insertions, 110 deletions

diff --git a/bitlbee.h b/bitlbee.h
index cad06f1e..cbc44af1 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -174,7 +174,6 @@ void root_command_string(irc_t *irc, char *command);
 void root_command(irc_t *irc, char *command[]);
 gboolean root_command_add(const char *command, int params, void (*func)(irc_t *, char **args), int flags);
 gboolean cmd_identify_finish(gpointer data, gint fd, b_input_condition cond);
-void cmd_chat_list_finish(struct im_connection *ic);
 gboolean bitlbee_shutdown(gpointer data, gint fd, b_input_condition cond);
 
 char *set_eval_root_nick(set_t *set, char *new_nick);
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 53979b13..56beba54 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -263,7 +263,7 @@
 		</description>
 
 		<bitlbee-command name="add">
-			<syntax>chat add &lt;account id&gt; &lt;room|!index&gt; [&lt;channel&gt;]</syntax>
+			<syntax>chat add &lt;account id&gt; &lt;room&gt; [&lt;channel&gt;]</syntax>
 
 			<description>
 				<para>
@@ -281,16 +281,6 @@
 
 		</bitlbee-command>
 
-		<bitlbee-command name="list">
-			<syntax>chat list &lt;account id&gt; [&lt;server&gt;]</syntax>
-
-			<description>
-				<para>
-					List existing chatrooms provided by an account. BitlBee needs this to propogate an internal list of chats. The existing chat can then be added with <emphasis>chat add</emphasis>.
-				</para>
-			</description>
-		</bitlbee-command>
-
 		<bitlbee-command name="with">
 			<syntax>chat with &lt;nickname&gt;</syntax>
 
diff --git a/protocols/bee.h b/protocols/bee.h
index 8e665ac8..d22e4d85 100644
--- a/protocols/bee.h
+++ b/protocols/bee.h
@@ -83,14 +83,6 @@ typedef struct bee_user {
 	void *data; /* Can be used by the IM module. */
 } bee_user_t;
 
-typedef struct bee_chat_info {
-	char *title;
-	char *topic;
-
-	/* If less than zero, the user count is ignored when displaying */
-	int userc;
-} bee_chat_info_t;
-
 /* This one's mostly used so save space and make it easier (cheaper) to
    compare groups of contacts, etc. */
 typedef struct bee_group {
@@ -192,6 +184,4 @@ G_MODULE_EXPORT int bee_chat_msg(bee_t *bee, struct groupchat *c, const char *ms
 G_MODULE_EXPORT struct groupchat *bee_chat_by_title(bee_t *bee, struct im_connection *ic, const char *title);
 G_MODULE_EXPORT void imcb_chat_invite(struct im_connection *ic, const char *name, const char *who, const char *msg);
 
-G_MODULE_EXPORT void bee_chat_list_finish(struct im_connection *ic);
-
 #endif /* __BEE_H__ */
diff --git a/protocols/bee_chat.c b/protocols/bee_chat.c
index 76ed7f85..2fcb0396 100644
--- a/protocols/bee_chat.c
+++ b/protocols/bee_chat.c
@@ -273,8 +273,3 @@ void imcb_chat_invite(struct im_connection *ic, const char *name, const char *wh
 		ic->bee->ui->chat_invite(ic->bee, bu, name, msg);
 	}
 }
-
-void bee_chat_list_finish(struct im_connection *ic)
-{
-	cmd_chat_list_finish(ic);
-}
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index b2ae2cae..e5569313 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -95,7 +95,6 @@ struct im_connection {
 	bee_t *bee;
 
 	GSList *groupchats;
-	GSList *chatlist;
 };
 
 struct groupchat {
@@ -263,13 +262,6 @@ struct prpl {
 	/* If null, equivalent to handle_cmp( ic->acc->user, who ) */
 	gboolean (* handle_is_self) (struct im_connection *, const char *who);
 
-	/* This sets/updates the im_connection->chatlist field with a
-	 * bee_chat_info_t GSList. This function should ensure the
-	 * bee_chat_list_finish() function gets called at some point
-	 * after the chat list is completely updated.
-	 */
-	void (*chat_list) (struct im_connection *, const char *server);
-
 	/* Some placeholders so eventually older plugins may cooperate with newer BitlBees. */
 	void *resv1;
 	void *resv2;
diff --git a/root_commands.c b/root_commands.c
index 59974026..add9bceb 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -1234,10 +1234,8 @@ static void cmd_chat(irc_t *irc, char **cmd)
 	account_t *acc;
 
 	if (g_strcasecmp(cmd[1], "add") == 0) {
-		bee_chat_info_t *ci;
-		char *channel, *room, *s;
+		char *channel, *s;
 		struct irc_channel *ic;
-		guint i;
 
 		MIN_ARGS(3);
 
@@ -1249,22 +1247,8 @@ static void cmd_chat(irc_t *irc, char **cmd)
 			return;
 		}
 
-		if (cmd[3][0] == '!') {
-			i = g_ascii_strtoull(cmd[3] + 1, NULL, 10);
-			ci = g_slist_nth_data(acc->ic->chatlist, i - 1);
-
-			if (ci == NULL) {
-				irc_rootmsg(irc, "Invalid chatroom index");
-				return;
-			}
-
-			room = ci->title;
-		} else {
-			room = cmd[3];
-		}
-
 		if (cmd[4] == NULL) {
-			channel = g_strdup(room);
+			channel = g_strdup(cmd[3]);
 			if ((s = strchr(channel, '@'))) {
 				*s = 0;
 			}
@@ -1284,7 +1268,7 @@ static void cmd_chat(irc_t *irc, char **cmd)
 		    set_setstr(&ic->set, "type", "chat") &&
 		    set_setstr(&ic->set, "chat_type", "room") &&
 		    set_setstr(&ic->set, "account", cmd[2]) &&
-		    set_setstr(&ic->set, "room", room)) {
+		    set_setstr(&ic->set, "room", cmd[3])) {
 			irc_rootmsg(irc, "Chatroom successfully added.");
 		} else {
 			if (ic) {
@@ -1294,18 +1278,6 @@ static void cmd_chat(irc_t *irc, char **cmd)
 			irc_rootmsg(irc, "Could not add chatroom.");
 		}
 		g_free(channel);
-	} else if (g_strcasecmp(cmd[1], "list") == 0) {
-		MIN_ARGS(2);
-
-		if (!(acc = account_get(irc->b, cmd[2]))) {
-			irc_rootmsg(irc, "Invalid account");
-			return;
-		} else if (!acc->prpl->chat_list) {
-			irc_rootmsg(irc, "Existing chatrooms not supported on that account.");
-			return;
-		}
-
-		acc->prpl->chat_list(acc->ic, cmd[3]);
 	} else if (g_strcasecmp(cmd[1], "with") == 0) {
 		irc_user_t *iu;
 
@@ -1320,7 +1292,8 @@ static void cmd_chat(irc_t *irc, char **cmd)
 		} else {
 			irc_rootmsg(irc, "Can't open a groupchat with %s.", cmd[2]);
 		}
-	} else if (g_strcasecmp(cmd[1], "set") == 0 ||
+	} else if (g_strcasecmp(cmd[1], "list") == 0 ||
+	           g_strcasecmp(cmd[1], "set") == 0 ||
 	           g_strcasecmp(cmd[1], "del") == 0) {
 		irc_rootmsg(irc,
 		            "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command.");
@@ -1332,49 +1305,6 @@ static void cmd_chat(irc_t *irc, char **cmd)
 	}
 }
 
-void cmd_chat_list_finish(struct im_connection *ic)
-{
-	account_t *acc = ic->acc;
-	bee_chat_info_t *ci;
-	char *hformat, *iformat, *topic;
-	GSList *l;
-	GString *userc;
-	guint i = 0;
-	irc_t *irc = ic->bee->ui_data;
-
-	if (ic->chatlist == NULL) {
-		irc_rootmsg(irc, "No existing chatrooms");
-		return;
-	}
-
-	if (strchr(irc->umode, 'b') != NULL) {
-		hformat = "%s\t%s\t%s\t%s";
-		iformat = "%u\t%s\t%s\t%s";
-	} else {
-		hformat = "%s  %-20s  %s  %s";
-		iformat = "%5u  %-20.20s  %5s  %s";
-	}
-
-	irc_rootmsg(irc, hformat, "Index", "Title", "Users", "Topic");
-	userc = g_string_new(NULL);
-
-	for (l = ic->chatlist; l; l = l->next) {
-		ci = l->data;
-		topic = ci->topic ? ci->topic : "";
-
-		if (ci->userc >= 0) {
-			g_string_printf(userc, "%d", ci->userc);
-		} else {
-			g_string_assign(userc, "-");
-		}
-
-		irc_rootmsg(irc, iformat, ++i, ci->title, userc->str, topic);
-	}
-
-	irc_rootmsg(irc, "%u %s chatrooms", i, acc->tag);
-	g_string_free(userc, TRUE);
-}
-
 static void cmd_group(irc_t *irc, char **cmd)
 {
 	GSList *l;