Imported changes from main tree.

1 files changed, 0 insertions, 24 deletions

diff --git a/bitlbee.c b/bitlbee.c
index 0e90b912..56625316 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -193,32 +193,12 @@ gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condi
 	irc_t *irc = data;
 	int st, size;
 	char *temp;
-#ifdef FLOOD_SEND
-	time_t newtime;
-#endif
 
-#ifdef FLOOD_SEND	
-	newtime = time( NULL );
-	if( ( newtime - irc->oldtime ) > FLOOD_SEND_INTERVAL )
-	{
-		irc->sentbytes = 0;
-		irc->oldtime = newtime;
-	}
-#endif
-	
 	if( irc->sendbuffer == NULL )
 		return( FALSE );
 	
 	size = strlen( irc->sendbuffer );
-	
-#ifdef FLOOD_SEND
-	if( ( FLOOD_SEND_BYTES - irc->sentbytes ) > size )
-		st = write( irc->fd, irc->sendbuffer, size );
-	else
-		st = write( irc->fd, irc->sendbuffer, ( FLOOD_SEND_BYTES - irc->sentbytes ) );
-#else
 	st = write( irc->fd, irc->sendbuffer, size );
-#endif
 	
 	if( st <= 0 )
 	{
@@ -233,10 +213,6 @@ gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condi
 		}
 	}
 	
-#ifdef FLOOD_SEND
-	irc->sentbytes += st;
-#endif		
-	
 	if( st == size )
 	{
 		g_free( irc->sendbuffer );