Changeset b308cf9 for protocols/yahoo

Timestamp:

2010-06-05T23:21:02Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1fdb0a4

Parents:

3ab1d31 (diff), e774815 (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 libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

Location:

protocols/yahoo

Files:

• Makefile (modified) (2 diffs)
• yahoo.c (modified) (4 diffs)

protocols/yahoo/Makefile

@@ -8 +8 @@
 
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/yahoo/
+endif
 
 # [SH] Program variables
@@ -33 +36 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

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" );
@@ -681 +686 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, B_EV_IO_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -692 +697 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, B_EV_IO_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else
@@ -828 +833 @@
         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 ) );