Changes in / [0baed0d:81ee561]

Files:

• bitlbee.c (modified) (3 diffs)
• configure (modified) (3 diffs)
• help.c (modified) (2 diffs)
• help.h (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• irc.c (modified) (4 diffs)
• lib/events.h (modified) (1 diff)
• lib/events_glib.c (modified) (4 diffs)
• lib/events_libevent.c (modified) (6 diffs)
• lib/http_client.c (modified) (2 diffs)
• lib/proxy.c (modified) (26 diffs)
• lib/ssl_bogus.c (modified) (1 diff)
• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_nss.c (modified) (1 diff)
• lib/ssl_openssl.c (modified) (2 diffs)
• lib/ssl_sspi.c (modified) (1 diff)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/msn/sb.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (7 diffs)
• protocols/purple/Makefile (added)
• protocols/purple/purple.c (added)
• protocols/yahoo/yahoo.c (modified) (2 diffs)
• set.c (modified) (10 diffs)
• set.h (modified) (1 diff)
• unix.c (modified) (4 diffs)

bitlbee.c

@@ -93 +93 @@
         }
         
-        global.listen_watch_source_id = b_input_add( global.listen_socket, GAIM_INPUT_READ, bitlbee_io_new_client, NULL );
+        global.listen_watch_source_id = b_input_add( global.listen_socket, B_EV_IO_READ, bitlbee_io_new_client, NULL );
         
 #ifndef _WIN32
@@ -286 +286 @@
                         child->pid = client_pid;
                         child->ipc_fd = fds[0];
-                        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                        child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
                         child_list = g_slist_append( child_list, child );
                         
@@ -314 +314 @@
                         /* We can store the IPC fd there now. */
                         global.listen_socket = fds[1];
-                        global.listen_watch_source_id = b_input_add( fds[1], GAIM_INPUT_READ, ipc_child_read, irc );
+                        global.listen_watch_source_id = b_input_add( fds[1], B_EV_IO_READ, ipc_child_read, irc );
                         
                         close( fds[0] );

configure

@@ -26 +26 @@
 oscar=1
 yahoo=1
+purple=0
 
 debug=0
@@ -66 +67 @@
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
+
+--purple=0/1    Disable/enable libpurple support        $purple
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -492 +495 @@
 protoobjs=''
 
+if [ "$purple" = 0 ]; then
+        echo '#undef WITH_PURPLE' >> config.h
+else
+        if ! $PKG_CONFIG purple; then
+                echo
+                echo 'Cannot find libpurple development libraries, aborting. (Install libpurple-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_PURPLE' >> config.h
+        cat<<EOF>>Makefile.settings
+EFLAGS += $($PKG_CONFIG purple --libs)
+PURPLE_CFLAGS += $($PKG_CONFIG purple --cflags)
+EOF
+        protocols=$protocols'purple '
+        protoobjs=$protoobjs'purple_mod.o '
+
+        # Having both libpurple and native IM modules in one binary may
+        # do strange things. Let's not do that.
+        msn=0
+        jabber=0
+        oscar=0
+        yahoo=0
+fi
+
 if [ "$msn" = 0 ]; then
         echo '#undef WITH_MSN' >> config.h

help.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2009 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -169 +169 @@
         return NULL;
 }
+
+int help_add_mem( help_t **help, const char *title, const char *content )
+{
+        help_t *h, *l = NULL;
+        
+        for( h = *help; h; h = h->next )
+        {
+                if( g_strcasecmp( h->title, title ) == 0 )
+                        return 0;
+                
+                l = h;
+        }
+        
+        if( l )
+                h = l->next = g_new0( struct help, 1 );
+        else
+                *help = h = g_new0( struct help, 1 );
+        h->fd = -1;
+        h->title = g_strdup( title );
+        h->length = strlen( content );
+        h->offset.mem_offset = g_strdup( content );
+        
+        return 1;
+}

help.h

@@ -46 +46 @@
 void help_free( help_t **help );
 char *help_get( help_t **help, char *title );
+int help_add_mem( help_t **help, const char *title, const char *content_ );
 
 #endif

ipc.c

@@ -514 +514 @@
         }
                 
-        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+        child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
         
         child_list = g_slist_append( child_list, child );
@@ -552 +552 @@
         }
         
-        b_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
+        b_input_add( serversock, B_EV_IO_READ, new_ipc_client, NULL );
         
         return 1;
@@ -597 +597 @@
                         return 0;
                 }
-                child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
                 
                 child_list = g_slist_append( child_list, child );

irc.c

@@ -109 +109 @@
         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->r_watch_source_id = b_input_add( irc->fd, B_EV_IO_READ, bitlbee_io_current_client_read, irc );
         
         irc->status = USTATUS_OFFLINE;
@@ -195 +195 @@
         /* Evaluator sets the iconv/oconv structures. */
         set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
+        
+        nogaim_init();
         
         return( irc );
@@ -677 +679 @@
                    in the event queue. */
                 /* Really can't be done as long as the code doesn't do error checking very well:
-                if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) ) */
+                if( bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE ) ) */
                 
                 /* So just always do it via the event handler. */
-                irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
+                irc->w_watch_source_id = b_input_add( irc->fd, B_EV_IO_WRITE, bitlbee_io_current_client_write, irc );
         }
         
@@ -706 +708 @@
                 if( now )
                 {
-                        bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
+                        bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE );
                 }
                 temp = temp->next;

lib/events.h

@@ -48 +48 @@
    the given callback function. */
 typedef enum {
-        GAIM_INPUT_READ = 1 << 1,
-        GAIM_INPUT_WRITE = 1 << 2
+        B_EV_IO_READ = 1 << 0,
+        B_EV_IO_WRITE = 1 << 1,
+        B_EV_FLAG_FORCE_ONCE = 1 << 16,
+        B_EV_FLAG_FORCE_REPEAT = 1 << 17,
 } b_input_condition;
 typedef gboolean (*b_event_handler)(gpointer data, gint fd, b_input_condition cond);

lib/events_glib.c

@@ -49 +49 @@
         b_event_handler function;
         gpointer data;
+        guint flags;
 } GaimIOClosure;
 
@@ -76 +77 @@
 
         if (condition & GAIM_READ_COND)
-                gaim_cond |= GAIM_INPUT_READ;
+                gaim_cond |= B_EV_IO_READ;
         if (condition & GAIM_WRITE_COND)
-                gaim_cond |= GAIM_INPUT_WRITE;
+                gaim_cond |= B_EV_IO_WRITE;
         
         event_debug( "gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data );
@@ -87 +88 @@
                 event_debug( "Returned FALSE, cancelling.\n" );
         
-        return st;
+        if (closure->flags & B_EV_FLAG_FORCE_ONCE)
+                return FALSE;
+        else if (closure->flags & B_EV_FLAG_FORCE_REPEAT)
+                return TRUE;
+        else
+                return st;
 }
 
@@ -105 +111 @@
         closure->function = function;
         closure->data = data;
+        closure->flags = condition;
         
-        if (condition & GAIM_INPUT_READ)
+        if (condition & B_EV_IO_READ)
                 cond |= GAIM_READ_COND;
-        if (condition & GAIM_INPUT_WRITE)
+        if (condition & B_EV_IO_WRITE)
                 cond |= GAIM_WRITE_COND;
         

lib/events_libevent.c

@@ -60 +60 @@
         b_event_handler function;
         void *data;
+        guint flags;
 };
 
@@ -126 +127 @@
         {
                 if( event & EV_READ )
-                        cond |= GAIM_INPUT_READ;
+                        cond |= B_EV_IO_READ;
                 if( event & EV_WRITE )
-                        cond |= GAIM_INPUT_WRITE;
+                        cond |= B_EV_IO_WRITE;
         }
         
@@ -150 +151 @@
                 return;
         }
-        else if( !st )
+        else if( !st && !( b_ev->flags & B_EV_FLAG_FORCE_REPEAT ) )
         {
                 event_debug( "Handler returned FALSE: " );
@@ -174 +175 @@
         event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) ", fd, condition, function, data );
         
-        if( ( condition & GAIM_INPUT_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
-            ( condition & GAIM_INPUT_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
+        if( ( condition & B_EV_IO_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
+            ( condition & B_EV_IO_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
         {
                 /* We'll stick with this libevent entry, but give it a new BitlBee id. */
@@ -198 +199 @@
                 
                 out_cond = EV_PERSIST;
-                if( condition & GAIM_INPUT_READ )
+                if( condition & B_EV_IO_READ )
                         out_cond |= EV_READ;
-                if( condition & GAIM_INPUT_WRITE )
+                if( condition & B_EV_IO_WRITE )
                         out_cond |= EV_WRITE;
                 
@@ -212 +213 @@
         }
         
+        b_ev->flags = condition;
         g_hash_table_insert( id_hash, &b_ev->id, b_ev );
         return b_ev->id;

lib/http_client.c

@@ -149 +149 @@
         if( req->bytes_written < req->request_length )
                 req->inpa = b_input_add( source,
-                                         req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
+                                         req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_WRITE,
                                          http_connected, req );
         else
-                req->inpa = b_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
+                req->inpa = b_input_add( source, B_EV_IO_READ, http_incoming_data, req );
         
         return FALSE;
@@ -234 +234 @@
         /* There will be more! */
         req->inpa = b_input_add( req->fd,
-                                 req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
+                                 req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_READ,
                                  http_incoming_data, req );
         

lib/proxy.c

@@ -91 +91 @@
                 b_event_remove(phb->inpa);
                 if( phb->proxy_func )
-                        phb->proxy_func(phb->proxy_data, -1, GAIM_INPUT_READ);
+                        phb->proxy_func(phb->proxy_data, -1, B_EV_IO_READ);
                 else {
-                        phb->func(phb->data, -1, GAIM_INPUT_READ);
+                        phb->func(phb->data, -1, B_EV_IO_READ);
                         g_free(phb);
                 }
@@ -102 +102 @@
         b_event_remove(phb->inpa);
         if( phb->proxy_func )
-                phb->proxy_func(phb->proxy_data, source, GAIM_INPUT_READ);
+                phb->proxy_func(phb->proxy_data, source, B_EV_IO_READ);
         else {
-                phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, source, B_EV_IO_READ);
                 g_free(phb);
         }
@@ -147 +147 @@
                 return -1;
         } else {
-                phb->inpa = b_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
+                phb->inpa = b_input_add(fd, B_EV_IO_WRITE, gaim_io_connected, phb);
                 phb->fd = fd;
                 
@@ -179 +179 @@
         if ((memcmp(HTTP_GOODSTRING, inputline, strlen(HTTP_GOODSTRING)) == 0) ||
             (memcmp(HTTP_GOODSTRING2, inputline, strlen(HTTP_GOODSTRING2)) == 0)) {
-                phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, source, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -186 +186 @@
 
         close(source);
-        phb->func(phb->data, -1, GAIM_INPUT_READ);
+        phb->func(phb->data, -1, B_EV_IO_READ);
         g_free(phb->host);
         g_free(phb);
@@ -204 +204 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -215 +215 @@
         if (send(source, cmd, strlen(cmd), 0) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -230 +230 @@
                 if (send(source, cmd, strlen(cmd), 0) < 0) {
                         close(source);
-                        phb->func(phb->data, -1, GAIM_INPUT_READ);
+                        phb->func(phb->data, -1, B_EV_IO_READ);
                         g_free(phb->host);
                         g_free(phb);
@@ -240 +240 @@
         if (send(source, cmd, strlen(cmd), 0) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, http_canread, phb);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, B_EV_IO_READ, http_canread, phb);
         
         return FALSE;
@@ -273 +273 @@
         memset(packet, 0, sizeof(packet));
         if (read(source, packet, 9) >= 4 && packet[1] == 90) {
-                phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, source, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -280 +280 @@
 
         close(source);
-        phb->func(phb->data, -1, GAIM_INPUT_READ);
+        phb->func(phb->data, -1, B_EV_IO_READ);
         g_free(phb->host);
         g_free(phb);
@@ -299 +299 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -309 +309 @@
         if (!(hp = gethostbyname(phb->host))) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -326 +326 @@
         if (write(source, packet, 9) != 9) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s4_canread, phb);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, B_EV_IO_READ, s4_canread, phb);
         
         return FALSE;
@@ -359 +359 @@
         if (read(source, buf, 10) < 10) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -366 +366 @@
         if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->func(phb->data, source, B_EV_IO_READ);
         g_free(phb->host);
         g_free(phb);
@@ -396 +396 @@
         if (write(source, buf, (5 + strlen(phb->host) + 2)) < (5 + strlen(phb->host) + 2)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -402 +402 @@
         }
 
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_canread_again, phb);
+        phb->inpa = b_input_add(source, B_EV_IO_READ, s5_canread_again, phb);
 }
 
@@ -414 +414 @@
         if (read(source, buf, 2) < 2) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -422 +422 @@
         if ((buf[0] != 0x01) || (buf[1] != 0x00)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -442 +442 @@
         if (read(source, buf, 2) < 2) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -450 +450 @@
         if ((buf[0] != 0x05) || (buf[1] == 0xff)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -465 +465 @@
                 if (write(source, buf, 3 + i + j) < 3 + i + j) {
                         close(source);
-                        phb->func(phb->data, -1, GAIM_INPUT_READ);
+                        phb->func(phb->data, -1, B_EV_IO_READ);
                         g_free(phb->host);
                         g_free(phb);
@@ -471 +471 @@
                 }
 
-                phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_readauth, phb);
+                phb->inpa = b_input_add(source, B_EV_IO_READ, s5_readauth, phb);
         } else {
                 s5_sendconnect(phb, source);
@@ -491 +491 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -513 +513 @@
         if (write(source, buf, i) < i) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_canread, phb);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, B_EV_IO_READ, s5_canread, phb);
         
         return FALSE;

lib/ssl_bogus.c

@@ -59 +59 @@
 b_input_condition ssl_getdirection( void *conn )
 {
-        return GAIM_INPUT_READ;
+        return B_EV_IO_READ;
 }
 

lib/ssl_client.h

@@ -71 +71 @@
 G_MODULE_EXPORT int ssl_getfd( void *conn );
 
-/* This function returns GAIM_INPUT_READ/WRITE. With SSL connections it's
+/* This function returns B_EV_IO_READ/WRITE. With SSL connections it's
    possible that something has to be read while actually were trying to
    write something (think about key exchange/refresh/etc). So when an

lib/ssl_gnutls.c

@@ -106 +106 @@
         struct scd *conn = data;
         
-        return ssl_connected( conn, conn->fd, GAIM_INPUT_WRITE );
+        return ssl_connected( conn, conn->fd, B_EV_IO_WRITE );
 }
 
@@ -244 +244 @@
 {
         return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?
-                GAIM_INPUT_WRITE : GAIM_INPUT_READ );
-}
+                B_EV_IO_WRITE : B_EV_IO_READ );
+}

lib/ssl_nss.c

@@ -193 +193 @@
 {
         /* Just in case someone calls us, let's return the most likely case: */
-        return GAIM_INPUT_READ;
+        return B_EV_IO_READ;
 }

lib/ssl_openssl.c

@@ -102 +102 @@
         struct scd *conn = data;
         
-        return ssl_connected( conn, conn->fd, GAIM_INPUT_WRITE );
+        return ssl_connected( conn, conn->fd, B_EV_IO_WRITE );
 }
 
@@ -270 +270 @@
 b_input_condition ssl_getdirection( void *conn )
 {
-        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );
-}
+        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? B_EV_IO_WRITE : B_EV_IO_READ );
+}

lib/ssl_sspi.c

@@ -275 +275 @@
 GaimInputCondition ssl_getdirection( void *conn )
 {
-        return GAIM_INPUT_WRITE; /* FIXME: or GAIM_INPUT_READ */
-}
+        return B_EV_IO_WRITE; /* FIXME: or B_EV_IO_READ */
+}

protocols/jabber/io.c

@@ -64 +64 @@
                    most cases it probably won't be necessary.) */
                 if( ( ret = jabber_write_queue( ic ) ) && jd->tx_len > 0 )
-                        jd->w_inpa = b_input_add( jd->fd, GAIM_INPUT_WRITE, jabber_write_callback, ic );
+                        jd->w_inpa = b_input_add( jd->fd, B_EV_IO_WRITE, jabber_write_callback, ic );
         }
         else
@@ -504 +504 @@
         
         if( jd->r_inpa <= 0 )
-                jd->r_inpa = b_input_add( jd->fd, GAIM_INPUT_READ, jabber_read_callback, ic );
+                jd->r_inpa = b_input_add( jd->fd, B_EV_IO_READ, jabber_read_callback, ic );
         
         greet = g_strdup_printf( "%s<stream:stream to=\"%s\" xmlns=\"jabber:client\" "

protocols/msn/ns.c

@@ -75 +75 @@
         if( msn_write( ic, s, strlen( s ) ) )
         {
-                ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
+                ic->inpa = b_input_add( md->fd, B_EV_IO_READ, msn_ns_callback, ic );
                 imcb_log( ic, "Connected to server, waiting for reply" );
         }

protocols/msn/sb.c

@@ -309 +309 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = b_input_add( sb->fd, B_EV_IO_READ, msn_sb_callback, sb );
         else
                 debug( "Error %d while connecting to switchboard server", 2 );

protocols/nogaim.c

@@ -116 +116 @@
 {
         GList *gl;
-        for (gl = protocols; gl; gl = gl->next) 
+        
+        for( gl = protocols; gl; gl = gl->next )
         {
                 struct prpl *proto = gl->data;
-                if(!g_strcasecmp(proto->name, name)) 
+                
+                if( g_strcasecmp( proto->name, name ) == 0 )
                         return proto;
         }
+        
         return NULL;
 }
@@ -132 +135 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
+        extern void purple_initmodule();
 
 #ifdef WITH_MSN
@@ -147 +151 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
+#endif
+        
+#ifdef WITH_PURPLE
+        purple_initmodule();
 #endif
 

protocols/nogaim.h

@@ -132 +132 @@
          * - The user sees this name ie. when imcb_log() is used. */
         const char *name;
+        void *data;
 
         /* Added this one to be able to add per-account settings, don't think

protocols/oscar/oscar.c

@@ -291 +291 @@
         odata = (struct oscar_data *)ic->proto_data;
 
-        if (condition & GAIM_INPUT_READ) {
+        if (condition & B_EV_IO_READ) {
                 if (aim_get_command(odata->sess, conn) >= 0) {
                         aim_rxdispatch(odata->sess);
@@ -363 +363 @@
 
         aim_conn_completeconnect(sess, conn);
-        ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(conn->fd, B_EV_IO_READ,
                         oscar_callback, conn);
         
@@ -489 +489 @@
 
         aim_conn_completeconnect(sess, bosconn);
-        ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(bosconn->fd, B_EV_IO_READ,
                         oscar_callback, bosconn);
         imcb_log(ic, _("Connection established, cookie sent"));
@@ -665 +665 @@
         if (pos->modname)
                 g_free(pos->modname);
-        pos->inpa = b_input_add(pos->fd, GAIM_INPUT_READ, damn_you, pos);
+        pos->inpa = b_input_add(pos->fd, B_EV_IO_READ, damn_you, pos);
         return FALSE;
 }
@@ -834 +834 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->cnpa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                         oscar_callback, tstconn);
         
@@ -862 +862 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->paspa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                 oscar_callback, tstconn);
         
@@ -898 +898 @@
         aim_conn_completeconnect(sess, ccon->conn);
         ccon->inpa = b_input_add(tstconn->fd,
-                        GAIM_INPUT_READ,
+                        B_EV_IO_READ,
                         oscar_callback, tstconn);
         odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);

protocols/yahoo/yahoo.c

@@ -681 +681 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, B_EV_IO_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -692 +692 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, B_EV_IO_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else

set.c

@@ -29 +29 @@
 char *SET_INVALID = "nee";
 
-set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
+set_t *set_add( set_t **head, const char *key, const char *def, set_eval eval, void *data )
 {
         set_t *s = set_find( head, key );
@@ -63 +63 @@
 }
 
-set_t *set_find( set_t **head, char *key )
+set_t *set_find( set_t **head, const char *key )
 {
         set_t *s = *head;
@@ -77 +77 @@
 }
 
-char *set_getstr( set_t **head, char *key )
+char *set_getstr( set_t **head, const char *key )
 {
         set_t *s = set_find( head, key );
@@ -87 +87 @@
 }
 
-int set_getint( set_t **head, char *key )
+int set_getint( set_t **head, const char *key )
 {
         char *s = set_getstr( head, key );
@@ -101 +101 @@
 }
 
-int set_getbool( set_t **head, char *key )
+int set_getbool( set_t **head, const char *key )
 {
         char *s = set_getstr( head, key );
@@ -111 +111 @@
 }
 
-int set_setstr( set_t **head, char *key, char *value )
+int set_setstr( set_t **head, const char *key, char *value )
 {
         set_t *s = set_find( head, key );
@@ -150 +150 @@
 }
 
-int set_setint( set_t **head, char *key, int value )
+int set_setint( set_t **head, const char *key, int value )
 {
         char s[24];     /* Not quite 128-bit clean eh? ;-) */
@@ -158 +158 @@
 }
 
-void set_del( set_t **head, char *key )
+void set_del( set_t **head, const char *key )
 {
         set_t *s = *head, *t = NULL;
@@ -182 +182 @@
 }
 
-int set_reset( set_t **head, char *key )
+int set_reset( set_t **head, const char *key )
 {
         set_t *s;
@@ -211 +211 @@
 {
         return is_bool( value ) ? value : SET_INVALID;
+}
+
+char *set_eval_list( set_t *set, char *value )
+{
+        GSList *options = set->eval_data, *opt;
+        
+        for( opt = options; opt; opt = opt->next )
+                if( strcmp( value, opt->data ) == 0 )
+                        return value;
+        
+        /* TODO: It'd be nice to show the user a list of allowed values,
+                 but we don't have enough context here to do that. May
+                 want to fix that. */
+        
+        return NULL;
 }
 

set.h

@@ -69 +69 @@
            set_setstr() should be able to free() the returned string! */
         set_eval eval;
+        void *eval_data;
         struct set *next;
 } set_t;
 
 /* Should be pretty clear. */
-set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data );
+set_t *set_add( set_t **head, const char *key, const char *def, set_eval eval, void *data );
 
 /* Returns the raw set_t. Might be useful sometimes. */
-set_t *set_find( set_t **head, char *key );
+set_t *set_find( set_t **head, const char *key );
 
 /* Returns a pointer to the string value of this setting. Don't modify the
    returned string, and don't free() it! */
-G_MODULE_EXPORT char *set_getstr( set_t **head, char *key );
+G_MODULE_EXPORT char *set_getstr( set_t **head, const char *key );
 
 /* Get an integer. In previous versions set_getint() was also used to read
    boolean values, but this SHOULD be done with set_getbool() now! */
-G_MODULE_EXPORT int set_getint( set_t **head, char *key );
-G_MODULE_EXPORT int set_getbool( set_t **head, char *key );
+G_MODULE_EXPORT int set_getint( set_t **head, const char *key );
+G_MODULE_EXPORT int set_getbool( set_t **head, const char *key );
 
 /* set_setstr() strdup()s the given value, so after using this function
    you can free() it, if you want. */
-int set_setstr( set_t **head, char *key, char *value );
-int set_setint( set_t **head, char *key, int value );
-void set_del( set_t **head, char *key );
-int set_reset( set_t **head, char *key );
+int set_setstr( set_t **head, const char *key, char *value );
+int set_setint( set_t **head, const char *key, int value );
+void set_del( set_t **head, const char *key );
+int set_reset( set_t **head, const char *key );
 
 /* Two very useful generic evaluators. */
 char *set_eval_int( set_t *set, char *value );
 char *set_eval_bool( set_t *set, char *value );
+
+/* Another more complicated one. */
+char *set_eval_list( set_t *set, char *value );
 
 /* Some not very generic evaluators that really shouldn't be here... */

unix.c

@@ -56 +56 @@
         
         log_init();
+        
         global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
@@ -62 +63 @@
         
         b_main_init();
-        nogaim_init();
         
         srand( time( NULL ) ^ getpid() );
+        
         global.helpfile = g_strdup( HELP_FILE );
+        if( help_init( &global.help, global.helpfile ) == NULL )
+                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
+
+        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
+        if( global.storage == NULL )
+        {
+                log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
+                return( 1 );
+        }
         
         if( global.conf->runmode == RUNMODE_INETD )
@@ -113 +123 @@
                         setuid( pw->pw_uid );
                 }
-        }
-
-        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
-        if( global.storage == NULL )
-        {
-                log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
-                return( 1 );
         }
         
@@ -139 +142 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &global.help, global.helpfile ) == NULL )
-                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
         b_main_run();