Changeset 2cdd8ce for irc.c

Timestamp:

2005-11-19T15:17:03Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

9c8ae50, b20b32f

Parents:

c998255 (diff), 94281ef (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 Wilmer

File:

• irc.c (modified) (10 diffs)

irc.c

@@ -115 +115 @@
         set_add( irc, "auto_reconnect_delay", "300", set_eval_int );
         set_add( irc, "buddy_sendbuffer", "false", set_eval_bool );
-        set_add( irc, "buddy_sendbuffer_delay", "1", set_eval_int );
+        set_add( irc, "buddy_sendbuffer_delay", "200", set_eval_int );
         set_add( irc, "charset", "iso8859-1", set_eval_charset );
         set_add( irc, "debug", "false", set_eval_bool );
@@ -121 +121 @@
         set_add( irc, "display_namechanges", "false", set_eval_bool );
         set_add( irc, "handle_unknown", "root", NULL );
-        /* set_add( irc, "html", "nostrip", NULL ); */
         set_add( irc, "lcnicks", "true", set_eval_bool );
         set_add( irc, "ops", "both", set_eval_ops );
@@ -127 +126 @@
         set_add( irc, "query_order", "lifo", NULL );
         set_add( irc, "save_on_quit", "true", set_eval_bool );
+        set_add( irc, "strip_html", "true", NULL );
         set_add( irc, "to_char", ": ", set_eval_to_char );
         set_add( irc, "typing_notice", "false", set_eval_bool );
@@ -486 +486 @@
                         irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
                 }
-                else if( *cmd[1] == '#' )
+                else if( *cmd[1] == '#' || *cmd[1] == '&' )
                 {
                         if( cmd[2] )
@@ -557 +557 @@
                 else if( cmd[1] )
                 {
-                        if( cmd[1][0] == '#' && cmd[1][1] )
+                        if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] )
                         {
                                 user_t *u = user_find( irc, cmd[1] + 1 );
@@ -931 +931 @@
 }
 
-void irc_write_all( char *format, ... )
+void irc_write_all( int now, char *format, ... )
 {
         va_list params;
         GSList *temp;   
-
+        
         va_start( params, format );
-
+        
         temp = irc_connection_list;
-        while( temp!=NULL ) {
+        while( temp != NULL )
+        {
+                irc_t *irc = temp->data;
+                
+                if( now )
+                {
+                        g_free( irc->sendbuffer );
+                        irc->sendbuffer = g_strdup( "\r\n" );
+                }
                 irc_vawrite( temp->data, format, params );
+                if( now )
+                {
+                        bitlbee_io_current_client_write( irc->io_channel, G_IO_OUT, irc );
+                }
                 temp = temp->next;
         }
-
+        
         va_end( params );
         return;
@@ -1069 +1081 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the help command. Lots of FAQ's are answered there." );
+        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQ's are answered there." );
         
         irc->status = USTATUS_LOGGED_IN;
@@ -1313 +1325 @@
         user_t *u = NULL;
         
-        if( *nick == '#' )
+        if( *nick == '#' || *nick == '&' )
         {
                 if( !( c = conv_findchannel( nick ) ) )
@@ -1428 +1440 @@
         if( set_getint( irc, "buddy_sendbuffer" ) && set_getint( irc, "buddy_sendbuffer_delay" ) > 0 )
         {
+                int delay;
+                
                 if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
                 {
@@ -1451 +1465 @@
                 strcat( u->sendbuf, "\n" );
                 
+                delay = set_getint( irc, "buddy_sendbuffer_delay" );
+                if( delay <= 5 )
+                        delay *= 1000;
+                
                 if( u->sendbuf_timer > 0 )
                         g_source_remove( u->sendbuf_timer );
-                u->sendbuf_timer = g_timeout_add( set_getint( irc, "buddy_sendbuffer_delay" ) * 1000,
-                                                  buddy_send_handler_delayed, u );
+                u->sendbuf_timer = g_timeout_add( delay, buddy_send_handler_delayed, u );
                 
                 return( 1 );