Changes in / [c53911e:68b518d6]

Files:

• bitlbee.c (modified) (15 diffs)
• bitlbee.h (modified) (4 diffs)
• configure (modified) (9 diffs)
• ipc.c (modified) (10 diffs)
• ipc.h (modified) (2 diffs)
• irc.c (modified) (21 diffs)
• irc.h (modified) (4 diffs)
• irc_commands.c (modified) (2 diffs)
• log.h (modified) (1 diff)
• protocols/Makefile (modified) (1 diff)
• protocols/events.h (added)
• protocols/events_glib.c (added)
• protocols/events_libevent.c (added)
• protocols/http_client.c (modified) (10 diffs)
• protocols/jabber/jabber.c (modified) (9 diffs)
• protocols/msn/msn.h (modified) (2 diffs)
• protocols/msn/ns.c (modified) (7 diffs)
• protocols/msn/sb.c (modified) (7 diffs)
• protocols/nogaim.c (modified) (14 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• protocols/oscar/aim.h (modified) (1 diff)
• protocols/oscar/chat.c (modified) (1 diff)
• protocols/oscar/im.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (35 diffs)
• protocols/proxy.c (modified) (40 diffs)
• protocols/proxy.h (modified) (3 diffs)
• protocols/ssl_bogus.c (modified) (1 diff)
• protocols/ssl_client.h (modified) (2 diffs)
• protocols/ssl_gnutls.c (modified) (7 diffs)
• protocols/ssl_nss.c (modified) (5 diffs)
• protocols/ssl_openssl.c (modified) (9 diffs)
• protocols/yahoo/yahoo.c (modified) (7 diffs)
• root_commands.c (modified) (3 diffs)
• sock.h (modified) (1 diff)
• unix.c (modified) (3 diffs)
• user.c (modified) (1 diff)
• util.c (modified) (1 diff)

bitlbee.c

@@ -34 +34 @@
 #include <errno.h>
 
-gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data );
+static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition condition );
 
 int bitlbee_daemon_init()
@@ -44 +44 @@
 #endif
         int i;
-        GIOChannel *ch;
         FILE *fp;
         
@@ -91 +90 @@
         }
         
-        ch = g_io_channel_unix_new( global.listen_socket );
-        global.listen_watch_source_id = g_io_add_watch( ch, G_IO_IN, bitlbee_io_new_client, NULL );
+        global.listen_watch_source_id = b_input_add( global.listen_socket, GAIM_INPUT_READ, bitlbee_io_new_client, NULL );
         
 #ifndef _WIN32
@@ -147 +145 @@
 }
 
-gboolean bitlbee_io_current_client_read( GIOChannel *source, GIOCondition condition, gpointer data )
+gboolean bitlbee_io_current_client_read( gpointer data, gint fd, b_input_condition cond )
 {
         irc_t *irc = data;
@@ -153 +151 @@
         int st;
         
-        if( condition & G_IO_ERR || condition & G_IO_HUP )
-        {
-                irc_abort( irc, 1, "Read error" );
-                return FALSE;
-        }
-        
         st = read( irc->fd, line, sizeof( line ) - 1 );
         if( st == 0 )
@@ -194 +186 @@
         if( !g_slist_find( irc_connection_list, irc ) )
         {
-                log_message( LOGLVL_WARNING, "Abnormal termination of connection with fd %d.", irc->fd );
+                log_message( LOGLVL_WARNING, "Abnormal termination of connection with fd %d.", fd );
                 return FALSE;
         } 
@@ -208 +200 @@
 }
 
-gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condition, gpointer data )
+gboolean bitlbee_io_current_client_write( gpointer data, gint fd, b_input_condition cond )
 {
         irc_t *irc = data;
@@ -215 +207 @@
 
         if( irc->sendbuffer == NULL )
-                return( FALSE );
+                return FALSE;
         
         size = strlen( irc->sendbuffer );
@@ -239 +231 @@
                         irc_free( irc );
                 
-                return( FALSE );
+                return FALSE;
         }
         else
@@ -247 +239 @@
                 irc->sendbuffer = temp;
                 
-                return( TRUE );
-        }
-}
-
-gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
-{
-        size_t size = sizeof( struct sockaddr_in );
+                return TRUE;
+        }
+}
+
+static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition condition )
+{
+        socklen_t size = sizeof( struct sockaddr_in );
         struct sockaddr_in conn_info;
         int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
@@ -286 +278 @@
                         child->pid = client_pid;
                         child->ipc_fd = fds[0];
-                        child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
                         child_list = g_slist_append( child_list, child );
                         
@@ -301 +293 @@
                         /* Close the listening socket, we're a client. */
                         close( global.listen_socket );
-                        g_source_remove( global.listen_watch_source_id );
+                        b_event_remove( global.listen_watch_source_id );
                         
                         /* Make the connection. */
@@ -308 +300 @@
                         /* We can store the IPC fd there now. */
                         global.listen_socket = fds[1];
-                        global.listen_watch_source_id = gaim_input_add( fds[1], GAIM_INPUT_READ, ipc_child_read, irc );
+                        global.listen_watch_source_id = b_input_add( fds[1], GAIM_INPUT_READ, ipc_child_read, irc );
                         
                         close( fds[0] );
@@ -324 +316 @@
 }
 
-void bitlbee_shutdown( gpointer data )
+gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond )
 {
         /* Try to save data for all active connections (if desired). */
@@ -331 +323 @@
         
         /* We'll only reach this point when not running in inetd mode: */
-        g_main_quit( global.loop );
-}
+        b_main_quit();
+        
+        return FALSE;
+}

bitlbee.h

@@ -58 +58 @@
 /* The following functions should not be used if we want to maintain Windows compatibility... */
 #undef free
-#define free            __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__
+#define free            __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__
 #undef malloc
-#define malloc          __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__
+#define malloc          __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__
 #undef calloc
-#define calloc          __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__
+#define calloc          __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__
 #undef realloc
-#define realloc         __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM_INSTEAD__
+#define realloc         __PLEASE_USE_THE_GLIB_MEMORY_ALLOCATION_SYSTEM__
 #undef strdup
-#define strdup          __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM_INSTEAD__
+#define strdup          __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM__
 #undef strndup
-#define strndup         __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM_INSTEAD__
+#define strndup         __PLEASE_USE_THE_GLIB_STRDUP_FUNCTIONS_SYSTEM__
 #undef snprintf
-#define snprintf        __PLEASE_USE_G_SNPRINTF_INSTEAD__
+#define snprintf        __PLEASE_USE_G_SNPRINTF__
 #undef strcasecmp
-#define strcasecmp      __PLEASE_USE_G_STRCASECMP_INSTEAD__
+#define strcasecmp      __PLEASE_USE_G_STRCASECMP__
 #undef strncasecmp
-#define strncasecmp     __PLEASE_USE_G_STRNCASECMP_INSTEAD__
+#define strncasecmp     __PLEASE_USE_G_STRNCASECMP__
+
+/* And the following functions shouldn't be used anymore to keep compatibility
+   with other event handling libs than GLib. */
+#undef g_timeout_add
+#define g_timeout_add           __PLEASE_USE_B_TIMEOUT_ADD__
+#undef g_timeout_add_full
+#define g_timeout_add_full      __PLEASE_USE_B_TIMEOUT_ADD__
+#undef g_io_add_watch
+#define g_io_add_watch          __PLEASE_USE_B_INPUT_ADD__
+#undef g_io_add_watch_full
+#define g_io_add_watch_full     __PLEASE_USE_B_INPUT_ADD__
+#undef g_source_remove
+#define g_source_remove         __PLEASE_USE_B_EVENT_REMOVE__
+#undef g_source_remove_by_user_data
+#define g_source_remove_by_user_data    __PLEASE_USE_B_SOURCE_REMOVE_BY_USER_DATA__
+#undef g_main_run
+#define g_main_run              __PLEASE_USE_B_MAIN_RUN__
+#undef g_main_quit
+#define g_main_quit             __PLEASE_USE_B_MAIN_QUIT__
 
 #ifndef F_OK
@@ -112 +131 @@
 #include "sock.h"
 #include "util.h"
+#include "proxy.h"
 
 typedef struct global {
@@ -121 +141 @@
         GList *storage; /* The first backend in the list will be used for saving */
         char *helpfile;
-        GMainLoop *loop;
         int restart;
 } global_t;
@@ -128 +147 @@
 int bitlbee_inetd_init( void );
 
-gboolean bitlbee_io_current_client_read( GIOChannel *source, GIOCondition condition, gpointer data );
-gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condition, gpointer data );
+gboolean bitlbee_io_current_client_read( gpointer data, gint source, b_input_condition cond );
+gboolean bitlbee_io_current_client_write( gpointer data, gint source, b_input_condition cond );
 
 void root_command_string( irc_t *irc, user_t *u, char *command, int flags );
 void root_command( irc_t *irc, char *command[] );
-void bitlbee_shutdown( gpointer data );
+gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );
 
 extern global_t global;

configure

@@ -14 +14 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+plugindir='$prefix/lib/bitlbee/'
+includedir='$prefix/include/bitlbee/'
+libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee'
-plugindir='$prefix/lib/bitlbee'
 pcdir='$prefix/lib/pkgconfig'
-includedir='$prefix/include/bitlbee'
 
 msn=1
@@ -28 +29 @@
 strip=1
 ipv6=1
+
+events=glib
 ssl=auto
 
@@ -64 +67 @@
 --ipv6=0/1      IPv6 socket support                     $ipv6
 
+--events=...    Event handler (glib, libevent)          $events
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
@@ -80 +84 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
+libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
+
 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
-includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
@@ -163 +169 @@
 fi
 
+GLIB=0
+
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         cat<<EOF>>Makefile.settings
@@ -169 +177 @@
 EOF
         echo '#define GLIB2' >> config.h
+        GLIB=2
 elif type glib-config > /dev/null 2> /dev/null; then
         cat<<EOF>>Makefile.settings
@@ -175 +184 @@
 EOF
         echo '#define GLIB1' >> config.h
+        GLIB=1
 else
         echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
@@ -180 +190 @@
 fi
 
-if [ -r /usr/include/iconv.h ]; then
+if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
         :;
 elif [ -r /usr/local/include/iconv.h ]; then
-        echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
+        echo CFLAGS+=-I/usr/local/include >> Makefile.settings
 else
         echo
         echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-        echo 'Makefile.settings to tell where this file is.';
-fi
+        echo 'Makefile.settings to tell where this file is.'
+fi
+
+
+if [ "$events" = "libevent" ]; then
+        if ! [ -e "${libevent}include/event.h" ]; then
+                echo
+                echo 'Warning: Could not find event.h, you might have to install it and/or specify'
+                echo 'its location using the --libevent= argument. (Example: If event.h is in'
+                echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
+        fi
+        
+        echo '#define EVENTS_LIBEVENT' >> config.h
+        cat <<EOF>>Makefile.settings
+EFLAGS+=-levent -L${libevent}lib
+CFLAGS+=-I${libevent}include
+EOF
+elif [ "$events" = "glib" ]; then
+        ## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
+        echo '#define EVENTS_GLIB' >> config.h
+else
+        echo
+        echo 'ERROR: Unknown event handler specified.'
+        exit 1
+fi
+echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
 
 
@@ -422 +456 @@
 fi
 
-if [ "$msn" = "1" ]; then
-        echo '  Using SSL library: '$ssl;
-fi
+echo '  Using event handler: '$events;
+echo '  Using SSL library: '$ssl;
 
 #if [ "$flood" = "0" ]; then

ipc.c

@@ -60 +60 @@
                 ipc_to_children_str( "DIE\r\n" );
         
-        bitlbee_shutdown( NULL );
+        bitlbee_shutdown( NULL, -1, 0 );
 }
 
@@ -91 +91 @@
         
         global.restart = -1;
-        bitlbee_shutdown( NULL );
+        bitlbee_shutdown( NULL, -1, 0 );
 }
 
@@ -246 +246 @@
 }
 
-void ipc_master_read( gpointer data, gint source, GaimInputCondition cond )
+gboolean ipc_master_read( gpointer data, gint source, b_input_condition cond )
 {
         char *buf, **cmd;
@@ -272 +272 @@
                 }
         }
-}
-
-void ipc_child_read( gpointer data, gint source, GaimInputCondition cond )
+        
+        return TRUE;
+}
+
+gboolean ipc_child_read( gpointer data, gint source, b_input_condition cond )
 {
         char *buf, **cmd;
@@ -286 +288 @@
         else
         {
-                gaim_input_remove( global.listen_watch_source_id );
+                b_event_remove( global.listen_watch_source_id );
                 close( global.listen_socket );
                 
                 global.listen_socket = -1;
         }
+        
+        return TRUE;
 }
 
@@ -397 +401 @@
 void ipc_master_free_one( struct bitlbee_child *c )
 {
-        gaim_input_remove( c->ipc_inpa );
+        b_event_remove( c->ipc_inpa );
         closesocket( c->ipc_fd );
         
@@ -463 +467 @@
 
 
-static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
+static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
 {
         struct bitlbee_child *child = g_new0( struct bitlbee_child, 1 );
-        int serversock;
-
-        serversock = g_io_channel_unix_get_fd(gio);
-
-        child->ipc_fd = accept(serversock, NULL, 0);
-
-        if (child->ipc_fd == -1) {
+        
+        child->ipc_fd = accept( serversock, NULL, 0 );
+        
+        if( child->ipc_fd == -1 )
+        {
                 log_message( LOGLVL_WARNING, "Unable to accept connection on UNIX domain socket: %s", strerror(errno) );
                 return TRUE;
         }
                 
-        child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
-                
+        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+        
         child_list = g_slist_append( child_list, child );
-
+        
         return TRUE;
 }
@@ -489 +491 @@
         struct sockaddr_un un_addr;
         int serversock;
-        GIOChannel *gio;
 
         /* Clean up old socket files that were hanging around.. */
@@ -517 +518 @@
         }
         
-        gio = g_io_channel_unix_new(serversock);
-        
-        if (gio == NULL) {
-                log_message( LOGLVL_WARNING, "Unable to create IO channel for unix socket" );
-                return 0;
-        }
-
-        g_io_add_watch(gio, G_IO_IN, new_ipc_client, NULL);
+        b_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
+        
         return 1;
 }
@@ -563 +558 @@
                         return 0;
                 }
-                child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
                 
                 child_list = g_slist_append( child_list, child );

ipc.h

@@ -40 +40 @@
 
 
-void ipc_master_read( gpointer data, gint source, GaimInputCondition cond );
-void ipc_child_read( gpointer data, gint source, GaimInputCondition cond );
+gboolean ipc_master_read( gpointer data, gint source, b_input_condition cond );
+gboolean ipc_child_read( gpointer data, gint source, b_input_condition cond );
 
 void ipc_master_free_one( struct bitlbee_child *child );
@@ -47 +47 @@
 
 void ipc_to_master( char **cmd );
-void ipc_to_master_str( char *format, ... );
+void ipc_to_master_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 void ipc_to_children( char **cmd );
-void ipc_to_children_str( char *format, ... );
+void ipc_to_children_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 
 /* We need this function in inetd mode, so let's just make it non-static. */

irc.c

@@ -29 +29 @@
 #include "ipc.h"
 
-static gboolean irc_userping( gpointer _irc );
+static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
 
 GSList *irc_connection_list = NULL;
@@ -54 +54 @@
         
         irc->fd = fd;
-        irc->io_channel = g_io_channel_unix_new( fd );
-#ifdef GLIB2
-        g_io_channel_set_encoding (irc->io_channel, NULL, NULL);
-        g_io_channel_set_buffered (irc->io_channel, FALSE);
-        g_io_channel_set_flags( irc->io_channel, G_IO_FLAG_NONBLOCK, NULL );
-#else
-        fcntl( irc->fd, F_SETFL, O_NONBLOCK);
-#endif
-        irc->r_watch_source_id = g_io_add_watch( irc->io_channel, G_IO_IN | G_IO_ERR | G_IO_HUP, bitlbee_io_current_client_read, irc );
+        sock_make_nonblocking( irc->fd );
+        
+        irc->r_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_READ, bitlbee_io_current_client_read, irc );
         
         irc->status = USTATUS_OFFLINE;
@@ -120 +114 @@
 
         if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )
-                irc->ping_source_id = g_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
+                irc->ping_source_id = b_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
         
         irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost, "BitlBee-IRCd initialized, please go on" );
@@ -190 +184 @@
                    bitlbee_.._write doesn't do it first. */
                 
-                g_source_remove( irc->r_watch_source_id );
-                irc->r_watch_source_id = g_timeout_add_full( G_PRIORITY_HIGH, 1000, (GSourceFunc) irc_free, irc, NULL );
+                b_event_remove( irc->r_watch_source_id );
+                irc->r_watch_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
         }
         else
@@ -224 +218 @@
         
         if( irc->ping_source_id > 0 )
-                g_source_remove( irc->ping_source_id );
-        g_source_remove( irc->r_watch_source_id );
+                b_event_remove( irc->ping_source_id );
+        b_event_remove( irc->r_watch_source_id );
         if( irc->w_watch_source_id > 0 )
-                g_source_remove( irc->w_watch_source_id );
-        
-        g_io_channel_unref( irc->io_channel );
+                b_event_remove( irc->w_watch_source_id );
+        
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
         
@@ -279 +272 @@
                         if(user->host!=user->nick) g_free(user->host);
                         if(user->realname!=user->nick) g_free(user->realname);
-                        gaim_input_remove(user->sendbuf_timer);
+                        b_event_remove(user->sendbuf_timer);
                                         
                         usertmp = user;
@@ -329 +322 @@
         
         if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
-                g_main_quit( global.loop );
+                b_main_quit();
 }
 
@@ -583 +576 @@
         char line[IRC_MAX_LINE+1], *cs;
                 
-        if( irc->quit )
+        /* Don't try to write anything new anymore when shutting down. */
+        if( irc->status == USTATUS_SHUTDOWN )
                 return;
         
@@ -600 +594 @@
         strcat( line, "\r\n" );
         
-        if( irc->sendbuffer != NULL ) {
+        if( irc->sendbuffer != NULL )
+        {
                 size = strlen( irc->sendbuffer ) + strlen( line );
                 irc->sendbuffer = g_renew ( char, irc->sendbuffer, size + 1 );
                 strcpy( ( irc->sendbuffer + strlen( irc->sendbuffer ) ), line );
         }
-        else 
-                irc->sendbuffer = g_strdup(line);       
+        else
+        {
+                irc->sendbuffer = g_strdup(line);
+        }
         
         if( irc->w_watch_source_id == 0 )
         {
-                irc->w_watch_source_id = g_io_add_watch( irc->io_channel, G_IO_OUT, bitlbee_io_current_client_write, irc );
+                /* If the buffer is empty we can probably write, so call the write event handler
+                   immediately. If it returns TRUE, it should be called again, so add the event to
+                   the queue. If it's FALSE, we emptied the buffer and saved ourselves some work
+                   in the event queue. */
+                if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) )
+                        irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
         }
         
@@ -636 +638 @@
                 if( now )
                 {
-                        bitlbee_io_current_client_write( irc->io_channel, G_IO_OUT, irc );
+                        bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
                 }
                 temp = temp->next;
@@ -830 +832 @@
                         irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title );
                 else
-                        irc_reply( irc, 331, "%s :No topic for this channel" );
+                        irc_reply( irc, 331, "%s :No topic for this channel", channel );
         }
 }
@@ -886 +888 @@
         if( g_hash_table_lookup( irc->watches, nick ) )
         {
-                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged online" );
+                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged online" );
         }
         g_free( nick );
@@ -911 +913 @@
         if( g_hash_table_lookup( irc->watches, nick ) )
         {
-                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged offline" );
+                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged offline" );
         }
         g_free( nick );
@@ -1011 +1013 @@
         else if( c && c->gc && c->gc->prpl )
         {
-                return( serv_send_chat( irc, c->gc, c->id, s ) );
+                return( bim_chat_msg( c->gc, c->id, s ) );
         }
         
@@ -1017 +1019 @@
 }
 
-gboolean buddy_send_handler_delayed( gpointer data )
+static gboolean buddy_send_handler_delayed( gpointer data, gint fd, b_input_condition cond )
 {
         user_t *u = data;
         
+        /* Shouldn't happen, but just to be sure. */
+        if( u->sendbuf_len < 2 )
+                return FALSE;
+        
         u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
-        serv_send_im( u->gc->irc, u, u->sendbuf, u->sendbuf_flags );
+        bim_buddy_msg( u->gc, u->handle, u->sendbuf, u->sendbuf_flags );
         
         g_free( u->sendbuf );
@@ -1030 +1036 @@
         u->sendbuf_flags = 0;
         
-        return( FALSE );
+        return FALSE;
 }
 
@@ -1043 +1049 @@
                 if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
                 {
-                        //Flush the buffer
-                        g_source_remove( u->sendbuf_timer );
-                        buddy_send_handler_delayed( u );
+                        /* Flush the buffer */
+                        b_event_remove( u->sendbuf_timer );
+                        buddy_send_handler_delayed( u, -1, 0 );
                 }
 
@@ -1051 +1057 @@
                 {
                         u->sendbuf_len = strlen( msg ) + 2;
-                        u->sendbuf = g_new (char, u->sendbuf_len );
+                        u->sendbuf = g_new( char, u->sendbuf_len );
                         u->sendbuf[0] = 0;
                         u->sendbuf_flags = flags;
@@ -1058 +1064 @@
                 {
                         u->sendbuf_len += strlen( msg ) + 1;
-                        u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );
+                        u->sendbuf = g_renew( char, u->sendbuf, u->sendbuf_len );
                 }
                 
@@ -1069 +1075 @@
                 
                 if( u->sendbuf_timer > 0 )
-                        g_source_remove( u->sendbuf_timer );
-                u->sendbuf_timer = g_timeout_add( delay, buddy_send_handler_delayed, u );
+                        b_event_remove( u->sendbuf_timer );
+                u->sendbuf_timer = b_timeout_add( delay, buddy_send_handler_delayed, u );
         }
         else
         {
-                serv_send_im( irc, u, msg, flags );
+                bim_buddy_msg( u->gc, u->handle, msg, flags );
         }
 }
@@ -1154 +1160 @@
    pongs from the user. When not connected yet, we don't ping but drop the
    connection when the user fails to connect in IRC_LOGIN_TIMEOUT secs. */
-static gboolean irc_userping( gpointer _irc )
+static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond )
 {
         irc_t *irc = _irc;

irc.h

@@ -61 +61 @@
         char *sendbuffer;
         char *readbuffer;
-        int quit;
 
         int sentbytes;
@@ -93 +92 @@
         struct set *set;
 
-        GIOChannel *io_channel;
         gint r_watch_source_id;
         gint w_watch_source_id;
@@ -105 +103 @@
 
 irc_t *irc_new( int fd );
-void irc_abort( irc_t *irc, int immed, char *format, ... );
+void irc_abort( irc_t *irc, int immed, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
 void irc_free( irc_t *irc );
 
@@ -114 +112 @@
 
 void irc_vawrite( irc_t *irc, char *format, va_list params );
-void irc_write( irc_t *irc, char *format, ... );
-void irc_write_all( int now, char *format, ... );
-void irc_reply( irc_t *irc, int code, char *format, ... );
-G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... );
+void irc_write( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+void irc_write_all( int now, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+void irc_reply( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
+G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
 char **irc_tokenize( char *buffer );
 

irc_commands.c

@@ -385 +385 @@
                         
                         if( u && u->online )
-                                irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "is online" );
+                                irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );
                         else
-                                irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", time( NULL ), "is offline" );
+                                irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );
                 }
                 else if( cmd[i][0] == '-' )
@@ -448 +448 @@
                 
                 if( gc && gc->flags & OPT_LOGGED_IN )
-                        proto_away( gc, u->away );
+                        bim_set_away( gc, u->away );
         }
 }

log.h

@@ -54 +54 @@
 void log_init(void);
 void log_link(int level, int output);
-void log_message(int level, char *message, ...);
+void log_message(int level, char *message, ...) G_GNUC_PRINTF( 2, 3 );
 void log_error(char *functionname);
 

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
+objects = $(EVENT_HANDLER) http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))

protocols/http_client.c

@@ -32 +32 @@
 
 
-static void http_connected( gpointer data, int source, GaimInputCondition cond );
-static void http_ssl_connected( gpointer data, void *source, GaimInputCondition cond );
-static void http_incoming_data( gpointer data, int source, GaimInputCondition cond );
+static gboolean http_connected( gpointer data, int source, b_input_condition cond );
+static gboolean http_ssl_connected( gpointer data, void *source, b_input_condition cond );
+static gboolean http_incoming_data( gpointer data, int source, b_input_condition cond );
 
 
@@ -104 +104 @@
 /* This one is actually pretty simple... Might get more calls if we can't write 
    the whole request at once. */
-static void http_connected( gpointer data, int source, GaimInputCondition cond )
+static gboolean http_connected( gpointer data, int source, b_input_condition cond )
 {
         struct http_request *req = data;
@@ -113 +113 @@
         
         if( req->inpa > 0 )
-                gaim_input_remove( req->inpa );
+                b_event_remove( req->inpa );
         
         sock_make_nonblocking( req->fd );
@@ -148 +148 @@
         
         if( req->bytes_written < req->request_length )
-                req->inpa = gaim_input_add( source,
-                                            req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
-                                            http_connected, req );
-        else
-                req->inpa = gaim_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
-        
-        return;
+                req->inpa = b_input_add( source,
+                                         req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
+                                         http_connected, req );
+        else
+                req->inpa = b_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
+        
+        return FALSE;
         
 error:
@@ -162 +162 @@
         g_free( req );
         
-        return;
+        return FALSE;
 }
 
-static void http_ssl_connected( gpointer data, void *source, GaimInputCondition cond )
+static gboolean http_ssl_connected( gpointer data, void *source, b_input_condition cond )
 {
         struct http_request *req = data;
@@ -177 +177 @@
 }
 
-static void http_incoming_data( gpointer data, int source, GaimInputCondition cond )
+static gboolean http_incoming_data( gpointer data, int source, b_input_condition cond )
 {
         struct http_request *req = data;
@@ -186 +186 @@
         
         if( req->inpa > 0 )
-                gaim_input_remove( req->inpa );
+                b_event_remove( req->inpa );
         
         if( req->ssl )
@@ -233 +233 @@
         
         /* There will be more! */
-        req->inpa = gaim_input_add( req->fd,
-                                    req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
-                                    http_incoming_data, req );
-        
-        return;
+        req->inpa = b_input_add( req->fd,
+                                 req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
+                                 http_incoming_data, req );
+        
+        return FALSE;
 
 got_reply:
+        /* Maybe if the webserver is overloaded, or when there's bad SSL
+           support... */
+        if( req->bytes_read == 0 )
+                goto cleanup;
+        
         /* Zero termination is very convenient. */
         req->reply_headers[req->bytes_read] = 0;
@@ -396 +401 @@
                 req->reply_headers = req->reply_body = NULL;
                 
-                return;
+                return FALSE;
         }
         
@@ -414 +419 @@
         g_free( req->reply_headers );
         g_free( req );
+        
+        return FALSE;
 }

protocols/jabber/jabber.c

@@ -471 +471 @@
 }
 
-static void jabber_callback(gpointer data, gint source, GaimInputCondition condition)
+static gboolean jabber_callback(gpointer data, gint source, b_input_condition condition)
 {
         struct gaim_connection *gc = (struct gaim_connection *)data;
@@ -477 +477 @@
 
         gjab_recv(jd->gjc);
+        
+        return TRUE;
 }
 
@@ -487 +489 @@
 }
 
-static void gjab_connected(gpointer data, gint source, GaimInputCondition cond)
+static gboolean gjab_connected(gpointer data, gint source, b_input_condition cond)
 {
         xmlnode x;
@@ -497 +499 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return;
+                return FALSE;
         }
 
@@ -508 +510 @@
         if (source == -1) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return;
+                return FALSE;
         }
 
@@ -530 +532 @@
 
         gc = GJ_GC(gjc);
-        gc->inpa = gaim_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
-}
-
-static void gjab_connected_ssl(gpointer data, void *source, GaimInputCondition cond)
+        gc->inpa = b_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
+        
+        return FALSE;
+}
+
+static gboolean gjab_connected_ssl(gpointer data, void *source, b_input_condition cond)
 {
         struct gaim_connection *gc = data;
@@ -544 +548 @@
         if (source == NULL) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return;
+                return FALSE;
         }
         
         if (!g_slist_find(get_connections(), gc)) {
                 ssl_disconnect(source);
-                return;
+                return FALSE;
         }
         
-        gjab_connected(data, gjc->fd, cond);
+        return gjab_connected(data, gjc->fd, cond);
 }
 
@@ -1543 +1547 @@
 }
 
-static gboolean jabber_free(gpointer data)
+static gboolean jabber_free(gpointer data, gint fd, b_input_condition cond)
 {
         struct jabber_data *jd = data;
@@ -1588 +1592 @@
         }
         if (gc->inpa)
-                gaim_input_remove(gc->inpa);
+                b_event_remove(gc->inpa);
 
         if(jd) {
-                g_timeout_add(50, jabber_free, jd);
+                b_timeout_add(50, jabber_free, jd);
                 if(jd->gjc != NULL)
                         xmlnode_free(jd->gjc->current);

protocols/msn/msn.h

@@ -146 +146 @@
 
 /* ns.c */
-void msn_ns_connected( gpointer data, gint source, GaimInputCondition cond );
+gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond );
 
 /* msn_util.c */
@@ -173 +173 @@
 void msn_sb_to_chat( struct msn_switchboard *sb );
 void msn_sb_destroy( struct msn_switchboard *sb );
-void msn_sb_connected( gpointer data, gint source, GaimInputCondition cond );
+gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );

protocols/msn/ns.c

@@ -30 +30 @@
 #include "md5.h"
 
-static void msn_ns_callback( gpointer data, gint source, GaimInputCondition cond );
+static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond );
 static int msn_ns_command( gpointer data, char **cmd, int num_parts );
 static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
@@ -36 +36 @@
 static void msn_auth_got_passport_id( struct passport_reply *rep );
 
-void msn_ns_connected( gpointer data, gint source, GaimInputCondition cond )
+gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct gaim_connection *gc = data;
@@ -43 +43 @@
         
         if( !g_slist_find( msn_connections, gc ) )
-                return;
+                return FALSE;
         
         if( source == -1 )
@@ -49 +49 @@
                 hide_login_progress( gc, "Could not connect to server" );
                 signoff( gc );
-                return;
+                return FALSE;
         }
         
@@ -75 +75 @@
         if( msn_write( gc, s, strlen( s ) ) )
         {
-                gc->inpa = gaim_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
+                gc->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
                 set_login_progress( gc, 1, "Connected to server, waiting for reply" );
         }
+        
+        return FALSE;
 }
 
-void msn_ns_callback( gpointer data, gint source, GaimInputCondition cond )
+static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct gaim_connection *gc = data;
@@ -89 +91 @@
                 hide_login_progress( gc, "Error while reading from server" );
                 signoff( gc );
-        }
+                
+                return FALSE;
+        }
+        else
+                return TRUE;
 }
 
@@ -130 +136 @@
                 if( num_parts == 6 && strcmp( cmd[2], "NS" ) == 0 )
                 {
-                        gaim_input_remove( gc->inpa );
+                        b_event_remove( gc->inpa );
                         gc->inpa = 0;
                         closesocket( md->fd );

protocols/msn/sb.c

@@ -30 +30 @@
 #include "md5.h"
 
-static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond );
+static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
 static int msn_sb_command( gpointer data, char **cmd, int num_parts );
 static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
@@ -237 +237 @@
         }
         
-        if( sb->inp ) gaim_input_remove( sb->inp );
+        if( sb->inp ) b_event_remove( sb->inp );
         closesocket( sb->fd );
         
@@ -245 +245 @@
 }
 
-void msn_sb_connected( gpointer data, gint source, GaimInputCondition cond )
+gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
@@ -254 +254 @@
         /* Are we still alive? */
         if( !g_slist_find( msn_switchboards, sb ) )
-                return;
+                return FALSE;
         
         gc = sb->gc;
@@ -263 +263 @@
                 debug( "ERROR %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
-                return;
+                return FALSE;
         }
         
@@ -280 +280 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = gaim_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
                 debug( "ERROR %d while connecting to switchboard server", 2 );
-}
-
-static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond )
+        
+        return FALSE;
+}
+
+static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
@@ -293 +295 @@
                 debug( "ERROR: Switchboard died" );
                 msn_sb_destroy( sb );
-        }
+                
+                return FALSE;
+        }
+        else
+                return TRUE;
 }
 

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -13 +13 @@
  * from scratch for BitlBee and doesn't contain any code from Gaim anymore
  * (except for the function names).
- *
- * Copyright 2002-2006 Wilmer van der Gaast <wilmer@gaast.net> and others
  */
 
@@ -37 +35 @@
 #include "nogaim.h"
 #include <ctype.h>
-
-static char *proto_away_alias[8][5] =
-{
-        { "Away from computer", "Away", "Extended away", NULL },
-        { "NA", "N/A", "Not available", NULL },
-        { "Busy", "Do not disturb", "DND", "Occupied", NULL },
-        { "Be right back", "BRB", NULL },
-        { "On the phone", "Phone", "On phone", NULL },
-        { "Out to lunch", "Lunch", "Food", NULL },
-        { "Invisible", "Hidden" },
-        { NULL }
-};
-static char *proto_away_alias_find( GList *gcm, char *away );
 
 static int remove_chat_buddy_silent( struct conversation *b, char *handle );
@@ -158 +143 @@
 GSList *get_connections() { return connections; }
 
-int proto_away( struct gaim_connection *gc, char *away )
-{
-        GList *m, *ms;
-        char *s;
-        
-        if( !away ) away = "";
-        ms = m = gc->prpl->away_states( gc );
-        
-        while( m )
-        {
-                if( *away )
-                {
-                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
-                                break;
-                }
-                else
-                {
-                        if( g_strcasecmp( m->data, "Available" ) == 0 )
-                                break;
-                        if( g_strcasecmp( m->data, "Online" ) == 0 )
-                                break;
-                }
-                m = m->next;
-        }
-        
-        if( m )
-        {
-                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
-        }
-        else
-        {
-                s = proto_away_alias_find( ms, away );
-                if( s )
-                {
-                        gc->prpl->set_away( gc, s, away );
-                        if( set_getint( gc->irc, "debug" ) )
-                                serv_got_crap( gc, "Setting away state to %s", s );
-                }
-                else
-                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
-        }
-        
-        g_list_free( ms );
-        
-        return( 1 );
-}
-
-static char *proto_away_alias_find( GList *gcm, char *away )
-{
-        GList *m;
-        int i, j;
-        
-        for( i = 0; *proto_away_alias[i]; i ++ )
-        {
-                for( j = 0; proto_away_alias[i][j]; j ++ )
-                        if( g_strncasecmp( away, proto_away_alias[i][j], strlen( proto_away_alias[i][j] ) ) == 0 )
-                                break;
-                
-                if( !proto_away_alias[i][j] )   /* If we reach the end, this row */
-                        continue;               /* is not what we want. Next!    */
-                
-                /* Now find an entry in this row which exists in gcm */
-                for( j = 0; proto_away_alias[i][j]; j ++ )
-                {
-                        m = gcm;
-                        while( m )
-                        {
-                                if( g_strcasecmp( proto_away_alias[i][j], m->data ) == 0 )
-                                        return( proto_away_alias[i][j] );
-                                m = m->next;
-                        }
-                }
-        }
-        
-        return( NULL );
-}
-
 /* multi.c */
 
@@ -250 +158 @@
          * This fixes daemon mode breakage where IRC doesn't point to the currently active connection.
          */
-        gc->irc=user->irc;
+        gc->irc = user->irc;
         
         connections = g_slist_append( connections, gc );
@@ -330 +238 @@
 }
 
-static gboolean send_keepalive( gpointer d )
+static gboolean send_keepalive( gpointer d, gint fd, b_input_condition cond )
 {
         struct gaim_connection *gc = d;
@@ -354 +262 @@
         serv_got_crap( gc, "Logged in" );
         
-        gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
+        gc->keepalive = b_timeout_add( 60000, send_keepalive, gc );
         gc->flags |= OPT_LOGGED_IN;
         
         /* Also necessary when we're not away, at least for some of the
            protocols. */
-        proto_away( gc, u->away );
-}
-
-gboolean auto_reconnect( gpointer data )
+        bim_set_away( gc, u->away );
+}
+
+gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond )
 {
         account_t *a = data;
@@ -374 +282 @@
 void cancel_auto_reconnect( account_t *a )
 {
-        while( g_source_remove_by_user_data( (gpointer) a ) );
+        /* while( b_event_remove_by_data( (gpointer) a ) ); */
+        b_event_remove( a->reconnect );
         a->reconnect = 0;
 }
@@ -386 +295 @@
         serv_got_crap( gc, "Signing off.." );
 
-        gaim_input_remove( gc->keepalive );
+        b_event_remove( gc->keepalive );
         gc->keepalive = 0;
         gc->prpl->close( gc );
-        gaim_input_remove( gc->inpa );
+        b_event_remove( gc->inpa );
         
         while( u )
@@ -416 +325 @@
         {
                 int delay = set_getint( irc, "auto_reconnect_delay" );
+                
                 serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
-                
-                a->reconnect = 1;
-                g_timeout_add( delay * 1000, auto_reconnect, a );
+                a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );
         }
         
@@ -1031 +939 @@
 }
 
-int serv_send_im( irc_t *irc, user_t *u, char *msg, int flags )
+
+
+
+/* The plan is to not allow straight calls to prpl functions anymore, but do
+   them all from some wrappers. We'll start to define some down here: */
+
+int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags )
 {
         char *buf = NULL;
         int st;
         
-        if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        if( ( gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
         {
                 buf = escape_html( msg );
@@ -1042 +956 @@
         }
         
-        st = ((struct gaim_connection *)u->gc)->prpl->send_im( u->gc, u->handle, msg, strlen( msg ), flags );
+        st = gc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
         g_free( buf );
         
@@ -1048 +962 @@
 }
 
-int serv_send_chat( irc_t *irc, struct gaim_connection *gc, int id, char *msg )
+int bim_chat_msg( struct gaim_connection *gc, int id, char *msg )
 {
         char *buf = NULL;
@@ -1064 +978 @@
         return st;
 }
+
+static char *bim_away_alias_find( GList *gcm, char *away );
+
+int bim_set_away( struct gaim_connection *gc, char *away )
+{
+        GList *m, *ms;
+        char *s;
+        
+        if( !away ) away = "";
+        ms = m = gc->prpl->away_states( gc );
+        
+        while( m )
+        {
+                if( *away )
+                {
+                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
+                                break;
+                }
+                else
+                {
+                        if( g_strcasecmp( m->data, "Available" ) == 0 )
+                                break;
+                        if( g_strcasecmp( m->data, "Online" ) == 0 )
+                                break;
+                }
+                m = m->next;
+        }
+        
+        if( m )
+        {
+                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
+        }
+        else
+        {
+                s = bim_away_alias_find( ms, away );
+                if( s )
+                {
+                        gc->prpl->set_away( gc, s, away );
+                        if( set_getint( gc->irc, "debug" ) )
+                                serv_got_crap( gc, "Setting away state to %s", s );
+                }
+                else
+                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
+        }
+        
+        g_list_free( ms );
+        
+        return( 1 );
+}
+
+static char *bim_away_alias_list[8][5] =
+{
+        { "Away from computer", "Away", "Extended away", NULL },
+        { "NA", "N/A", "Not available", NULL },
+        { "Busy", "Do not disturb", "DND", "Occupied", NULL },
+        { "Be right back", "BRB", NULL },
+        { "On the phone", "Phone", "On phone", NULL },
+        { "Out to lunch", "Lunch", "Food", NULL },
+        { "Invisible", "Hidden" },
+        { NULL }
+};
+
+static char *bim_away_alias_find( GList *gcm, char *away )
+{
+        GList *m;
+        int i, j;
+        
+        for( i = 0; *bim_away_alias_list[i]; i ++ )
+        {
+                for( j = 0; bim_away_alias_list[i][j]; j ++ )
+                        if( g_strncasecmp( away, bim_away_alias_list[i][j], strlen( bim_away_alias_list[i][j] ) ) == 0 )
+                                break;
+                
+                if( !bim_away_alias_list[i][j] )        /* If we reach the end, this row */
+                        continue;                       /* is not what we want. Next!    */
+                
+                /* Now find an entry in this row which exists in gcm */
+                for( j = 0; bim_away_alias_list[i][j]; j ++ )
+                {
+                        m = gcm;
+                        while( m )
+                        {
+                                if( g_strcasecmp( bim_away_alias_list[i][j], m->data ) == 0 )
+                                        return( bim_away_alias_list[i][j] );
+                                m = m->next;
+                        }
+                }
+        }
+        
+        return( NULL );
+}
+
+void bim_add_allow( struct gaim_connection *gc, char *handle )
+{
+        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        {
+                gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
+        }
+        
+        gc->prpl->add_permit( gc, handle );
+}
+
+void bim_rem_allow( struct gaim_connection *gc, char *handle )
+{
+        GSList *l;
+        
+        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        {
+                g_free( l->data );
+                gc->permit = g_slist_delete_link( gc->permit, l );
+        }
+        
+        gc->prpl->rem_permit( gc, handle );
+}
+
+void bim_add_block( struct gaim_connection *gc, char *handle )
+{
+        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        {
+                gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
+        }
+        
+        gc->prpl->add_deny( gc, handle );
+}
+
+void bim_rem_block( struct gaim_connection *gc, char *handle )
+{
+        GSList *l;
+        
+        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        {
+                g_free( l->data );
+                gc->deny = g_slist_delete_link( gc->deny, l );
+        }
+        
+        gc->prpl->rem_deny( gc, handle );
+}

protocols/nogaim.h

@@ -52 +52 @@
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
 
-#define WEBSITE "http://www.bitlee.org/"
+#define WEBSITE "http://www.bitlbee.org/"
 #define IM_FLAG_AWAY 0x0020
 #define OPT_CONN_HTML 0x00000001
@@ -194 +194 @@
 
 /* nogaim.c */
-int serv_send_im(irc_t *irc, user_t *u, char *msg, int flags);
-int serv_send_chat(irc_t *irc, struct gaim_connection *gc, int id, char *msg );
+int bim_set_away( struct gaim_connection *gc, char *away );
+int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags );
+int bim_chat_msg( struct gaim_connection *gc, int id, char *msg );
+
+void bim_add_allow( struct gaim_connection *gc, char *handle );
+void bim_rem_allow( struct gaim_connection *gc, char *handle );
+void bim_add_block( struct gaim_connection *gc, char *handle );
+void bim_rem_block( struct gaim_connection *gc, char *handle );
 
 void nogaim_init();
-int proto_away( struct gaim_connection *gc, char *away );
 char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
 
-gboolean auto_reconnect( gpointer data );
+gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
 void cancel_auto_reconnect( struct account *a );
 
@@ -210 +215 @@
 G_MODULE_EXPORT void hide_login_progress( struct gaim_connection *gc, char *msg );
 G_MODULE_EXPORT void hide_login_progress_error( struct gaim_connection *gc, char *msg );
-G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... );
+G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
 G_MODULE_EXPORT void account_online( struct gaim_connection *gc );
 G_MODULE_EXPORT void signoff( struct gaim_connection *gc );

protocols/oscar/aim.h

@@ -728 +728 @@
 };
 
-#define AIM_CHATFLAGS_NOREFLECT 0x0001
-#define AIM_CHATFLAGS_AWAY      0x0002
+#define AIM_CHATFLAGS_NOREFLECT         0x0001
+#define AIM_CHATFLAGS_AWAY              0x0002
+#define AIM_CHATFLAGS_UNICODE           0x0004
+#define AIM_CHATFLAGS_ISO_8859_1        0x0008
+
 int aim_chat_send_im(aim_session_t *sess, aim_conn_t *conn, guint16 flags, const char *msg, int msglen);
 int aim_chat_join(aim_session_t *sess, aim_conn_t *conn, guint16 exchange, const char *roomname, guint16 instance);

protocols/oscar/chat.c

@@ -159 +159 @@
         if (flags & AIM_CHATFLAGS_AWAY)
                 aim_addtlvtochain_noval(&otl, 0x0007);
-
+        
+        /* [WvG] This wasn't there originally, but we really should send
+                 the right charset flags, as we also do with normal
+                 messages. Hope this will work. :-) */
+        /*
+        if (flags & AIM_CHATFLAGS_UNICODE)
+                aimbs_put16(&fr->data, 0x0002);
+        else if (flags & AIM_CHATFLAGS_ISO_8859_1)
+                aimbs_put16(&fr->data, 0x0003);
+        else
+                aimbs_put16(&fr->data, 0x0000);
+        
+        aimbs_put16(&fr->data, 0x0000);
+        */
+        
         /*
          * SubTLV: Type 1: Message

protocols/oscar/im.c

@@ -1469 +1469 @@
             case 0x9c:  /* ICQ 5 seems to send this */
                 aim_send_im_ch2_statusmessage(sess, userinfo->sn, args->cookie,
-                        gc->away, sess->aim_icq_state, dc);
+                        gc->away ? gc->away : "", sess->aim_icq_state, dc);
                 break;
 

protocols/oscar/oscar.c

@@ -2 +2 @@
  * gaim
  *
+ * Some code copyright (C) 2002-2006, Jelmer Vernooij <jelmer@samba.org>
+ *                                    and the BitlBee team.
  * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  * libfaim code copyright 1998, 1999 Adam Fritzler <afritz@auk.cx>
@@ -136 +138 @@
         int i, j;
         char *x = strchr(name, '-');
-        if (!x) return NULL;
+        if (!x) return g_strdup(name);
         x = strchr(++x, '-');
-        if (!x) return NULL;
+        if (!x) return g_strdup(name);
         tmp = g_strdup(++x);
 
@@ -253 +255 @@
 static int msgerrreasonlen = 25;
 
-static void oscar_callback(gpointer data, gint source,
-                                GaimInputCondition condition) {
+static gboolean oscar_callback(gpointer data, gint source,
+                                b_input_condition condition) {
         aim_conn_t *conn = (aim_conn_t *)data;
         aim_session_t *sess = aim_conn_getsess(conn);
@@ -262 +264 @@
         if (!gc) {
                 /* gc is null. we return, else we seg SIGSEG on next line. */
-                return;
+                return FALSE;
         }
       
@@ -268 +270 @@
                 /* oh boy. this is probably bad. i guess the only thing we 
                  * can really do is return? */
-                return;
+                return FALSE;
         }
 
@@ -288 +290 @@
                                 c->conn = NULL;
                                 if (c->inpa > 0)
-                                        gaim_input_remove(c->inpa);
+                                        b_event_remove(c->inpa);
                                 c->inpa = 0;
                                 c->fd = -1;
@@ -296 +298 @@
                         } else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
                                 if (odata->cnpa > 0)
-                                        gaim_input_remove(odata->cnpa);
+                                        b_event_remove(odata->cnpa);
                                 odata->cnpa = 0;
                                 while (odata->create_rooms) {
@@ -310 +312 @@
                         } else if (conn->type == AIM_CONN_TYPE_AUTH) {
                                 if (odata->paspa > 0)
-                                        gaim_input_remove(odata->paspa);
+                                        b_event_remove(odata->paspa);
                                 odata->paspa = 0;
                                 aim_conn_kill(odata->sess, &conn);
@@ -317 +319 @@
                         }
                 }
-        }
-}
-
-static void oscar_login_connect(gpointer data, gint source, GaimInputCondition cond)
+        } else {
+                /* WTF??? */
+                return FALSE;
+        }
+                
+        return TRUE;
+}
+
+static gboolean oscar_login_connect(gpointer data, gint source, b_input_condition cond)
 {
         struct gaim_connection *gc = data;
@@ -329 +336 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return;
+                return FALSE;
         }
 
@@ -339 +346 @@
                 hide_login_progress(gc, _("Couldn't connect to host"));
                 signoff(gc);
-                return;
+                return FALSE;
         }
 
         aim_conn_completeconnect(sess, conn);
-        gc->inpa = gaim_input_add(conn->fd, GAIM_INPUT_READ,
+        gc->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
                         oscar_callback, conn);
+        
+        return FALSE;
 }
 
@@ -383 +392 @@
         if (g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.icq.com") != 0 &&
             g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.oscar.aol.com") != 0) {
-                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.");
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",user->proto_opt[USEROPT_AUTH]);
         }
         
@@ -412 +421 @@
                 struct chat_connection *n = odata->oscar_chats->data;
                 if (n->inpa > 0)
-                        gaim_input_remove(n->inpa);
+                        b_event_remove(n->inpa);
                 g_free(n->name);
                 g_free(n->show);
@@ -431 +440 @@
                 g_free(odata->oldp);
         if (gc->inpa > 0)
-                gaim_input_remove(gc->inpa);
+                b_event_remove(gc->inpa);
         if (odata->cnpa > 0)
-                gaim_input_remove(odata->cnpa);
+                b_event_remove(odata->cnpa);
         if (odata->paspa > 0)
-                gaim_input_remove(odata->paspa);
+                b_event_remove(odata->paspa);
         aim_session_kill(odata->sess);
         g_free(odata->sess);
@@ -443 +452 @@
 }
 
-static void oscar_bos_connect(gpointer data, gint source, GaimInputCondition cond) {
+static gboolean oscar_bos_connect(gpointer data, gint source, b_input_condition cond) {
         struct gaim_connection *gc = data;
         struct oscar_data *odata;
@@ -451 +460 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return;
+                return FALSE;
         }
 
@@ -461 +470 @@
                 hide_login_progress(gc, _("Could Not Connect"));
                 signoff(gc);
-                return;
+                return FALSE;
         }
 
         aim_conn_completeconnect(sess, bosconn);
-        gc->inpa = gaim_input_add(bosconn->fd, GAIM_INPUT_READ,
+        gc->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
                         oscar_callback, bosconn);
         set_login_progress(gc, 4, _("Connection established, cookie sent"));
+        
+        return FALSE;
 }
 
@@ -570 +581 @@
         }
         aim_sendcookie(sess, bosconn, info->cookie);
-        gaim_input_remove(gc->inpa);
+        b_event_remove(gc->inpa);
 
         return 1;
@@ -585 +596 @@
 };
 
-static void damn_you(gpointer data, gint source, GaimInputCondition c)
+static gboolean damn_you(gpointer data, gint source, b_input_condition c)
 {
         struct pieceofcrap *pos = data;
@@ -605 +616 @@
                 do_error_dialog(pos->gc, "Gaim was unable to get a valid hash for logging into AIM."
                                 " You may be disconnected shortly.", "Login Error");
-                gaim_input_remove(pos->inpa);
+                b_event_remove(pos->inpa);
                 closesocket(pos->fd);
                 g_free(pos);
-                return;
+                return FALSE;
         }
         /* [WvG] Wheeeee! Who needs error checking anyway? ;-) */
         read(pos->fd, m, 16);
         m[16] = '\0';
-        gaim_input_remove(pos->inpa);
+        b_event_remove(pos->inpa);
         closesocket(pos->fd);
         aim_sendmemblock(od->sess, pos->conn, 0, 16, m, AIM_SENDMEMBLOCK_FLAG_ISHASH);
         g_free(pos);
-}
-
-static void straight_to_hell(gpointer data, gint source, GaimInputCondition cond) {
+        
+        return FALSE;
+}
+
+static gboolean straight_to_hell(gpointer data, gint source, b_input_condition cond) {
         struct pieceofcrap *pos = data;
         char buf[BUF_LONG];
@@ -629 +642 @@
                         g_free(pos->modname);
                 g_free(pos);
-                return;
+                return FALSE;
         }
 
@@ -638 +651 @@
         if (pos->modname)
                 g_free(pos->modname);
-        pos->inpa = gaim_input_add(pos->fd, GAIM_INPUT_READ, damn_you, pos);
-        return;
+        pos->inpa = b_input_add(pos->fd, GAIM_INPUT_READ, damn_you, pos);
+        return FALSE;
 }
 
@@ -761 +774 @@
 }
 
-static void oscar_chatnav_connect(gpointer data, gint source, GaimInputCondition cond) {
+static gboolean oscar_chatnav_connect(gpointer data, gint source, b_input_condition cond) {
         struct gaim_connection *gc = data;
         struct oscar_data *odata;
@@ -769 +782 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return;
+                return FALSE;
         }
 
@@ -778 +791 @@
         if (source < 0) {
                 aim_conn_kill(sess, &tstconn);
-                return;
+                return FALSE;
         }
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->cnpa = gaim_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
                                         oscar_callback, tstconn);
-}
-
-static void oscar_auth_connect(gpointer data, gint source, GaimInputCondition cond)
+        
+        return FALSE;
+}
+
+static gboolean oscar_auth_connect(gpointer data, gint source, b_input_condition cond)
 {
         struct gaim_connection *gc = data;
@@ -795 +810 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return;
+                return FALSE;
         }
 
@@ -804 +819 @@
         if (source < 0) {
                 aim_conn_kill(sess, &tstconn);
-                return;
+                return FALSE;
         }
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->paspa = gaim_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
                                 oscar_callback, tstconn);
-}
-
-static void oscar_chat_connect(gpointer data, gint source, GaimInputCondition cond)
+        
+        return FALSE;
+}
+
+static gboolean oscar_chat_connect(gpointer data, gint source, b_input_condition cond)
 {
         struct chat_connection *ccon = data;
@@ -825 +842 @@
                 g_free(ccon->name);
                 g_free(ccon);
-                return;
+                return FALSE;
         }
 
@@ -837 +854 @@
                 g_free(ccon->name);
                 g_free(ccon);
-                return;
+                return FALSE;
         }
 
         aim_conn_completeconnect(sess, ccon->conn);
-        ccon->inpa = gaim_input_add(tstconn->fd,
+        ccon->inpa = b_input_add(tstconn->fd,
                         GAIM_INPUT_READ,
                         oscar_callback, tstconn);
         odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);
+        
+        return FALSE;
 }
 
@@ -2500 +2519 @@
         int ret;
         guint8 len = strlen(message);
+        guint16 flags;
         char *s;
         
@@ -2508 +2528 @@
                 if (*s & 128)
                         break;
-                
+        
+        flags = AIM_CHATFLAGS_NOREFLECT;
+        
         /* Message contains high ASCII chars, time for some translation! */
         if (*s) {
@@ -2515 +2537 @@
                    If we can't, fall back to UTF16. */
                 if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) {
+                        flags |= AIM_CHATFLAGS_ISO_8859_1;
                         len = ret;
                 } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) {
+                        flags |= AIM_CHATFLAGS_UNICODE;
                         len = ret;
                 } else {
@@ -2527 +2551 @@
         }
                 
-        ret = aim_chat_send_im(od->sess, ccon->conn, AIM_CHATFLAGS_NOREFLECT, s, len);
+        ret = aim_chat_send_im(od->sess, ccon->conn, flags, s, len);
                 
         if (s != message) {     
@@ -2558 +2582 @@
         od->oscar_chats = g_slist_remove(od->oscar_chats, cc);
         if (cc->inpa > 0)
-                gaim_input_remove(cc->inpa);
+                b_event_remove(cc->inpa);
         aim_conn_kill(od->sess, &cc->conn);
         g_free(cc->name);
@@ -2600 +2624 @@
         int ret;
         static int chat_id = 0;
-        char * chatname = g_new0(char, strlen(gc->username)+4);
-        
-        g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
+        char * chatname;
+        
+        chatname = g_strdup_printf("%s%d", gc->username, chat_id++);
   
         ret = oscar_chat_join(gc, chatname);

protocols/proxy.c

@@ -21 +21 @@
  */
 
-/* this is a little piece of code to handle proxy connection */
-/* it is intended to : 1st handle http proxy, using the CONNECT command
- , 2nd provide an easy way to add socks support */
-
 #define BITLBEE_CORE
 #include <stdio.h>
@@ -46 +42 @@
 #include "proxy.h"
 
-#define GAIM_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
-#define GAIM_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-#define GAIM_ERR_COND   (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-
 char proxyhost[128] = "";
 int proxyport = 0;
@@ -57 +49 @@
 
 struct PHB {
-        GaimInputFunction func, proxy_func;
+        b_event_handler func, proxy_func;
         gpointer data, proxy_data;
         char *host;
@@ -64 +56 @@
         gint inpa;
 };
-
-typedef struct _GaimIOClosure {
-        GaimInputFunction function;
-        guint result;
-        gpointer data;
-} GaimIOClosure;
 
 
@@ -92 +78 @@
 }
 
-static void gaim_io_destroy(gpointer data)
-{
-        g_free(data);
-}
-
-static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
-{
-        GaimIOClosure *closure = data;
-        GaimInputCondition gaim_cond = 0;
-
-        if (condition & GAIM_READ_COND)
-                gaim_cond |= GAIM_INPUT_READ;
-        if (condition & GAIM_WRITE_COND)
-                gaim_cond |= GAIM_INPUT_WRITE;
-
-        closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);
-
-        return TRUE;
-}
-
-static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond)
+static gboolean gaim_io_connected(gpointer data, gint source, b_input_condition cond)
 {
         struct PHB *phb = data;
@@ -122 +88 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 closesocket(source);
-                gaim_input_remove(phb->inpa);
+                b_event_remove(phb->inpa);
                 if( phb->proxy_func )
                         phb->proxy_func(phb->proxy_data, -1, GAIM_INPUT_READ);
@@ -129 +95 @@
                         g_free(phb);
                 }
-                return;
+                return FALSE;
         }
 #endif
         sock_make_blocking(source);
-        gaim_input_remove(phb->inpa);
+        b_event_remove(phb->inpa);
         if( phb->proxy_func )
                 phb->proxy_func(phb->proxy_data, source, GAIM_INPUT_READ);
@@ -140 +106 @@
                 g_free(phb);
         }
+        
+        return FALSE;
 }
 
@@ -158 +126 @@
 
         sock_make_nonblocking(fd);
-
+        
+        event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);
+        
         if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
                 if (sockerr_again()) {
-                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
+                        phb->inpa = b_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
                         phb->fd = fd;
                 } else {
@@ -179 +149 @@
 #define HTTP_GOODSTRING2 "HTTP/1.1 200 Connection established"
 
-static void http_canread(gpointer data, gint source, GaimInputCondition cond)
+static gboolean http_canread(gpointer data, gint source, b_input_condition cond)
 {
         int nlc = 0;
@@ -186 +156 @@
         char inputline[8192];
 
-        gaim_input_remove(phb->inpa);
+        b_event_remove(phb->inpa);
 
         while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
@@ -201 +171 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -208 +178 @@
         g_free(phb->host);
         g_free(phb);
-        return;
-}
-
-static void http_canwrite(gpointer data, gint source, GaimInputCondition cond)
+        
+        return FALSE;
+}
+
+static gboolean http_canwrite(gpointer data, gint source, b_input_condition cond)
 {
         char cmd[384];
@@ -218 +189 @@
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
-                gaim_input_remove(phb->inpa);
+                b_event_remove(phb->inpa);
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -225 +196 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
         sock_make_blocking(source);
@@ -236 +207 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -251 +222 @@
                         g_free(phb->host);
                         g_free(phb);
-                        return;
+                        return FALSE;
                 }
         }
@@ -261 +232 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
-        }
-
-        phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, http_canread, phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, GAIM_INPUT_READ, http_canread, phb);
+        
+        return FALSE;
 }
 
@@ -280 +253 @@
 /* Connecting to SOCKS4 proxies */
 
-static void s4_canread(gpointer data, gint source, GaimInputCondition cond)
+static gboolean s4_canread(gpointer data, gint source, b_input_condition cond)
 {
         unsigned char packet[12];
         struct PHB *phb = data;
 
-        gaim_input_remove(phb->inpa);
+        b_event_remove(phb->inpa);
 
         memset(packet, 0, sizeof(packet));
@@ -292 +265 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -299 +272 @@
         g_free(phb->host);
         g_free(phb);
-}
-
-static void s4_canwrite(gpointer data, gint source, GaimInputCondition cond)
+        
+        return FALSE;
+}
+
+static gboolean s4_canwrite(gpointer data, gint source, b_input_condition cond)
 {
         unsigned char packet[12];
@@ -309 +284 @@
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
-                gaim_input_remove(phb->inpa);
+                b_event_remove(phb->inpa);
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -316 +291 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
         sock_make_blocking(source);
@@ -326 +301 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -343 +318 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
-        }
-
-        phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s4_canread, phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s4_canread, phb);
+        
+        return FALSE;
 }
 
@@ -362 +339 @@
 /* Connecting to SOCKS5 proxies */
 
-static void s5_canread_again(gpointer data, gint source, GaimInputCondition cond)
+static gboolean s5_canread_again(gpointer data, gint source, b_input_condition cond)
 {
         unsigned char buf[512];
         struct PHB *phb = data;
 
-        gaim_input_remove(phb->inpa);
+        b_event_remove(phb->inpa);
 
         if (read(source, buf, 10) < 10) {
@@ -374 +351 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
         if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
@@ -381 +358 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -387 +364 @@
         g_free(phb->host);
         g_free(phb);
-        return;
+        
+        return FALSE;
 }
 
@@ -395 +373 @@
         struct PHB *phb = data;
         int hlen = strlen(phb->host);
-
+        
         buf[0] = 0x05;
         buf[1] = 0x01;          /* CONNECT */
@@ -413 +391 @@
         }
 
-        phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_canread_again, phb);
-}
-
-static void s5_readauth(gpointer data, gint source, GaimInputCondition cond)
+        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_canread_again, phb);
+}
+
+static gboolean s5_readauth(gpointer data, gint source, b_input_condition cond)
 {
         unsigned char buf[512];
         struct PHB *phb = data;
 
-        gaim_input_remove(phb->inpa);
+        b_event_remove(phb->inpa);
 
         if (read(source, buf, 2) < 2) {
@@ -428 +406 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -436 +414 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
         s5_sendconnect(phb, source);
-}
-
-static void s5_canread(gpointer data, gint source, GaimInputCondition cond)
+        
+        return FALSE;
+}
+
+static gboolean s5_canread(gpointer data, gint source, b_input_condition cond)
 {
         unsigned char buf[512];
         struct PHB *phb = data;
 
-        gaim_input_remove(phb->inpa);
+        b_event_remove(phb->inpa);
 
         if (read(source, buf, 2) < 2) {
@@ -454 +434 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -462 +442 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
 
@@ -477 +457 @@
                         g_free(phb->host);
                         g_free(phb);
-                        return;
+                        return FALSE;
                 }
 
-                phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_readauth, phb);
+                phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_readauth, phb);
         } else {
                 s5_sendconnect(phb, source);
         }
-}
-
-static void s5_canwrite(gpointer data, gint source, GaimInputCondition cond)
+        
+        return FALSE;
+}
+
+static gboolean s5_canwrite(gpointer data, gint source, b_input_condition cond)
 {
         unsigned char buf[512];
@@ -494 +476 @@
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
-                gaim_input_remove(phb->inpa);
+                b_event_remove(phb->inpa);
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -501 +483 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
+                return FALSE;
         }
         sock_make_blocking(source);
@@ -523 +505 @@
                 g_free(phb->host);
                 g_free(phb);
-                return;
-        }
-
-        phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_canread, phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_canread, phb);
+        
+        return FALSE;
 }
 
@@ -542 +526 @@
 /* Export functions */
 
-gint gaim_input_add(gint source, GaimInputCondition condition, GaimInputFunction function, gpointer data)
-{
-        GaimIOClosure *closure = g_new0(GaimIOClosure, 1);
-        GIOChannel *channel;
-        GIOCondition cond = 0;
-        
-        closure->function = function;
-        closure->data = data;
-        
-        if (condition & GAIM_INPUT_READ)
-                cond |= GAIM_READ_COND;
-        if (condition & GAIM_INPUT_WRITE)
-                cond |= GAIM_WRITE_COND;
-        
-        channel = g_io_channel_unix_new(source);
-        closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-                                              gaim_io_invoke, closure, gaim_io_destroy);
-        
-        g_io_channel_unref(channel);
-        return closure->result;
-}
-
-void gaim_input_remove(gint tag)
-{
-        if (tag > 0)
-                g_source_remove(tag);
-}
-
-int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data)
+int proxy_connect(const char *host, int port, b_event_handler func, gpointer data)
 {
         struct PHB *phb;

protocols/proxy.h

@@ -1 +1 @@
 /*
- * gaim
+ * nogaim
  *
  * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
@@ -36 +36 @@
 #include <gmodule.h>
 
+#include "events.h"
+
 #define PROXY_NONE 0
 #define PROXY_HTTP 1
@@ -47 +49 @@
 extern char proxypass[128];
 
-typedef enum {
-        GAIM_INPUT_READ = 1 << 0,
-        GAIM_INPUT_WRITE = 1 << 1
-} GaimInputCondition;
-typedef void (*GaimInputFunction)(gpointer, gint, GaimInputCondition);
-
-G_MODULE_EXPORT gint gaim_input_add(int, GaimInputCondition, GaimInputFunction, gpointer);
-G_MODULE_EXPORT void gaim_input_remove(gint);
-
-G_MODULE_EXPORT int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data);
+G_MODULE_EXPORT int proxy_connect(const char *host, int port, b_event_handler func, gpointer data);
 
 #endif /* _PROXY_H_ */

protocols/ssl_bogus.c

@@ -52 +52 @@
 }
 
-GaimInputCondition ssl_getdirection( void *conn )
+b_input_condition ssl_getdirection( void *conn )
 {
         return GAIM_INPUT_READ;

protocols/ssl_client.h

@@ -33 +33 @@
 extern int ssl_errno;
 
-typedef void (*ssl_input_function)(gpointer, void*, GaimInputCondition);
+typedef gboolean (*ssl_input_function)(gpointer, void*, b_input_condition);
 
 G_MODULE_EXPORT void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data );
@@ -40 +40 @@
 G_MODULE_EXPORT void ssl_disconnect( void *conn_ );
 G_MODULE_EXPORT int ssl_getfd( void *conn );
-G_MODULE_EXPORT GaimInputCondition ssl_getdirection( void *conn );
+G_MODULE_EXPORT b_input_condition ssl_getdirection( void *conn );

protocols/ssl_gnutls.c

@@ -48 +48 @@
 };
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 
 
@@ -81 +81 @@
 }
 
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
-
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
+
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
@@ -96 +96 @@
                 g_free( conn );
                 
-                return;
+                return FALSE;
         }
         
@@ -102 +102 @@
         gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) conn->fd );
         
-        ssl_handshake( data, source, cond );
-}
-
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond )
+        return ssl_handshake( data, source, cond );
+}
+
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
         int st;
         
-        if( conn->inpa != -1 )
-        {
-                gaim_input_remove( conn->inpa );
-                conn->inpa = -1;
-        }
-        
         if( ( st = gnutls_handshake( conn->session ) ) < 0 )
         {
                 if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 {
-                        conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ),
-                                                     ssl_handshake, data );
+                        conn->inpa = b_input_add( conn->fd, ssl_getdirection( conn ),
+                                                  ssl_handshake, data );
                 }
                 else
@@ -142 +136 @@
                 conn->func( conn->data, conn, cond );
         }
+        
+        return FALSE;
 }
 
@@ -187 +183 @@
         
         if( conn->inpa != -1 )
-                gaim_input_remove( conn->inpa );
+                b_event_remove( conn->inpa );
         
         if( conn->established )
@@ -204 +200 @@
 }
 
-GaimInputCondition ssl_getdirection( void *conn )
+b_input_condition ssl_getdirection( void *conn )
 {
         return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?

protocols/ssl_nss.c

@@ -52 +52 @@
 };
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 
 
@@ -116 +116 @@
 }
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
@@ -140 +140 @@
         conn->established = TRUE;
         conn->func( conn->data, conn, cond );
-        return;
+        return FALSE;
         
         ssl_connected_failure:
@@ -149 +149 @@
         if( source >= 0 ) closesocket( source );
         g_free( conn );
+        
+        return FALSE;
 }
 
@@ -182 +184 @@
 }
 
-GaimInputCondition ssl_getdirection( void *conn )
+b_input_condition ssl_getdirection( void *conn )
 {
         /* Just in case someone calls us, let's return the most likely case: */

protocols/ssl_openssl.c

@@ -52 +52 @@
 };
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
-
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 
 
@@ -95 +94 @@
 }
 
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
-
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
+
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
@@ -104 +103 @@
                 return ssl_handshake( data, -1, cond );
         
-        /* Make it non-blocking at least during the handshake... */
+        /* We can do at least the handshake with non-blocking I/O */
         sock_make_nonblocking( conn->fd );
         SSL_set_fd( conn->ssl, conn->fd );
@@ -111 +110 @@
 }       
 
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond )
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
         int st;
-        
-        if( conn->inpa != -1 )
-        {
-                gaim_input_remove( conn->inpa );
-                conn->inpa = -1;
-        }
         
         if( ( st = SSL_connect( conn->ssl ) ) < 0 )
@@ -128 +121 @@
                         goto ssl_connected_failure;
                 
-                conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ), ssl_handshake, data );
-                return;
+                conn->inpa = b_input_add( conn->fd, ssl_getdirection( conn ), ssl_handshake, data );
+                return FALSE;
         }
         
@@ -135 +128 @@
         sock_make_blocking( conn->fd );         /* For now... */
         conn->func( conn->data, conn, cond );
-        return;
+        return FALSE;
         
 ssl_connected_failure:
@@ -151 +144 @@
         if( source >= 0 ) closesocket( source );
         g_free( conn );
+        
+        return FALSE;
 }
 
@@ -204 +199 @@
         
         if( conn->inpa != -1 )
-                gaim_input_remove( conn->inpa );
+                b_event_remove( conn->inpa );
         
         if( conn->established )
@@ -221 +216 @@
 }
 
-GaimInputCondition ssl_getdirection( void *conn )
+b_input_condition ssl_getdirection( void *conn )
 {
         return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );

protocols/yahoo/yahoo.c

@@ -443 +443 @@
 };
 
-void byahoo_connect_callback( gpointer data, gint source, GaimInputCondition cond )
+void byahoo_connect_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_connect_callback_data *d = data;
@@ -465 +465 @@
 };
 
-void byahoo_read_ready_callback( gpointer data, gint source, GaimInputCondition cond )
+gboolean byahoo_read_ready_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_read_ready_data *d = data;
         
         if( !byahoo_get_gc_by_id( d->id ) )
-        {
                 /* WTF doesn't libyahoo clean this up? */
-                ext_yahoo_remove_handler( d->id, d->tag );
-                return;
-        }
+                return FALSE;
         
         yahoo_read_ready( d->id, d->fd, d->data );
+        
+        return TRUE;
 }
 
@@ -487 +486 @@
 };
 
-void byahoo_write_ready_callback( gpointer data, gint source, GaimInputCondition cond )
+gboolean byahoo_write_ready_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_write_ready_data *d = data;
         
         if( !byahoo_get_gc_by_id( d->id ) )
-        {
                 /* WTF doesn't libyahoo clean this up? */
-                ext_yahoo_remove_handler( d->id, d->tag );
-                return;
-        }
+                return FALSE;
         
         yahoo_write_ready( d->id, d->fd, d->data );
+        
+        return FALSE;
 }
 
@@ -687 +685 @@
                 
                 inp->d = d;
-                d->tag = inp->h = gaim_input_add( fd, GAIM_INPUT_READ, (GaimInputFunction) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -698 +696 @@
                 
                 inp->d = d;
-                d->tag = inp->h = gaim_input_add( fd, GAIM_INPUT_WRITE, (GaimInputFunction) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else
@@ -729 +727 @@
         }
         
-        gaim_input_remove( tag );
+        b_event_remove( tag );
 }
 
@@ -738 +736 @@
         
         d = g_new0( struct byahoo_connect_callback_data, 1 );
-        if( ( fd = proxy_connect( host, port, (GaimInputFunction) byahoo_connect_callback, (gpointer) d ) ) < 0 )
+        if( ( fd = proxy_connect( host, port, (b_event_handler) byahoo_connect_callback, (gpointer) d ) ) < 0 )
         {
                 g_free( d );

root_commands.c

@@ -56 +56 @@
                                 cmd[k++] = s;
                                 s --;
+                        }
+                        else
+                        {
+                                break;
                         }
                 }
@@ -554 +558 @@
         else
         {
-                gc->prpl->rem_permit( gc, cmd[2] );
-                gc->prpl->add_deny( gc, cmd[2] );
-                irc_usermsg( irc, "Buddy `%s' moved from your permit- to your deny-list", cmd[2] );
+                bim_rem_allow( gc, cmd[2] );
+                bim_add_block( gc, cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from your allow- to your block-list", cmd[2] );
         }
 }
@@ -613 +617 @@
         else
         {
-                gc->prpl->rem_deny( gc, cmd[2] );
-                gc->prpl->add_permit( gc, cmd[2] );
-                
-                irc_usermsg( irc, "Buddy `%s' moved from your deny- to your permit-list", cmd[2] );
+                bim_rem_block( gc, cmd[2] );
+                bim_add_allow( gc, cmd[2] );
+                
+                irc_usermsg( irc, "Buddy `%s' moved from your block- to your allow-list", cmd[2] );
         }
 }

sock.h

@@ -18 +18 @@
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
+#ifndef EVENTS_LIBEVENT
 #define closesocket(a) close(a)
+#endif
 #else
 # include <winsock2.h>

unix.c

@@ -47 +47 @@
         memset( &global, 0, sizeof( global_t ) );
         
-        global.loop = g_main_new( FALSE );
+        b_main_init();
         
         log_init();
@@ -117 +117 @@
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
-        g_main_run( global.loop );
+        b_main_run();
         
         if( global.restart )
@@ -165 +165 @@
                         
                         log_message( LOGLVL_ERROR, "SIGTERM received, cleaning up process." );
-                        g_timeout_add_full( G_PRIORITY_LOW, 1, (GSourceFunc) bitlbee_shutdown, NULL, NULL );
+                        b_timeout_add( 1, (b_event_handler) bitlbee_shutdown, NULL );
                         
                         first = 0;

user.c

@@ -109 +109 @@
                         if( u->handle ) g_free( u->handle );
                         if( u->sendbuf ) g_free( u->sendbuf );
-                        if( u->sendbuf_timer ) g_source_remove( u->sendbuf_timer );
+                        if( u->sendbuf_timer ) b_event_remove( u->sendbuf_timer );
                         g_free( u );
                         

util.c

@@ -39 +39 @@
 #include <glib.h>
 #include <time.h>
+#ifdef GLIB2
+#define iconv_t GIConv
+#define iconv_open g_iconv_open
+#define iconv_close g_iconv_close
+#define iconv g_iconv
+#else
 #include <iconv.h>
+#endif
 
 void strip_linefeed(gchar *text)