diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-01 22:51:27 +0100 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-01 22:51:27 +0100 |
commit | 704dd38a1440dc9d614df9222d6196048226622c (patch) | |
tree | e35adaca74191f899a3158a3421783f1a3a67077 /protocols/yahoo/yahoo.c | |
parent | 3429b589177f286384dab151c167e16071f8a828 (diff) | |
parent | ba3233ce0b1fc34f3ad0a450bb1b661909dafb79 (diff) |
Merging head.
Diffstat (limited to 'protocols/yahoo/yahoo.c')
-rw-r--r-- | protocols/yahoo/yahoo.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c index 68bc6f69..95e1b3be 100644 --- a/protocols/yahoo/yahoo.c +++ b/protocols/yahoo/yahoo.c @@ -137,10 +137,15 @@ static void byahoo_login( account_t *acc ) { struct im_connection *ic = imcb_new( acc ); struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 ); + char *s; yd->logged_in = FALSE; yd->current_status = YAHOO_STATUS_AVAILABLE; + if( ( s = strchr( acc->user, '@' ) ) && g_strcasecmp( s, "@yahoo.com" ) == 0 ) + imcb_error( ic, "Your Yahoo! username should just be a username. " + "Do not include any @domain part." ); + imcb_log( ic, "Connecting" ); yd->y2_id = yahoo_init( acc->user, acc->pass ); yahoo_login( yd->y2_id, yd->current_status ); |