Changeset bb839e8 for protocols/msn/ns.c

Timestamp:

2010-04-10T01:05:39Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

efbc154

Parents:

9bf2481

Message:

Be more clever with keepalives; detect when a switchboard is opened with
someone who's offline already. Still a hack but it eases the pain a little
bit.

File:

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

protocols/msn/ns.c

@@ -436 +436 @@
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
-                struct msn_switchboard *sb;
-                
                 if( cmd[1] == NULL )
                         return 1;
@@ -443 +441 @@
                 imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
                 
-                if( ( sb = msn_sb_by_handle( ic, cmd[1] ) ) &&
-                    set_getbool( &ic->acc->set, "switchboard_keepalives" ) &&
-                    sb->keepalive == 0 )
-                {
-                        msn_sb_keepalive( sb, 0, 0 );
-                        sb->keepalive = b_timeout_add( 20000, msn_sb_keepalive, sb );
-                }
+                msn_sb_start_keepalives( msn_sb_by_handle( ic, cmd[1] ), TRUE );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
         {
                 const struct msn_away_state *st;
-                struct msn_switchboard *sb;
                 
                 if( num_parts != 5 )
@@ -477 +468 @@
                                    st->name, NULL );
                 
-                if( ( sb = msn_sb_by_handle( ic, cmd[1] ) ) && sb->keepalive > 0 )
-                {
-                        b_event_remove( sb->keepalive );
-                        sb->keepalive = 0;
-                }
+                msn_sb_stop_keepalives( msn_sb_by_handle( ic, cmd[2] ) );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )