[Gaim-commits] CVS: gaim/src/protocols/irc cmds.c,1.14,1.15 irc.h,1.10,1.11 parse.c,1.17,1.18

[Tim R. <ma...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21815/src/protocols/irc

Modified Files:
	cmds.c irc.h parse.c 
Log Message:
removing irc's /help command, since the core now provides one, that does
exactly the same thing. Maybe IRC's version was prettier, but we can fix
that, if need be.


Index: cmds.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/cmds.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -p -r1.14 -r1.15
--- cmds.c	30 May 2004 19:34:21 -0000	1.14
+++ cmds.c	9 Jun 2004 06:34:33 -0000	1.15
@@ -128,35 +128,6 @@ int irc_cmd_ctcp_action(struct irc_conn 
 	return 1;
 }
 
-int irc_cmd_help(struct irc_conn *irc, const char *cmd, const char *target, const char **args)
-{
-	GaimConversation *convo = gaim_find_conversation_with_account(target, irc->account);
-
-	/* XXX we should eventually have per-command help */
-
-	if (!convo)
-		return 0;
-
-	if (gaim_conversation_get_type(convo) == GAIM_CONV_CHAT) {
-		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), "", _("<B>Supported IRC Commands:</B><BR>"
-							"AWAY INVITE JOIN KICK<BR>"
-							"ME MODE MSG NAMES<BR>"
-							"NICK OP DEOP OPERWALL<BR>"
-							"PART PING QUERY QUIT<BR>"
-							"QUOTE REMOVE TOPIC UMODE<BR>"
-							"VOICE DEVOICE WALLOPS WHOIS<BR>"),
-				GAIM_MESSAGE_NO_LOG, time(NULL));
-	} else {
-		gaim_conv_im_write(GAIM_CONV_IM(convo), "", _("<B>Supported IRC Commands:</B><BR>"
-						    "AWAY JOIN ME MODE<BR>"
-						    "MSG NICK OPERWALL PING<BR>"
-						    "QUERY QUIT QUOTE UMODE<BR>"
-						    "WALLOPS WHOIS"), GAIM_MESSAGE_NO_LOG, time(NULL));
-	}
-
-	return 0;
-}
-
 int irc_cmd_invite(struct irc_conn *irc, const char *cmd, const char *target, const char **args)
 {
 	char *buf;

Index: irc.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- irc.h	30 May 2004 19:34:21 -0000	1.10
+++ irc.h	9 Jun 2004 06:34:33 -0000	1.11
@@ -135,7 +135,6 @@ void irc_cmd_table_build(struct irc_conn
 int irc_cmd_default(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
 int irc_cmd_away(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
 int irc_cmd_ctcp_action(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
-int irc_cmd_help(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
 int irc_cmd_invite(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
 int irc_cmd_join(struct irc_conn *irc, const char *cmd, const char *target, const char **args);
 int irc_cmd_kick(struct irc_conn *irc, const char *cmd, const char *target, const char **args);

Index: parse.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -p -r1.17 -r1.18
--- parse.c	30 May 2004 19:34:21 -0000	1.17
+++ parse.c	9 Jun 2004 06:34:33 -0000	1.18
@@ -109,7 +109,6 @@ static struct _irc_user_cmd {
 	{ "away", ":", irc_cmd_away },
 	{ "deop", ":", irc_cmd_op },
 	{ "devoice", ":", irc_cmd_op },
-	{ "help", "v", irc_cmd_help },
 	{ "invite", ":", irc_cmd_invite },
 	{ "j", "cv", irc_cmd_join },
 	{ "join", "cv", irc_cmd_join },