diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-11-15 14:20:27 +0100 | 
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-11-15 14:20:27 +0100 | 
| commit | b135438c4c6aeb5a7cd3403f0cf37e741d589cd3 (patch) | |
| tree | b8c7f4be32ccddea2e1aec4898e6b9f8d9c080d4 /bitlbee.c | |
| parent | f7f3ada3350c2a0a99ed307350a230583802cfe0 (diff) | |
| parent | c1ede6e8035b0338e0254fbfcbbddfeb608b1269 (diff) | |
Merge changes from Wilmer
Diffstat (limited to 'bitlbee.c')
| -rw-r--r-- | bitlbee.c | 6 | 
1 files changed, 0 insertions, 6 deletions
| @@ -40,8 +40,6 @@ gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpoi  	int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info,   		                     &size ); -	count_io_event(source, "main"); -	  	log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );  	irc_new( new_socket ); @@ -124,8 +122,6 @@ gboolean bitlbee_io_current_client_read( GIOChannel *source, GIOCondition condit  	char line[513];  	int st; -	count_io_event(source, "main"); -  	if( condition & G_IO_ERR || condition & G_IO_HUP )  	{  		irc_free( irc ); @@ -181,8 +177,6 @@ gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condi  	time_t newtime;  #endif -	count_io_event(source, "main"); -  #ifdef FLOOD_SEND	  	newtime = time( NULL );  	if( ( newtime - irc->oldtime ) > FLOOD_SEND_INTERVAL ) | 
