Changeset 704dd38 for protocols/yahoo/yahoo.c

Timestamp:

2010-06-01T21:51:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ad404ab

Parents:

3429b58 (diff), ba3233c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging head.

File:

• protocols/yahoo/yahoo.c (modified) (1 diff)

protocols/yahoo/yahoo.c

@@ -138 +138 @@
         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" );