Changeset f924563 for protocols/msn/ns.c


Ignore:
Timestamp:
2010-05-03T00:52:08Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
1a3ba05
Parents:
6a9d068 (diff), 6824fb3 (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:

Mainline merge.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/ns.c

    r6a9d068 rf924563  
    422422        else if( strcmp( cmd[0], "FLN" ) == 0 )
    423423        {
    424                 if( cmd[1] )
    425                         imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
     424                if( cmd[1] == NULL )
     425                        return 1;
     426               
     427                imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
     428               
     429                msn_sb_start_keepalives( msn_sb_by_handle( ic, cmd[1] ), TRUE );
    426430        }
    427431        else if( strcmp( cmd[0], "NLN" ) == 0 )
     
    449453                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
    450454                                   st->name, NULL );
     455               
     456                msn_sb_stop_keepalives( msn_sb_by_handle( ic, cmd[2] ) );
    451457        }
    452458        else if( strcmp( cmd[0], "RNG" ) == 0 )
Note: See TracChangeset for help on using the changeset viewer.