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:48:32 +0800 |
| commit | 4f558f713f64a07259704f2462d459db8a5ae51f (patch) | |
| tree | b18bb785c9a0f9e7c9ba675b4b7ccbe6ab859739 | |
| parent | 047c6ffac32caebc3d4929ecd2fec8a55da6796a (diff) | |
| download | gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.tar gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.tar.gz gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.tar.bz2 gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.tar.lz gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.tar.xz gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.tar.zst gsoc2013-empathy-4f558f713f64a07259704f2462d459db8a5ae51f.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
| -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 7530914fc..b8f39e06b 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"$" @@ -1106,8 +1097,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) { |