From d337ef853cc47ff78fbfa0ac54cf3d795832a2b7 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 4 Aug 2011 15:38:45 +0200 Subject: Allow to enter an email address as Yahoo ID https://bugzilla.gnome.org/show_bug.cgi?id=655959 --- libempathy-gtk/empathy-account-widget.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 5bdea6aff..26b30f6e9 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -190,8 +190,10 @@ static guint signals[LAST_SIGNAL] = { 0 }; * http://www.hypothetic.org/docs/msn/general/names.php */ #define MSN_USER_NAME EMAIL_LOCALPART /* Based on the official help: - * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html */ -#define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})" + * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html + * Looks like an email address can be used as well (bgo #655959) + * */ +#define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})|("EMAIL_LOCALPART"@"HOST")" #define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$" #define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$" -- cgit v1.2.3