# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1070414873 0
# Node ID ebd43be54140e3ceb1eeb34a2ddc4da4c1001db0
# Parent  45fd907e1d4803cf2955eb290a8ca1c4293d40fe
[gaim-migrate @ 8356]
YamiPharaoh has pointed out that some servers use & as a user status
 character.

committer: Tailor Script <tailor@pidgin.im>

diff -r 45fd907e1d48 -r ebd43be54140 src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Wed Dec 03 01:21:49 2003 +0000
+++ b/src/protocols/irc/irc.c	Wed Dec 03 01:27:53 2003 +0000
@@ -50,6 +50,14 @@
 static void irc_chat_join (GaimConnection *gc, GHashTable *data);
 static void irc_input_cb(gpointer data, gint source, GaimInputCondition cond);
 
+static guint irc_nick_hash(const char *nick);
+static gboolean irc_nick_equal(const char *nick1, const char *nick2);
+static void irc_buddy_free(struct irc_buddy *ib);
+
+static GaimPlugin *_irc_plugin = NULL;
+
+static const char *status_chars = "@+%&";
+
 static void irc_view_motd(GaimConnection *gc)
 {
 	struct irc_conn *irc;
@@ -69,12 +77,6 @@
 	gaim_notify_formatted(gc, title, title, NULL, irc->motd->str, NULL, NULL);
 }
 
-static guint irc_nick_hash(const char *nick);
-static gboolean irc_nick_equal(const char *nick1, const char *nick2);
-static void irc_buddy_free(struct irc_buddy *ib);
-
-static GaimPlugin *_irc_plugin = NULL;
-
 int irc_send(struct irc_conn *irc, const char *buf)
 {
 	if (irc->fd < 0)
@@ -287,7 +289,7 @@
 	struct irc_conn *irc = gc->proto_data;
 	const char *args[2];
 
-	if (*who == '@' || *who == '%' || *who == '+')
+	if (strchr(status_chars, *who) != NULL)
 		args[0] = who + 1;
 	else
 		args[0] = who;