diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-06-19 22:04:44 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-06-19 22:05:28 +0800 |
| commit | 1deafc0cb7df9ace28a4a4652d2ce7fc9acde116 (patch) | |
| tree | 411258e1628b30be531a3e60c12929eade94674e /libempathy-gtk | |
| parent | 86bbf6fce421a5ded5065c39f28849045392a402 (diff) | |
| download | gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.tar gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.tar.gz gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.tar.bz2 gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.tar.lz gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.tar.xz gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.tar.zst gsoc2013-empathy-1deafc0cb7df9ace28a4a4652d2ce7fc9acde116.zip | |
widget-irc: don't check 'username' using a regexp
It's an optional parameter so can be not set.
https://bugzilla.gnome.org/show_bug.cgi?id=678307
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 00f85df6d..b1ee32de9 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -174,14 +174,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */ #define IRC_SPECIAL "_\\[\\]{}\\\\|`^" #define IRC_NICK_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)" -/* user = 1*( %x01-09 / %x0B-0C / %x0E-1F / %x21-3F / %x41-FF ) - * ; any octet except NUL, CR, LF, " " and "@" - * - * so technically, like so many other places in IRC, we should be using arrays - * of bytes here rather than UTF-8 strings. Life: too short. In practice this - * will always be ASCII. - */ -#define IRC_USER_NAME "([^\r\n@ ])+" /* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2) * We just exclude invalid characters to avoid ucschars and other redundant @@ -198,7 +190,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; #define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$" #define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$" -#define USERNAME_REGEX_IRC "^"IRC_USER_NAME"$" #define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@[^@/]+" #define ACCOUNT_REGEX_MSN "^"MSN_USER_NAME"@"HOST"$" #define ACCOUNT_REGEX_YAHOO "^"YAHOO_USER_NAME"$" @@ -1138,8 +1129,6 @@ account_widget_build_irc (EmpathyAccountWidget *self, empathy_account_settings_set_regex (self->priv->settings, "account", ACCOUNT_REGEX_IRC); - empathy_account_settings_set_regex (self->priv->settings, "username", - USERNAME_REGEX_IRC); if (self->priv->simple) { |