Changes in protocols/msn/sb.c [a830512:bb839e8]

File:

• protocols/msn/sb.c (modified) (7 diffs)

protocols/msn/sb.c

@@ -168 +168 @@
                 
                 /* Build the message. Convert LF to CR-LF for normal messages. */
-                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
+                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) == 0 )
+                {
+                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
+                        buf = g_new0( char, i );
+                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
+                }
+                else if( strcmp( text, SB_KEEPALIVE_MESSAGE ) == 0 )
+                {
+                        buf = g_strdup( SB_KEEPALIVE_HEADERS );
+                        i = strlen( buf );
+                }
+                else
                 {
                         buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
@@ -182 +193 @@
                         }
                 }
-                else
-                {
-                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
-                        buf = g_new0( char, i );
-                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
-                }
                 
                 /* Build the final packet (MSG command + the message). */
@@ -250 +255 @@
         
         msn_msgq_purge( ic, &sb->msgq );
+        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -471 +477 @@
                 
                 sb->ready = 1;
+                
+                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -520 +528 @@
                         }
                         
+                        msn_sb_start_keepalives( sb, FALSE );
+                        
                         return( st );
                 }
@@ -581 +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 );
@@ -764 +776 @@
         return( 1 );
 }
+
+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;
+        }
+}