aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-account-widget.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-07-19 16:15:11 +0800
committerWill Thompson <will.thompson@collabora.co.uk>2011-07-19 18:58:01 +0800
commit926cc3f303b944e46a2398c51a220cde48f9b46d (patch)
treec5e0aa48f86580bacba02f4f4bacf21e50cc7c50 /libempathy-gtk/empathy-account-widget.c
parent98182d81df41790db37ec222e598bfef1cd8d85b (diff)
downloadgsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.tar
gsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.tar.gz
gsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.tar.bz2
gsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.tar.lz
gsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.tar.xz
gsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.tar.zst
gsoc2013-empathy-926cc3f303b944e46a2398c51a220cde48f9b46d.zip
IRC: rename “user_name” regex to “nick_name”
The 'account’ parameter in Telepathy, to which this regex applies, is the ‘nickname’ in IRC parlance. (I'm about to add a regex for what IRC calls ‘usernames’.)
Diffstat (limited to 'libempathy-gtk/empathy-account-widget.c')
-rw-r--r--libempathy-gtk/empathy-account-widget.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index fcc5769a0..46db2ac20 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -172,7 +172,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
/* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */
#define IRC_SPECIAL "_\\[\\]{}\\\\|`^"
-#define IRC_USER_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)"
+#define IRC_NICK_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)"
/* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2)
* We just exclude invalid characters to avoid ucschars and other redundant
* complexity */
@@ -185,7 +185,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
#define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})"
#define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$"
-#define ACCOUNT_REGEX_IRC "^"IRC_USER_NAME"$"
+#define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$"
#define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@"HOST"$"
#define ACCOUNT_REGEX_MSN "^"MSN_USER_NAME"@"HOST"$"
#define ACCOUNT_REGEX_YAHOO "^"YAHOO_USER_NAME"$"