Changeset b79308b for protocols/msn/ns.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• protocols/msn/ns.c (modified) (3 diffs)

protocols/msn/ns.c

@@ -34 +34 @@
 static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
 
-static void msn_auth_got_passport_id( struct passport_reply *rep );
+static void msn_auth_got_passport_token( struct msn_auth_data *mad );
 
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
@@ -214 +214 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_id( msn_auth_got_passport_id, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
+                        if( !passport_get_token( msn_auth_got_passport_token, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
                         {
                                 imcb_error( ic, "Error while contacting Passport server" );
@@ -674 +674 @@
 }
 
-static void msn_auth_got_passport_id( struct passport_reply *rep )
+static void msn_auth_got_passport_token( struct msn_auth_data *mad )
 {
-        struct im_connection *ic = rep->data;
-        struct msn_data *md = ic->proto_data;
-        char *key = rep->result;
-        char buf[1024];
-        
-        if( key == NULL )
-        {
-                imcb_error( ic, "Error during Passport authentication (%s)",
-                               rep->error_string ? rep->error_string : "Unknown error" );
+        struct im_connection *ic = mad->data;
+        struct msn_data *md;
+        
+        /* Dead connection? */
+        if( g_slist_find( msn_connections, ic ) == NULL )
+                return;
+        
+        md = ic->proto_data;
+        if( mad->token )
+        {
+                char buf[1024];
+                
+                g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, mad->token );
+                msn_write( ic, buf, strlen( buf ) );
+        }
+        else
+        {
+                imcb_error( ic, "Error during Passport authentication: %s", mad->error );
                 imc_logout( ic, TRUE );
         }
-        else
-        {
-                g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, key );
-                msn_write( ic, buf, strlen( buf ) );
-        }
 }