Changeset bb09b3c for protocols/yahoo

Timestamp:

2010-06-03T21:13:57Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

1dd3470

Parents:

a6b2f13 (diff), df1ae622 (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:

merge in bitlbee 1.2.7

File:

• protocols/yahoo/yahoo.c (modified) (2 diffs)

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" );
@@ -829 +834 @@
         YList *m;
         
+        if( g_strcasecmp( who, ic->acc->user ) == 0 )
+                /* WTF, Yahoo! seems to echo these now? */
+                return;
+        
         inv = g_malloc( sizeof( struct byahoo_conf_invitation ) );
         memset( inv, 0, sizeof( struct byahoo_conf_invitation ) );