Merge new changes from pluginable and Wilmer

1 files changed, 0 insertions, 23 deletions

diff --git a/unix.c b/unix.c
index 159b3126..c108528a 100644
--- a/unix.c
+++ b/unix.c
@@ -35,7 +35,6 @@
 global_t global;	/* Against global namespace pollution */
 
 static void sighandler( int signal );
-gboolean bitlbee_dirty_workaround( gpointer data );
 
 int main( int argc, char *argv[] )
 {
@@ -101,24 +100,11 @@ int main( int argc, char *argv[] )
 	if( help_init( &(global.help) ) == NULL )
 		log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
 	
-	/* Workaround against runaway problems. Bah, this is really dirty,
-	   but in the end not really different from the <=0.91 situation,
-	   which makes it an acceptable temporary "solution". */
-	// g_timeout_add( 0, bitlbee_dirty_workaround, NULL );
-	
 	g_main_run( global.loop );
 	
 	return( 0 );
 }
 
-gboolean bitlbee_dirty_workaround( gpointer data )
-{
-	usleep( 50000 );
-	return( TRUE );
-}
-
-void proxyprofiler_dump();
-
 static void sighandler( int signal )
 {
 	/* FIXME: In fact, calling log_message() here can be dangerous. But well, let's take the risk for now. */
@@ -147,15 +133,6 @@ static void sighandler( int signal )
 			raise( signal );
 		}
 	}
-#ifdef PROXYPROFILER
-	else if( signal == SIGXCPU )
-	{
-		write_io_activity();
-		proxyprofiler_dump();
-		log_message( LOGLVL_ERROR, "Received SIGXCPU, dumping some debugging info." );
-		exit( 1 );
-	}
-#endif
 	else if( signal != SIGPIPE )
 	{
 		log_message( LOGLVL_ERROR, "Fatal signal received: %d. That's probably a bug.", signal );