[empathy: 3/6] IRC: rename “user_name” regex to “nick_name”
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 3/6] IRC: rename “user_name” regex to “nick_name”
- Date: Mon, 25 Jul 2011 11:44:44 +0000 (UTC)
commit 926cc3f303b944e46a2398c51a220cde48f9b46d
Author: Will Thompson <will thompson collabora co uk>
Date: Tue Jul 19 09:15:11 2011 +0100
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â.)
libempathy-gtk/empathy-account-widget.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index fcc5769..46db2ac 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"$"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]