Changeset d8d63a2 for protocols/yahoo

Timestamp:

2006-12-05T20:40:17Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7740c4c

Parents:

f4aa393 (diff), 55078f5 (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] wilmer

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (2 diffs)
• yahoo.c (modified) (6 diffs)

protocols/yahoo/libyahoo2.c

@@ -89 +89 @@
 #define vsnprintf _vsnprintf
 #endif
+
+#include "base64.h"
 
 #ifdef USE_STRUCT_CALLBACKS
@@ -695 +697 @@
 }
 
-static char base64digits[] =    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                "abcdefghijklmnopqrstuvwxyz"
-                                "0123456789._";
+/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 static void to_y64(unsigned char *out, const unsigned char *in, int inlen)
-/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
-{
-        for (; inlen >= 3; inlen -= 3)
-                {
-                        *out++ = base64digits[in[0] >> 2];
-                        *out++ = base64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-                        *out++ = base64digits[((in[1]<<2) & 0x3c) | (in[2]>>6)];
-                        *out++ = base64digits[in[2] & 0x3f];
-                        in += 3;
-                }
-        if (inlen > 0)
-                {
-                        unsigned char fragment;
-
-                        *out++ = base64digits[in[0] >> 2];
-                        fragment = (in[0] << 4) & 0x30;
-                        if (inlen > 1)
-                                fragment |= in[1] >> 4;
-                        *out++ = base64digits[fragment];
-                        *out++ = (inlen < 2) ? '-' 
-                                        : base64digits[(in[1] << 2) & 0x3c];
-                        *out++ = '-';
-                }
-        *out = '\0';
+{
+        base64_encode_real(in, inlen, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-");
 }
 

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 );
 }
@@ -192 +192 @@
         gc->away = NULL;
         
-        if( msg )
+        if( state && msg && g_strcasecmp( state, msg ) != 0 )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
                 gc->away = "";
         }
-        if( state )
-        {
+        else if( state )
+        {
+                /* Set msg to NULL since (if it isn't NULL already) it's equal
+                   to state. msg must be empty if we want to use an existing
+                   away state. */
+                msg = NULL;
+                
                 gc->away = "";
                 if( g_strcasecmp( state, "Available" ) == 0 )
@@ -235 +240 @@
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        if( yd->current_status == YAHOO_STATUS_INVISIBLE )
-                yahoo_set_away( yd->y2_id, yd->current_status, NULL, gc->away != NULL );
-        else
-                yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
 }
 
@@ -409 +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);
@@ -425 +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 );
         }