Changeset 69cb623 for protocols/yahoo/yahoo.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (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 with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

File:

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

protocols/yahoo/yahoo.c

@@ -121 +121 @@
 }
 
-static void byahoo_login( struct aim_user *user )
-{
-        struct gaim_connection *gc = new_gaim_conn( user );
+static void byahoo_login( account_t *acc )
+{
+        struct gaim_connection *gc = new_gaim_conn( acc );
         struct byahoo_data *yd = gc->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -130 +130 @@
         
         set_login_progress( gc, 1, "Connecting" );
-        yd->y2_id = yahoo_init( user->username, user->password );
+        yd->y2_id = yahoo_init( acc->user, acc->pass );
         yahoo_login( yd->y2_id, yd->current_status );
 }
@@ -411 +411 @@
         ret->chat_leave = byahoo_chat_leave;
         ret->chat_open = byahoo_chat_open;
-        ret->cmp_buddynames = g_strcasecmp;
+
+        ret->handle_cmp = g_strcasecmp;
         
         register_protocol(ret);
@@ -427 +428 @@
                 yd = gc->proto_data;
                 
-                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
+                if( strcmp( gc->acc->prpl->name, "yahoo" ) == 0 && yd->y2_id == id )
                         return( gc );
         }