Changeset bb839e8

Timestamp:

2010-04-10T01:05:39Z (15 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.

Location:

protocols/msn

Files:

• msn.h (modified) (1 diff)
• ns.c (modified) (3 diffs)
• sb.c (modified) (5 diffs)

protocols/msn/msn.h

@@ -185 +185 @@
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );
 int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
-gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond );
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial );
+void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
 #endif //_MSN_H

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 )

protocols/msn/sb.c

@@ -255 +255 @@
         
         msn_msgq_purge( ic, &sb->msgq );
+        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -476 +477 @@
                 
                 sb->ready = 1;
+                
+                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -525 +528 @@
                         }
                         
+                        msn_sb_start_keepalives( sb, FALSE );
+                        
                         return( st );
                 }
@@ -586 +591 @@
                 if( sb->who )
                 {
+                        msn_sb_stop_keepalives( sb );
+                        
                         /* This is a single-person chat, and the other person is leaving. */
                         g_free( sb->who );
@@ -770 +777 @@
 }
 
-gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond )
+static gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
         return sb->ready && msn_sb_sendmessage( sb, SB_KEEPALIVE_MESSAGE );
 }
+
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial )
+{
+        struct buddy *b;
+        
+        if( sb && sb->who && sb->keepalive == 0 &&
+            ( b = imcb_find_buddy( sb->ic, sb->who ) ) && !b->present &&
+            set_getbool( &sb->ic->acc->set, "switchboard_keepalives" ) )
+        {
+                if( initial )
+                        msn_sb_keepalive( sb, 0, 0 );
+                
+                sb->keepalive = b_timeout_add( 20000, msn_sb_keepalive, sb );
+        }
+}
+
+void msn_sb_stop_keepalives( struct msn_switchboard *sb )
+{
+        if( sb && sb->keepalive > 0 )
+        {
+                b_event_remove( sb->keepalive );
+                sb->keepalive = 0;
+        }
+}