Changeset 783e9b7 for irc.c

Timestamp:

2008-05-21T10:28:34Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

b6cd9e9, c4a1036

Parents:

51bbec0 (diff), 9299891 (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:

Merge trunk.

File:

• irc.c (modified) (3 diffs)

irc.c

@@ -151 +151 @@
         set_add( &irc->set, "private", "true", set_eval_bool, irc );
         set_add( &irc->set, "query_order", "lifo", NULL, irc );
+        set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc );
         set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
         set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
@@ -199 +200 @@
         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 +277 @@
         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 );