Changeset 883a398

Timestamp:

2008-04-02T21:36:02Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8dbe021f

Parents:

fa75134

Message:

Rearranged some event handling code.

Files:

• bitlbee.c (modified) (1 diff)
• irc.c (modified) (2 diffs)

bitlbee.c

@@ -226 +226 @@
         if( st == size )
         {
-                g_free( irc->sendbuffer );
-                irc->sendbuffer = NULL;
-                irc->w_watch_source_id = 0;
-                
                 if( irc->status & USTATUS_SHUTDOWN )
+                {
                         irc_free( irc );
+                }
+                else
+                {
+                        g_free( irc->sendbuffer );
+                        irc->sendbuffer = NULL;
+                        irc->w_watch_source_id = 0;
+                }
                 
                 return FALSE;

irc.c

@@ -199 +199 @@
         if( irc->sendbuffer && !immed )
         {
-                /* We won't read from this socket anymore. Instead, we'll connect a timer
-                   to it that should shut down the connection in a second, just in case
-                   bitlbee_.._write doesn't do it first. */
+                /* Set up a timeout event that should shut down the connection
+                   in a second, just in case ..._write doesn't do it first. */
                 
                 b_event_remove( irc->r_watch_source_id );
-                irc->r_watch_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
+                irc->r_watch_source_id = 0;
+                
+                b_event_remove( irc->ping_source_id );
+                irc->ping_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
         }
         else
@@ -274 +276 @@
         if( irc->ping_source_id > 0 )
                 b_event_remove( irc->ping_source_id );
-        b_event_remove( irc->r_watch_source_id );
+        if( irc->r_watch_source_id > 0 )
+                b_event_remove( irc->r_watch_source_id );
         if( irc->w_watch_source_id > 0 )
                 b_event_remove( irc->w_watch_source_id );