[Gaim-commits] CVS: gaim/src/protocols/irc irc.h,1.19,1.20 msgs.c,1.50,1.51 parse.c,1.34,1.35

[Mark D. <the...@us...>]

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

Modified Files:
	irc.h msgs.c parse.c 
Log Message:
sf patch #1153243, from Richard Laager
Implement IRC Response #437, "Nick or channel is temporarily unavailable."


Index: irc.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -p -r1.19 -r1.20
--- irc.h	6 Mar 2005 16:32:40 -0000	1.19
+++ irc.h	21 Mar 2005 03:37:59 -0000	1.20
@@ -133,6 +133,7 @@ void irc_msg_regonly(struct irc_conn *ir
 void irc_msg_quit(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_time(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_topic(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_unavailable(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_unknown(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_wallops(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_whois(struct irc_conn *irc, const char *name, const char *from, char **args);

Index: msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -p -r1.50 -r1.51
--- msgs.c	6 Mar 2005 16:32:40 -0000	1.50
+++ msgs.c	21 Mar 2005 03:37:59 -0000	1.51
@@ -977,6 +977,16 @@ void irc_msg_quit(struct irc_conn *irc, 
 	return;
 }
 
+void irc_msg_unavailable(struct irc_conn *irc, const char *name, const char *from, char **args)
+{
+	GaimConnection *gc = gaim_account_get_connection(irc->account);
+
+	if (!args || !args[1])
+		return;
+
+	gaim_notify_error(gc, NULL, _("Nick or channel is temporarily unavailable."), args[1]);
+}
+
 void irc_msg_wallops(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	GaimConnection *gc = gaim_account_get_connection(irc->account);

Index: parse.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -p -r1.34 -r1.35
--- parse.c	6 Mar 2005 16:32:40 -0000	1.34
+++ parse.c	21 Mar 2005 03:37:59 -0000	1.35
@@ -79,6 +79,7 @@ static struct _irc_msg {
 	{ "422", "nv:", irc_msg_endmotd },	/* No MOTD available		*/
 	{ "432", "vn:", irc_msg_badnick },	/* Erroneous nickname		*/
 	{ "433", "vn:", irc_msg_nickused },	/* Nickname already in use	*/
+	{ "437", "nc:", irc_msg_unavailable },  /* Nick/channel is unavailable */
 	{ "438", "nn:", irc_msg_nochangenick },	/* Nick may not change		*/
 	{ "442", "nc:", irc_msg_notinchan },	/* Not in channel		*/
 	{ "473", "nc:", irc_msg_inviteonly },	/* Tried to join invite-only	*/