Changeset 8e419cb for protocols/msn/ns.c

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (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

File:

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

protocols/msn/ns.c

@@ -208 +208 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_id( gc, gc->username, gc->password, cmd[4], msn_auth_got_passport_id ) )
+                        if( !passport_get_id( msn_auth_got_passport_id, gc, gc->username, gc->password, cmd[4] ) )
                         {
                                 hide_login_progress_error( gc, "Error while contacting Passport server" );
@@ -365 +365 @@
         else if( strcmp( cmd[0], "ILN" ) == 0 )
         {
-                struct msn_away_state *st;
+                const struct msn_away_state *st;
                 
                 if( num_parts != 6 )
@@ -393 +393 @@
         else if( strcmp( cmd[0], "NLN" ) == 0 )
         {
-                struct msn_away_state *st;
+                const struct msn_away_state *st;
                 
                 if( num_parts != 5 )
@@ -539 +539 @@
         {
                 int num = atoi( cmd[0] );
-                struct msn_status_code *err = msn_status_by_number( num );
+                const struct msn_status_code *err = msn_status_by_number( num );
                 
                 g_snprintf( buf, sizeof( buf ), "Error reported by MSN server: %s", err->text );