Changes in / [3f9440d:fef6116]

Files:

• Makefile (modified) (2 diffs)
• account.c (modified) (5 diffs)
• account.h (modified) (2 diffs)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (3 diffs)
• configure (modified) (7 diffs)
• doc/bitlbee.schema (added)
• ini.c (deleted)
• ini.h (deleted)
• irc.c (modified) (16 diffs)
• irc_commands.c (modified) (5 diffs)
• lib/Makefile (added)
• lib/base64.c (added)
• lib/base64.h (added)
• lib/events.h (added)
• lib/events_glib.c (added)
• lib/events_libevent.c (added)
• lib/http_client.c (added)
• lib/http_client.h (added)
• lib/ini.c (added)
• lib/ini.h (added)
• lib/md5.c (added)
• lib/md5.h (added)
• lib/misc.c (added)
• lib/misc.h (added)
• lib/proxy.c (added)
• lib/proxy.h (added)
• lib/rc4.c (added)
• lib/rc4.h (added)
• lib/sha.c (added)
• lib/sha.h (added)
• lib/ssl_bogus.c (added)
• lib/ssl_client.h (added)
• lib/ssl_gnutls.c (added)
• lib/ssl_nss.c (added)
• lib/ssl_openssl.c (added)
• lib/url.c (added)
• lib/url.h (added)
• nick.c (modified) (1 diff)
• protocols/Makefile (modified) (1 diff)
• protocols/events.h (deleted)
• protocols/events_glib.c (deleted)
• protocols/events_libevent.c (deleted)
• protocols/http_client.c (deleted)
• protocols/http_client.h (deleted)
• protocols/jabber/jabber.c (modified) (6 diffs)
• protocols/md5.c (deleted)
• protocols/md5.h (deleted)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (40 diffs)
• protocols/nogaim.h (modified) (6 diffs)
• protocols/oscar/oscar.c (modified) (7 diffs)
• protocols/proxy.c (deleted)
• protocols/proxy.h (deleted)
• protocols/sha.c (deleted)
• protocols/sha.h (deleted)
• protocols/ssl_bogus.c (deleted)
• protocols/ssl_client.h (deleted)
• protocols/ssl_gnutls.c (deleted)
• protocols/ssl_nss.c (deleted)
• protocols/ssl_openssl.c (deleted)
• protocols/yahoo/libyahoo2.c (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (3 diffs)
• query.c (modified) (2 diffs)
• root_commands.c (modified) (24 diffs)
• set.c (modified) (8 diffs)
• set.h (modified) (2 diffs)
• storage.c (modified) (4 diffs)
• storage.h (modified) (1 diff)
• storage_ldap.c (added)
• storage_text.c (modified) (1 diff)
• storage_xml.c (added)
• unix.c (modified) (2 diffs)
• url.c (deleted)
• url.h (deleted)
• user.c (modified) (2 diffs)
• util.c (deleted)
• util.h (deleted)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o unix.o url.o user.o util.o
+objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
-subdirs = protocols
+subdirs = protocols lib
 
 # Expansion of variables
@@ -42 +42 @@
 
 distclean: clean $(subdirs)
-        rm -f Makefile.settings config.h
+        rm -f Makefile.settings config.h bitlbee.pc
         find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
 

account.c

@@ -28 +28 @@
 #include "account.h"
 
+char *set_eval_account( set_t *set, char *value );
+
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
 {
         account_t *a;
+        set_t *s;
         
         if( irc->accounts )
         {
                 for( a = irc->accounts; a->next; a = a->next );
-                a = a->next = g_new0 ( account_t, 1 );
+                a = a->next = g_new0( account_t, 1 );
         }
         else
@@ -45 +48 @@
         a->user = g_strdup( user );
         a->pass = g_strdup( pass );
+        a->auto_connect = 1;
         a->irc = irc;
         
+        s = set_add( &a->set, "auto_connect", NULL, set_eval_account, a );
+        s->flags |= ACC_SET_NOSAVE;
+        
+        s = set_add( &a->set, "password", NULL, set_eval_account, a );
+        s->flags |= ACC_SET_NOSAVE;
+        
+        s = set_add( &a->set, "server", NULL, set_eval_account, a );
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &a->set, "username", NULL, set_eval_account, a );
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        set_setstr( &a->set, "username", user );
+        
         return( a );
+}
+
+char *set_eval_account( set_t *set, char *value )
+{
+        account_t *acc = set->data;
+        
+        /* Double-check: We refuse to edit on-line accounts. */
+        if( set->flags & ACC_SET_OFFLINE_ONLY && acc->gc )
+                return NULL;
+        
+        if( strcmp( set->key, "username" ) == 0 )
+        {
+                g_free( acc->user );
+                acc->user = g_strdup( value );
+                return value;
+        }
+        else if( strcmp( set->key, "password" ) == 0 )
+        {
+                g_free( acc->pass );
+                acc->pass = g_strdup( value );
+                return NULL;    /* password shouldn't be visible in plaintext! */
+        }
+        else if( strcmp( set->key, "server" ) == 0 )
+        {
+                g_free( acc->server );
+                if( *value )
+                        acc->server = g_strdup( value );
+                else
+                        acc->server = NULL;
+                return value;
+        }
+        else if( strcmp( set->key, "auto_connect" ) == 0 )
+        {
+                if( !is_bool( value ) )
+                        return NULL;
+                
+                acc->auto_connect = bool2int( value );
+                return value;
+        }
+        
+        return NULL;
 }
 
@@ -129 +187 @@
                         }
                         
+                        while( a->set )
+                                set_del( &a->set, a->set->key );
+                        
                         g_free( a->user );
                         g_free( a->pass );
@@ -142 +203 @@
 void account_on( irc_t *irc, account_t *a )
 {
-        struct aim_user *u;
-        
         if( a->gc )
         {
@@ -152 +211 @@
         cancel_auto_reconnect( a );
         
-        u = g_new0 ( struct aim_user, 1 );
-        u->irc = irc;
-        u->prpl = a->prpl;
-        strncpy( u->username, a->user, sizeof( u->username ) - 1 );
-        strncpy( u->password, a->pass, sizeof( u->password ) - 1 );
-        if( a->server) strncpy( u->proto_opt[0], a->server, sizeof( u->proto_opt[0] ) - 1 );
-        
-        a->gc = (struct gaim_connection *) u; /* Bit hackish :-/ */
         a->reconnect = 0;
-        
-        a->prpl->login( u );
+        a->prpl->login( a );
 }
 

account.h

@@ -34 +34 @@
         char *server;
         
+        int auto_connect;
         int reconnect;
+        
+        set_t *set;
         
         struct irc *irc;
@@ -47 +50 @@
 void account_off( irc_t *irc, account_t *a );
 
+#define ACC_SET_NOSAVE          1
+#define ACC_SET_OFFLINE_ONLY    2
+
 #endif

bitlbee.c

@@ -291 +291 @@
                         irc_t *irc;
                         
+                        /* Since we're fork()ing here, let's make sure we won't
+                           get the same random numbers as the parent/siblings. */
+                        srand( time( NULL ) ^ getpid() );
+                        
                         /* Close the listening socket, we're a client. */
                         close( global.listen_socket );

bitlbee.h

@@ -130 +130 @@
 #include "query.h"
 #include "sock.h"
-#include "util.h"
+#include "misc.h"
 #include "proxy.h"
 

conf.c

@@ -34 +34 @@
 #include "ipc.h"
 
-#include "protocols/proxy.h"
+#include "proxy.h"
 
 char *CONF_FILE;
@@ -55 +55 @@
         conf->nofork = 0;
         conf->verbose = 0;
-        conf->primary_storage = "text";
+        conf->primary_storage = "xml";
+        conf->migrate_storage = g_strsplit( "text", ",", -1 );
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
@@ -322 +323 @@
                 if( g_strcasecmp( ini->section, "defaults" ) == 0 )
                 {
-                        set_t *s = set_find( irc, ini->key );
+                        set_t *s = set_find( &irc->set, ini->key );
                         
                         if( s )

configure

@@ -31 +31 @@
 
 events=glib
+ldap=auto
 ssl=auto
 
@@ -66 +67 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
+
+--ldap=0/1/auto LDAP support                            $ldap
 
 --events=...    Event handler (glib, libevent)          $events
@@ -141 +144 @@
 fi
 
-echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
 
 if [ -n "$CC" ]; then
-        echo "CC=$CC" >> Makefile.settings;
+        CC=$CC
 elif type gcc > /dev/null 2> /dev/null; then
-        echo "CC=gcc" >> Makefile.settings;
+        CC=gcc
 elif type cc > /dev/null 2> /dev/null; then
-        echo "CC=cc" >> Makefile.settings;
+        CC=cc
 else
         echo 'Cannot find a C compiler, aborting.'
         exit 1;
 fi
+
+echo "CC=$CC" >> Makefile.settings;
 
 if [ -n "$LD" ]; then
@@ -232 +237 @@
 }
 
-if [ "$msn" = 1 -o "$jabber" = 1 ]; then
-        if [ "$ssl" = "auto" ]; then
-                detect_gnutls
-                if [ "$ret" = "0" ]; then
-                        detect_nss
-                fi;
-        elif [ "$ssl" = "gnutls" ]; then
-                detect_gnutls;
-        elif [ "$ssl" = "nss" ]; then
-                detect_nss;
-        elif [ "$ssl" = "openssl" ]; then
+detect_ldap()
+{
+        TMPFILE=`mktemp`
+        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
+                cat<<EOF>>Makefile.settings
+EFLAGS+=-lldap
+CFLAGS+=
+EOF
+                ldap=1
+                rm -f $TMPFILE
+                ret=1
+        else
+                ldap=0
+                ret=0
+        fi
+}
+
+if [ "$ssl" = "auto" ]; then
+        detect_gnutls
+        if [ "$ret" = "0" ]; then
+                detect_nss
+        fi
+elif [ "$ssl" = "gnutls" ]; then
+        detect_gnutls
+elif [ "$ssl" = "nss" ]; then
+        detect_nss
+elif [ "$ssl" = "openssl" ]; then
+        echo
+        echo 'No detection code exists for OpenSSL. Make sure that you have a complete'
+        echo 'install of OpenSSL (including devel/header files) before reporting'
+        echo 'compilation problems.'
+        echo
+        echo 'Also, keep in mind that the OpenSSL is, according to some people, not'
+        echo 'completely GPL-compatible. Using GnuTLS or NSS is recommended and better'
+        echo 'supported by us. However, on many BSD machines, OpenSSL can be considered'
+        echo 'part of the operating system, which makes it GPL-compatible.'
+        echo
+        echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2'
+        echo '                    http://www.gnome.org/~markmc/openssl-and-the-gpl.html'
+        echo
+        echo 'Please note that distributing a BitlBee binary which links to OpenSSL is'
+        echo 'probably illegal. If you want to create and distribute a binary BitlBee'
+        echo 'package, you really should use GnuTLS or NSS instead.'
+        echo
+        echo 'Also, the OpenSSL license requires us to say this:'
+        echo ' *    "This product includes software developed by the OpenSSL Project'
+        echo ' *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"'
+        
+        echo 'EFLAGS+=-lssl -lcrypto' >> Makefile.settings
+        
+        ret=1
+elif [ "$ssl" = "bogus" ]; then
+        echo
+        echo 'Using bogus SSL code. This means some features have to be disabled.'
+        
+        ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
+        if [ "$msn" = "1" ]; then
                 echo
-                echo 'No detection code exists for OpenSSL. Make sure that you have a complete'
-                echo 'install of OpenSSL (including devel/header files) before reporting'
-                echo 'compilation problems.'
-                echo
-                echo 'Also, keep in mind that the OpenSSL is, according to some people, not'
-                echo 'completely GPL-compatible. Using GnuTLS or NSS is recommended and better'
-                echo 'supported by us. However, on many BSD machines, OpenSSL can be considered'
-                echo 'part of the operating system, which makes it GPL-compatible.'
-                echo
-                echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2'
-                echo '                    http://www.gnome.org/~markmc/openssl-and-the-gpl.html'
-                echo
-                echo 'Please note that distributing a BitlBee binary which links to OpenSSL is'
-                echo 'probably illegal. If you want to create and distribute a binary BitlBee'
-                echo 'package, you really should use GnuTLS or NSS instead.'
-                echo
-                echo 'Also, the OpenSSL license requires us to say this:'
-                echo ' *    "This product includes software developed by the OpenSSL Project'
-                echo ' *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"'
-                
-                echo 'EFLAGS+=-lssl -lcrypto' >> Makefile.settings
-                
-                ret=1;
-        elif [ "$ssl" = "bogus" ]; then
-                echo
-                echo 'Using bogus SSL code. This will not make the MSN module work, but it will'
-                echo 'allow you to use the Jabber module - although without working SSL support.'
-                
-                ret=1;
-        else
-                echo
-                echo 'ERROR: Unknown SSL library specified.'
-                exit 1;
-        fi
-        
-        if [ "$ret" = "0" ]; then
-                echo
-                echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
-                echo '       This is necessary for MSN and full Jabber support. To continue,'
-                echo '       install a suitable SSL library or disable MSN support (--msn=0).'
-                echo '       If you want Jabber without SSL support you can try --ssl=bogus.'
-                
-                exit 1;
-        fi;
-        
-        echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
-fi
+                echo 'Real SSL support is necessary for MSN authentication, will build without'
+                echo 'MSN protocol support.'
+                msn=0
+        fi
+        
+        ret=1
+else
+        echo
+        echo 'ERROR: Unknown SSL library specified.'
+        exit 1
+fi
+
+if [ "$ret" = "0" ]; then
+        echo
+        echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
+        echo '       Please note that this script doesn'\''t have detection code for OpenSSL,'
+        echo '       so if you want to use that, you have to select it by hand. If you don'\''t'
+        echo '       need SSL support, you can select the "bogus" SSL library. (--ssl=bogus)'
+        
+        exit 1
+fi;
+
+echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
+
+STORAGES="text xml"
+
+if [ "$ldap" = "auto" ]; then
+        detect_ldap
+fi
+
+if [ "$ldap" = 0 ]; then
+        echo "#undef WITH_LDAP" >> config.h
+elif [ "$ldap" = 1 ]; then
+        echo "#define WITH_LDAP 1" >> config.h
+        STORAGES="$STORAGES ldap"
+fi
+
+for i in $STORAGES; do
+        STORAGE_OBJS="$STORAGE_OBJS storage_$i.o"
+done
+echo "STORAGE_OBJS="$STORAGE_OBJS >> Makefile.settings
 
 if [ "$strip" = 0 ]; then
@@ -304 +349 @@
         elif type strip > /dev/null 2> /dev/null; then
                 echo "STRIP=strip" >> Makefile.settings;
-        elif /bin/test -x /usr/ccs/bin/strip; then
-                echo "STRIP=/usr/ccs/bin/strip" >> Makefile.settings;
         else
                 echo
@@ -384 +427 @@
 if [ "$protocols" = "PROTOCOLS = " ]; then
         echo "WARNING: You haven't selected any communication protocol to compile!"
-        echo "         Bitlbee will run, but you will be unable to connect to IM servers!"
+        echo "         BitlBee will run, but you will be unable to connect to IM servers!"
 fi
 
@@ -419 +462 @@
 
 if [ "$debug" = "1" ]; then
-        echo '  Debugging enabled.';
-else
-        echo '  Debugging disabled.';
+        echo '  Debugging enabled.'
+else
+        echo '  Debugging disabled.'
 fi
 
 if [ "$strip" = "1" ]; then
-        echo '  Binary stripping enabled.';
-else
-        echo '  Binary stripping disabled.';
-fi
-
-echo '  Using event handler: '$events;
-echo '  Using SSL library: '$ssl;
-
-#if [ "$flood" = "0" ]; then
-#       echo '  Flood protection disabled.';
-#else
-#       echo '  Flood protection enabled.';
-#fi
+        echo '  Binary stripping enabled.'
+else
+        echo '  Binary stripping disabled.'
+fi
+
+echo '  Using event handler: '$events
+echo '  Using SSL library: '$ssl
+echo '  Building with these storage backends: '$STORAGES
 
 if [ -n "$protocols" ]; then
-        echo '  Building with these protocols:' $protocols;
-else
-        echo '  Building without IM-protocol support. We wish you a lot of fun...';
-fi
+        echo '  Building with these protocols:' $protocols
+else
+        echo '  Building without IM-protocol support. We wish you a lot of fun...'
+fi

irc.c

@@ -33 +33 @@
 GSList *irc_connection_list = NULL;
 
-static char *passchange (irc_t *irc, void *set, char *value) 
-{
-        irc_setpass (irc, value);
-        return (NULL);
+static char *passchange( irc_t *irc, void *set, char *value )
+{
+        irc_setpass( irc, value );
+        irc_usermsg( irc, "Password successfully changed" );
+        return NULL;
 }
 
@@ -120 +121 @@
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
-        set_add( irc, "away_devoice", "true",  set_eval_away_devoice );
-        set_add( irc, "auto_connect", "true", set_eval_bool );
-        set_add( irc, "auto_reconnect", "false", set_eval_bool );
-        set_add( irc, "auto_reconnect_delay", "300", set_eval_int );
-        set_add( irc, "buddy_sendbuffer", "false", set_eval_bool );
-        set_add( irc, "buddy_sendbuffer_delay", "200", set_eval_int );
-        set_add( irc, "charset", "iso8859-1", set_eval_charset );
-        set_add( irc, "debug", "false", set_eval_bool );
-        set_add( irc, "default_target", "root", NULL );
-        set_add( irc, "display_namechanges", "false", set_eval_bool );
-        set_add( irc, "handle_unknown", "root", NULL );
-        set_add( irc, "lcnicks", "true", set_eval_bool );
-        set_add( irc, "ops", "both", set_eval_ops );
-        set_add( irc, "private", "true", set_eval_bool );
-        set_add( irc, "query_order", "lifo", NULL );
-        set_add( irc, "save_on_quit", "true", set_eval_bool );
-        set_add( irc, "strip_html", "true", NULL );
-        set_add( irc, "to_char", ": ", set_eval_to_char );
-        set_add( irc, "typing_notice", "false", set_eval_bool );
-        set_add( irc, "password", NULL, passchange);
+        set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
+        set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
+        set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
+        set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_int, irc );
+        set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
+        set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
+        set_add( &irc->set, "charset", "iso8859-1", set_eval_charset, irc );
+        set_add( &irc->set, "debug", "false", set_eval_bool, irc );
+        set_add( &irc->set, "default_target", "root", NULL, irc );
+        set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
+        set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
+        set_add( &irc->set, "ops", "both", set_eval_ops, irc );
+        set_add( &irc->set, "password", NULL, passchange, irc );
+        set_add( &irc->set, "private", "true", set_eval_bool, irc );
+        set_add( &irc->set, "query_order", "lifo", NULL, irc );
+        set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        set_add( &irc->set, "strip_html", "true", NULL, irc );
+        set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
+        set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
         
         conf_loaddefaults( irc );
@@ -211 +212 @@
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        if( irc->status & USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getint( &irc->set, "save_on_quit" ) ) 
                 if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
@@ -329 +330 @@
 void irc_setpass (irc_t *irc, const char *pass) 
 {
-        if (irc->password) g_free (irc->password);
+        g_free (irc->password);
         
         if (pass) {
                 irc->password = g_strdup (pass);
-                irc_usermsg (irc, "Password successfully changed");
         } else {
                 irc->password = NULL;
@@ -364 +364 @@
                         }
                         
-                        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
                         {
                                 conv[IRC_MAX_LINE] = 0;
@@ -584 +584 @@
         
         strip_newlines( line );
-        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
         {
                 char conv[IRC_MAX_LINE+1];
@@ -666 +666 @@
                         }
                         
-                        if( u->gc && !u->away && set_getint( irc, "away_devoice" ) )
+                        if( u->gc && !u->away && set_getbool( &irc->set, "away_devoice" ) )
                                 strcat( namelist, "+" );
                         
@@ -676 +676 @@
         {
                 GList *l;
-                char *ops = set_getstr( irc, "ops" );
+                char *ops = set_getstr( &irc->set, "ops" );
                 
                 /* root and the user aren't in the channel userlist but should
@@ -924 +924 @@
 {
         char *nick, *s;
-        char reason[64];
+        char reason[128];
         
         if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
         {
-                if( u->gc->user->proto_opt[0][0] )
+                if( u->gc->acc->server )
                         g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
-                                    u->gc->user->proto_opt[0] );
+                                    u->gc->acc->server );
                 else if( ( s = strchr( u->gc->username, '@' ) ) )
                         g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
@@ -936 +936 @@
                 else
                         g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
-                                    u->gc->prpl->name, irc->myhost );
+                                    u->gc->acc->prpl->name, irc->myhost );
                 
                 /* proto_opt might contain garbage after the : */
@@ -1012 +1012 @@
                 else if( g_strncasecmp( s + 1, "TYPING", 6 ) == 0 )
                 {
-                        if( u && u->gc && u->gc->prpl->send_typing && strlen( s ) >= 10 )
+                        if( u && u->gc && u->gc->acc->prpl->send_typing && strlen( s ) >= 10 )
                         {
                                 time_t current_typing_notice = time( NULL );
@@ -1018 +1018 @@
                                 if( current_typing_notice - u->last_typing_notice >= 5 )
                                 {
-                                        u->gc->prpl->send_typing( u->gc, u->handle, s[8] == '1' );
+                                        u->gc->acc->prpl->send_typing( u->gc, u->handle, s[8] == '1' );
                                         u->last_typing_notice = current_typing_notice;
                                 }
@@ -1051 +1051 @@
                 }
         }
-        else if( c && c->gc && c->gc->prpl )
+        else if( c && c->gc && c->gc->acc && c->gc->acc->prpl )
         {
                 return( bim_chat_msg( c->gc, c->id, s ) );
@@ -1083 +1083 @@
         if( !u || !u->gc ) return;
         
-        if( set_getint( irc, "buddy_sendbuffer" ) && set_getint( irc, "buddy_sendbuffer_delay" ) > 0 )
+        if( set_getint( &irc->set, "buddy_sendbuffer" ) && set_getint( &irc->set, "buddy_sendbuffer_delay" ) > 0 )
         {
                 int delay;
@@ -1110 +1110 @@
                 strcat( u->sendbuf, "\n" );
                 
-                delay = set_getint( irc, "buddy_sendbuffer_delay" );
+                delay = set_getint( &irc->set, "buddy_sendbuffer_delay" );
                 if( delay <= 5 )
                         delay *= 1000;
@@ -1175 +1175 @@
                 int len = strlen( irc->nick) + 3;
                 prefix = g_new (char, len );
-                g_snprintf( prefix, len, "%s%s", irc->nick, set_getstr( irc, "to_char" ) );
+                g_snprintf( prefix, len, "%s%s", irc->nick, set_getstr( &irc->set, "to_char" ) );
                 prefix[len-1] = 0;
         }

irc_commands.c

@@ -150 +150 @@
                 irc_part( irc, u, c->channel );
                 
-                if( c->gc && c->gc->prpl )
+                if( c->gc )
                 {
                         c->joined = 0;
-                        c->gc->prpl->chat_leave( c->gc, c->id );
+                        c->gc->acc->prpl->chat_leave( c->gc, c->id );
                 }
         }
@@ -173 +173 @@
                         user_t *u = user_find( irc, cmd[1] + 1 );
                         
-                        if( u && u->gc && u->gc->prpl && u->gc->prpl->chat_open )
+                        if( u && u->gc && u->gc->acc->prpl->chat_open )
                         {
                                 irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] );
                                 
-                                if( !u->gc->prpl->chat_open( u->gc, u->handle ) )
+                                if( !u->gc->acc->prpl->chat_open( u->gc, u->handle ) )
                                 {
                                         irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick );
@@ -205 +205 @@
         
         if( u && c && ( u->gc == c->gc ) )
-                if( c->gc && c->gc->prpl && c->gc->prpl->chat_invite )
-                {
-                        c->gc->prpl->chat_invite( c->gc, c->id, "", u->handle );
+                if( c->gc && c->gc->acc->prpl->chat_invite )
+                {
+                        c->gc->acc->prpl->chat_invite( c->gc, c->id, "", u->handle );
                         irc_reply( irc, 341, "%s %s", nick, channel );
                         return;
@@ -230 +230 @@
                 {
                         unsigned int i;
-                        char *t = set_getstr( irc, "default_target" );
+                        char *t = set_getstr( &irc->set, "default_target" );
                         
                         if( g_strcasecmp( t, "last" ) == 0 && irc->last_target )
@@ -477 +477 @@
                 
                 if( u->gc )
-                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->user->username,
-                                   *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", u->gc->prpl->name );
+                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->acc->user,
+                                   *u->gc->acc->server ? u->gc->acc->server : "", u->gc->acc->prpl->name );
                 else
                         irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );

nick.c

@@ -86 +86 @@
                 
                 nick_strip( nick );
-                if (set_getint(irc, "lcnicks")) 
+                if( set_getint( &irc->set, "lcnicks" ) )
                         nick_lc( nick );
         }

protocols/Makefile

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

protocols/jabber/jabber.c

@@ -561 +561 @@
 static void gjab_start(gjconn gjc)
 {
-        struct aim_user *user;
+        account_t *acc;
         int port = -1, ssl = 0;
         char *server = NULL, *s;
@@ -568 +568 @@
                 return;
 
-        user = GJ_GC(gjc)->user;
-        if (*user->proto_opt[0]) {
+        acc = GJ_GC(gjc)->acc;
+        if (acc->server) {
                 /* If there's a dot, assume there's a hostname in the beginning */
-                if (strchr(user->proto_opt[0], '.')) {
-                        server = g_strdup(user->proto_opt[0]);
+                if (strchr(acc->server, '.')) {
+                        server = g_strdup(acc->server);
                         if ((s = strchr(server, ':')))
                                 *s = 0;
@@ -578 +578 @@
                 
                 /* After the hostname, there can be a port number */
-                s = strchr(user->proto_opt[0], ':');
+                s = strchr(acc->server, ':');
                 if (s && isdigit(s[1]))
                         sscanf(s + 1, "%d", &port);
                 
                 /* And if there's the string ssl, the user wants an SSL-connection */
-                if (strstr(user->proto_opt[0], ":ssl") || g_strcasecmp(user->proto_opt[0], "ssl") == 0)
+                if (strstr(acc->server, ":ssl") || g_strcasecmp(acc->server, "ssl") == 0)
                         ssl = 1;
         }
@@ -616 +616 @@
         g_free(server);
         
-        if (!user->gc || (gjc->fd < 0)) {
+        if (!acc->gc || (gjc->fd < 0)) {
                 STATE_EVT(JCONN_STATE_OFF)
                 return;
@@ -1516 +1516 @@
 }
 
-static void jabber_login(struct aim_user *user)
-{
-        struct gaim_connection *gc = new_gaim_conn(user);
+static void jabber_login(account_t *acc)
+{
+        struct gaim_connection *gc = new_gaim_conn(acc);
         struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1);
-        char *loginname = create_valid_jid(user->username, DEFAULT_SERVER, "BitlBee");
+        char *loginname = create_valid_jid(acc->user, DEFAULT_SERVER, "BitlBee");
 
         jd->hash = g_hash_table_new(g_str_hash, g_str_equal);
@@ -1527 +1527 @@
         set_login_progress(gc, 1, _("Connecting"));
 
-        if (!(jd->gjc = gjab_new(loginname, user->password, gc))) {
+        if (!(jd->gjc = gjab_new(loginname, acc->pass, gc))) {
                 g_free(loginname);
                 hide_login_progress(gc, _("Unable to connect"));

protocols/msn/msn.c

@@ -27 +27 @@
 #include "msn.h"
 
-static void msn_login( struct aim_user *acct )
-{
-        struct gaim_connection *gc = new_gaim_conn( acct );
+static void msn_login( account_t *acc )
+{
+        struct gaim_connection *gc = new_gaim_conn( acc );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
@@ -37 +37 @@
         md->fd = -1;
         
-        if( strchr( acct->username, '@' ) == NULL )
+        if( strchr( acc->user, '@' ) == NULL )
         {
                 hide_login_progress( gc, "Invalid account name" );

protocols/nogaim.c

@@ -145 +145 @@
 /* multi.c */
 
-struct gaim_connection *new_gaim_conn( struct aim_user *user )
+struct gaim_connection *new_gaim_conn( account_t *acc )
 {
         struct gaim_connection *gc;
-        account_t *a;
         
         gc = g_new0( struct gaim_connection, 1 );
         
-        gc->prpl = user->prpl;
-        g_snprintf( gc->username, sizeof( gc->username ), "%s", user->username );
-        g_snprintf( gc->password, sizeof( gc->password ), "%s", user->password );
-        /* [MD] BUGFIX: don't set gc->irc to the global IRC, but use the one from the struct aim_user.
-         * This fixes daemon mode breakage where IRC doesn't point to the currently active connection.
-         */
-        gc->irc = user->irc;
+        /* Maybe we should get rid of this memory waste later. ;-) */
+        g_snprintf( gc->username, sizeof( gc->username ), "%s", acc->user );
+        g_snprintf( gc->password, sizeof( gc->password ), "%s", acc->pass );
+        
+        gc->irc = acc->irc;
+        gc->acc = acc;
+        acc->gc = gc;
         
         connections = g_slist_append( connections, gc );
-        
-        user->gc = gc;
-        gc->user = user;
-        
-        // Find the account_t so we can set its gc pointer
-        for( a = gc->irc->accounts; a; a = a->next )
-                if( ( struct aim_user * ) a->gc == user )
-                {
-                        a->gc = gc;
-                        break;
-                }
         
         return( gc );
@@ -189 +177 @@
         
         connections = g_slist_remove( connections, gc );
-        g_free( gc->user );
         g_free( gc );
 }
@@ -220 +207 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
                 strip_html( text );
         
         /* Try to find a different connection on the same protocol. */
         for( a = gc->irc->accounts; a; a = a->next )
-                if( a->prpl == gc->prpl && a->gc != gc )
+                if( a->prpl == gc->acc->prpl && a->gc != gc )
                         break;
         
         /* If we found one, include the screenname in the message. */
         if( a )
-                irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, text );
+                irc_usermsg( gc->irc, "%s(%s) - %s", gc->acc->prpl->name, gc->username, text );
         else
-                irc_usermsg( gc->irc, "%s - %s", gc->prpl->name, text );
+                irc_usermsg( gc->irc, "%s - %s", gc->acc->prpl->name, text );
         
         g_free( text );
@@ -242 +229 @@
         struct gaim_connection *gc = d;
         
-        if( gc->prpl && gc->prpl->keepalive )
-                gc->prpl->keepalive( gc );
+        if( gc->acc->prpl->keepalive )
+                gc->acc->prpl->keepalive( gc );
         
         return TRUE;
@@ -297 +284 @@
         b_event_remove( gc->keepalive );
         gc->flags |= OPT_LOGGING_OUT;
+        
         gc->keepalive = 0;
-        gc->prpl->close( gc );
+        gc->acc->prpl->close( gc );
         b_event_remove( gc->inpa );
         
@@ -323 +311 @@
                 /* Uhm... This is very sick. */
         }
-        else if( !gc->wants_to_die && set_getint( irc, "auto_reconnect" ) )
-        {
-                int delay = set_getint( irc, "auto_reconnect_delay" );
+        else if( !gc->wants_to_die && set_getint( &irc->set, "auto_reconnect" ) )
+        {
+                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
                 
                 serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
@@ -364 +352 @@
         irc_t *irc = gc->irc;
         
-        if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */
+        if( set_getint( &irc->set, "debug" ) && 0 ) /* This message is too useless */
                 serv_got_crap( gc, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( gc, handle ) )
         {
-                if( set_getint( irc, "debug" ) )
+                if( set_getint( &irc->set, "debug" ) )
                         serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
@@ -378 +366 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
+        strcpy( nick, nick_get( gc->irc, handle, gc->acc->prpl, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -390 +378 @@
                 u->user = g_strndup( handle, s - handle );
         }
-        else if( gc->user->proto_opt[0] && *gc->user->proto_opt[0] )
+        else if( *gc->acc->server )
         {
                 char *colon;
                 
-                if( ( colon = strchr( gc->user->proto_opt[0], ':' ) ) )
-                        u->host = g_strndup( gc->user->proto_opt[0],
-                                             colon - gc->user->proto_opt[0] );
+                if( ( colon = strchr( gc->acc->server, ':' ) ) )
+                        u->host = g_strndup( gc->acc->server,
+                                             colon - gc->acc->server );
                 else
-                        u->host = g_strdup( gc->user->proto_opt[0] );
+                        u->host = g_strdup( gc->acc->server );
                 
                 u->user = g_strdup( handle );
@@ -409 +397 @@
         else
         {
-                u->host = g_strdup( gc->user->prpl->name );
+                u->host = g_strdup( gc->acc->prpl->name );
                 u->user = g_strdup( handle );
         }
@@ -457 +445 @@
                 u->realname = g_strdup( realname );
                 
-                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
+                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( &gc->irc->set, "display_namechanges" ) )
                         serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
@@ -479 +467 @@
 void show_got_added_yes( gpointer w, struct show_got_added_data *data )
 {
-        data->gc->prpl->add_buddy( data->gc, data->handle );
+        data->gc->acc->prpl->add_buddy( data->gc, data->handle );
         add_buddy( data->gc, NULL, data->handle, data->handle );
         
@@ -513 +501 @@
         if( !u )
         {
-                if( g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "add" ) == 0 )
+                if( g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "add" ) == 0 )
                 {
                         add_buddy( gc, NULL, handle, NULL );
@@ -520 +508 @@
                 else
                 {
-                        if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
+                        if( set_getint( &gc->irc->set, "debug" ) || g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "ignore" ) != 0 )
                         {
                                 serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
@@ -558 +546 @@
         }
         
-        if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
+        if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "oscar" ) == 0 || strcmp( gc->acc->prpl->name, "icq" ) == 0 ) )
         {
                 u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
+        else if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "jabber" ) == 0 ) )
         {
                 if( type & UC_DND )
@@ -571 +559 @@
                         u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && gc->prpl->get_status_string )
-        {
-                u->away = g_strdup( gc->prpl->get_status_string( gc, type ) );
+        else if( ( type & UC_UNAVAILABLE ) && gc->acc->prpl->get_status_string )
+        {
+                u->away = g_strdup( gc->acc->prpl->get_status_string( gc, type ) );
         }
         else
@@ -579 +567 @@
         
         /* LISPy... */
-        if( ( set_getint( gc->irc, "away_devoice" ) ) &&                /* Don't do a thing when user doesn't want it */
+        if( ( set_getint( &gc->irc->set, "away_devoice" ) ) &&          /* Don't do a thing when user doesn't want it */
             ( u->online ) &&                                            /* Don't touch offline people */
             ( ( ( u->online != oo ) && !u->away ) ||                    /* Voice joining people */
@@ -598 +586 @@
         if( !u )
         {
-                char *h = set_getstr( irc, "handle_unknown" );
+                char *h = set_getstr( &irc->set, "handle_unknown" );
                 
                 if( g_strcasecmp( h, "ignore" ) == 0 )
                 {
-                        if( set_getint( irc, "debug" ) )
+                        if( set_getint( &irc->set, "debug" ) )
                                 serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
@@ -609 +597 @@
                 else if( g_strncasecmp( h, "add", 3 ) == 0 )
                 {
-                        int private = set_getint( irc, "private" );
+                        int private = set_getint( &irc->set, "private" );
                         
                         if( h[3] )
@@ -630 +618 @@
         }
         
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -671 +659 @@
         user_t *u;
         
-        if( !set_getint( gc->irc, "typing_notice" ) )
+        if( !set_getint( &gc->irc->set, "typing_notice" ) )
                 return;
         
@@ -693 +681 @@
         GList *ir;
         
-        if( set_getint( gc->irc, "debug" ) )
+        if( set_getint( &gc->irc->set, "debug" ) )
                 serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
@@ -732 +720 @@
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if( g_strcasecmp( who, gc->user->username ) == 0 )
+        if( g_strcasecmp( who, gc->username ) == 0 )
                 return;
         
@@ -738 +726 @@
         for( c = gc->conversations; c && c->id != id; c = c->next );
         
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -772 +760 @@
         g_free( s );
         
-        if( set_getint( gc->irc, "debug" ) )
+        if( set_getint( &gc->irc->set, "debug" ) )
                 serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
@@ -786 +774 @@
         int me = 0;
         
-        if( set_getint( b->gc->irc, "debug" ) )
+        if( set_getint( &b->gc->irc->set, "debug" ) )
                 serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
         /* It might be yourself! */
-        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
+        if( b->gc->acc->prpl->cmp_buddynames( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -820 +808 @@
         int me = 0;
         
-        if( set_getint( b->gc->irc, "debug" ) )
+        if( set_getint( &b->gc->irc->set, "debug" ) )
                 serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
         
         /* It might be yourself! */
-        if( g_strcasecmp( handle, b->gc->user->username ) == 0 )
+        if( g_strcasecmp( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -882 +870 @@
 }
 
-char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value )
-{
+char *set_eval_away_devoice( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
         int st;
         
@@ -897 +886 @@
         /* Horror.... */
         
-        if( st != set_getint( irc, "away_devoice" ) )
+        if( st != set_getint( &irc->set, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -937 +926 @@
         }
         
-        return( set_eval_bool( irc, set, value ) );
+        return( set_eval_bool( set, value ) );
 }
 
@@ -957 +946 @@
         }
         
-        st = gc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
+        st = gc->acc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
         g_free( buf );
         
@@ -974 +963 @@
         }
         
-        st = gc->prpl->chat_send( gc, id, msg );
+        st = gc->acc->prpl->chat_send( gc, id, msg );
         g_free( buf );
         
@@ -988 +977 @@
         
         if( !away ) away = "";
-        ms = m = gc->prpl->away_states( gc );
+        ms = m = gc->acc->prpl->away_states( gc );
         
         while( m )
@@ -1009 +998 @@
         if( m )
         {
-                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
+                gc->acc->prpl->set_away( gc, m->data, *away ? away : NULL );
         }
         else
@@ -1016 +1005 @@
                 if( s )
                 {
-                        gc->prpl->set_away( gc, s, away );
-                        if( set_getint( gc->irc, "debug" ) )
+                        gc->acc->prpl->set_away( gc, s, away );
+                        if( set_getint( &gc->irc->set, "debug" ) )
                                 serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
-                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
+                        gc->acc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
         }
         
@@ -1073 +1062 @@
 void bim_add_allow( struct gaim_connection *gc, char *handle )
 {
-        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
         }
         
-        gc->prpl->add_permit( gc, handle );
+        gc->acc->prpl->add_permit( gc, handle );
 }
 
@@ -1085 +1074 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1091 +1080 @@
         }
         
-        gc->prpl->rem_permit( gc, handle );
+        gc->acc->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 )
+        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
         }
         
-        gc->prpl->add_deny( gc, handle );
+        gc->acc->prpl->add_deny( gc, handle );
 }
 
@@ -1108 +1097 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1114 +1103 @@
         }
         
-        gc->prpl->rem_deny( gc, handle );
-}
+        gc->acc->prpl->rem_deny( gc, handle );
+}

protocols/nogaim.h

@@ -39 +39 @@
 
 #include "bitlbee.h"
+#include "account.h"
 #include "proxy.h"
 #include "md5.h"
@@ -63 +64 @@
 struct gaim_connection
 {
-        struct prpl *prpl;
+        account_t *acc;
         guint32 flags;
         
@@ -78 +79 @@
         GSList *deny;
         int permdeny;
-        
-        struct aim_user *user;
         
         char username[64];
@@ -126 +125 @@
 };
 
-struct aim_user {
-        char username[64];
-        char alias[SELF_ALIAS_LEN]; 
-        char password[32];
-        char user_info[2048];
-        int options;
-        struct prpl *prpl;
-        /* prpls can use this to save information about the user,
-         * like which server to connect to, etc */
-        char proto_opt[7][256];
-
-        struct gaim_connection *gc;
-        irc_t *irc;
-};
-
 struct prpl {
         int options;
         const char *name;
 
-        void (* login)          (struct aim_user *);
+        void (* login)          (account_t *);
         void (* keepalive)      (struct gaim_connection *);
         void (* close)          (struct gaim_connection *);
@@ -206 +190 @@
 
 void nogaim_init();
-char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
+char *set_eval_away_devoice( set_t *set, char *value );
 
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
@@ -212 +196 @@
 
 /* multi.c */
-G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( struct aim_user *user );
+G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( account_t *acc );
 G_MODULE_EXPORT void destroy_gaim_conn( struct gaim_connection *gc );
 G_MODULE_EXPORT void set_login_progress( struct gaim_connection *gc, int step, char *msg );

protocols/oscar/oscar.c

@@ -356 +356 @@
 }
 
-static void oscar_login(struct aim_user *user) {
+static void oscar_login(account_t *acc) {
         aim_session_t *sess;
         aim_conn_t *conn;
         char buf[256];
-        struct gaim_connection *gc = new_gaim_conn(user);
+        struct gaim_connection *gc = new_gaim_conn(acc);
         struct oscar_data *odata = gc->proto_data = g_new0(struct oscar_data, 1);
 
-        if (isdigit(*user->username)) {
+        if (isdigit(acc->user[0])) {
                 odata->icq = TRUE;
                 /* This is odd but it's necessary for a proper do_import and do_export.
                    We don't do those anymore, but let's stick with it, just in case
-                   it accidentally fixes something else too... */
+                   it accidentally fixes something else too... </bitlbee> */
                 gc->password[8] = 0;
         } else {
@@ -390 +390 @@
         }
         
-        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.",user->proto_opt[USEROPT_AUTH]);
+        if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
+            g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
         }
         
@@ -402 +402 @@
 
         conn->status |= AIM_CONN_STATUS_INPROGRESS;
-        conn->fd = proxy_connect(user->proto_opt[USEROPT_AUTH][0] ?
-                                        user->proto_opt[USEROPT_AUTH] : AIM_DEFAULT_LOGIN_SERVER,
-                                 user->proto_opt[USEROPT_AUTHPORT][0] ?
-                                        atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
-                                 oscar_login_connect, gc);
+        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, gc);
         if (conn->fd < 0) {
                 hide_login_progress(gc, _("Couldn't connect to host"));
@@ -485 +481 @@
         struct aim_authresp_info *info;
         int i; char *host; int port;
-        struct aim_user *user;
         aim_conn_t *bosconn;
 
         struct gaim_connection *gc = sess->aux_data;
         struct oscar_data *od = gc->proto_data;
-        user = gc->user;
-        port = user->proto_opt[USEROPT_AUTHPORT][0] ?
-                atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
+        port = AIM_LOGIN_PORT;
 
         va_start(ap, fr);
@@ -871 +864 @@
         struct aim_redirect_data *redir;
         struct gaim_connection *gc = sess->aux_data;
-        struct aim_user *user = gc->user;
         aim_conn_t *tstconn;
         int i;
@@ -877 +869 @@
         int port;
 
-        port = user->proto_opt[USEROPT_AUTHPORT][0] ?
-                atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
-
         va_start(ap, fr);
         redir = va_arg(ap, struct aim_redirect_data *);
         va_end(ap);
 
+        port = AIM_LOGIN_PORT;
         for (i = 0; i < (int)strlen(redir->ip); i++) {
                 if (redir->ip[i] == ':') {
@@ -1723 +1713 @@
         odata->rights.maxsiglen = odata->rights.maxawaymsglen = (guint)maxsiglen;
 
+        /* FIXME: It seems we're not really using this, and it broke now that
+           struct aim_user is dead.
         aim_bos_setprofile(sess, fr->conn, gc->user->user_info, NULL, gaim_caps);
-
+        */
+        
         return 1;
 }

protocols/yahoo/libyahoo2.c

@@ -89 +89 @@
 #define vsnprintf _vsnprintf
 #endif
+
+#include "base64.h"
 
 #ifdef USE_STRUCT_CALLBACKS
@@ -695 +697 @@
 }
 
-static char base64digits[] =    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                "abcdefghijklmnopqrstuvwxyz"
-                                "0123456789._";
+/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 static void to_y64(unsigned char *out, const unsigned char *in, int inlen)
-/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
-{
-        for (; inlen >= 3; inlen -= 3)
-                {
-                        *out++ = base64digits[in[0] >> 2];
-                        *out++ = base64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-                        *out++ = base64digits[((in[1]<<2) & 0x3c) | (in[2]>>6)];
-                        *out++ = base64digits[in[2] & 0x3f];
-                        in += 3;
-                }
-        if (inlen > 0)
-                {
-                        unsigned char fragment;
-
-                        *out++ = base64digits[in[0] >> 2];
-                        fragment = (in[0] << 4) & 0x30;
-                        if (inlen > 1)
-                                fragment |= in[1] >> 4;
-                        *out++ = base64digits[fragment];
-                        *out++ = (inlen < 2) ? '-' 
-                                        : base64digits[(in[1] << 2) & 0x3c];
-                        *out++ = '-';
-                }
-        *out = '\0';
+{
+        base64_encode_real(in, inlen, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-");
 }
 

protocols/yahoo/yahoo.c

@@ -121 +121 @@
 }
 
-static void byahoo_login( struct aim_user *user )
-{
-        struct gaim_connection *gc = new_gaim_conn( user );
+static void byahoo_login( account_t *acc )
+{
+        struct gaim_connection *gc = new_gaim_conn( acc );
         struct byahoo_data *yd = gc->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -130 +130 @@
         
         set_login_progress( gc, 1, "Connecting" );
-        yd->y2_id = yahoo_init( user->username, user->password );
+        yd->y2_id = yahoo_init( acc->user, acc->pass );
         yahoo_login( yd->y2_id, yd->current_status );
 }
@@ -425 +425 @@
                 yd = gc->proto_data;
                 
-                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
+                if( strcmp( gc->acc->prpl->name, "yahoo" ) == 0 && yd->y2_id == id )
                         return( gc );
         }

query.c

@@ -63 +63 @@
         }
         
-        if( g_strcasecmp( set_getstr( irc, "query_order" ), "lifo" ) == 0 || irc->queries == q )
+        if( g_strcasecmp( set_getstr( &irc->set, "query_order" ), "lifo" ) == 0 || irc->queries == q )
                 query_display( irc, q );
         
@@ -172 +172 @@
         query_t *q;
         
-        if( g_strcasecmp( set_getstr( irc, "query_order" ), "fifo" ) == 0 )
+        if( g_strcasecmp( set_getstr( &irc->set, "query_order" ), "fifo" ) == 0 )
                 q = irc->queries;
         else

root_commands.c

@@ -127 +127 @@
 }
 
+static void cmd_account( irc_t *irc, char **cmd );
+
 static void cmd_identify( irc_t *irc, char **cmd )
 {
         storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+        char *account_on[] = { "account", "on", NULL };
         
         switch (status) {
@@ -139 +142 @@
                 break;
         case STORAGE_OK:
-                irc_usermsg( irc, "Password accepted" );
+                irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
                 irc_umode_set( irc, "+R", 1 );
+                if( set_getint( &irc->set, "auto_connect" ) )
+                        cmd_account( irc, account_on );
                 break;
+        case STORAGE_OTHER_ERROR:
         default:
-                irc_usermsg( irc, "Something very weird happened" );
+                irc_usermsg( irc, "Unknown error while loading configuration" );
                 break;
         }
@@ -226 +232 @@
 
                 a = account_add( irc, prpl, cmd[3], cmd[4] );
-                
                 if( cmd[5] )
-                        a->server = g_strdup( cmd[5] );
+                        set_setstr( &a->set, "server", cmd[5] );
                 
                 irc_usermsg( irc, "Account successfully added" );
@@ -306 +311 @@
                         
                                 for( a = irc->accounts; a; a = a->next )
-                                        if( !a->gc )
+                                        if( !a->gc && a->auto_connect )
                                                 account_on( irc, a );
                         } 
@@ -352 +357 @@
                 }
         }
+        else if( g_strcasecmp( cmd[1], "set" ) == 0 )
+        {
+                char *acc_handle, *set_name = NULL, *tmp;
+                
+                if( !cmd[2] )
+                {
+                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
+                        return;
+                }
+                
+                acc_handle = g_strdup( cmd[2] );
+                if( ( tmp = strchr( acc_handle, '/' ) ) )
+                {
+                        *tmp = 0;
+                        set_name = tmp + 1;
+                }
+                a = account_get( irc, acc_handle );
+                
+                if( a == NULL )
+                {
+                        irc_usermsg( irc, "Invalid account" );
+                        return;
+                }
+                
+                if( cmd[3] )
+                {
+                        set_t *s = set_find( &a->set, set_name );
+                        
+                        if( a->gc && s && s->flags & ACC_SET_OFFLINE_ONLY )
+                        {
+                                irc_usermsg( irc, "This setting can only be changed when the account is off-line" );
+                                return;
+                        }
+                        
+                        set_setstr( &a->set, set_name, cmd[3] );
+                        
+                        if( ( strcmp( cmd[3], "=" ) ) == 0 && cmd[4] )
+                                irc_usermsg( irc, "Warning: Correct syntax: \002account set <variable> <value>\002 (without =)" );
+                }
+                if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
+                {
+                        char *s = set_getstr( &a->set, set_name );
+                        if( s )
+                                irc_usermsg( irc, "%s = `%s'", set_name, s );
+                        else
+                                irc_usermsg( irc, "%s is empty", set_name );
+                }
+                else
+                {
+                        set_t *s = a->set;
+                        while( s )
+                        {
+                                if( s->value || s->def )
+                                        irc_usermsg( irc, "%s = `%s'", s->key, s->value?s->value:s->def );
+                                else
+                                        irc_usermsg( irc, "%s is empty", s->key );
+                                s = s->next;
+                        }
+                }
+                
+                g_free( acc_handle );
+        }
         else
         {
@@ -394 +461 @@
                 else
                 {
-                        nick_set( irc, cmd[2], a->gc->prpl, cmd[3] );
+                        nick_set( irc, cmd[2], a->gc->acc->prpl, cmd[3] );
                 }
         }
@@ -401 +468 @@
            add them to your *real* (server-side) contact list. */
         if( add_for_real )
-                a->gc->prpl->add_buddy( a->gc, cmd[2] );
+                a->gc->acc->prpl->add_buddy( a->gc, cmd[2] );
                 
         add_buddy( a->gc, NULL, cmd[2], cmd[2] );
@@ -435 +502 @@
         }
         
-        if( !gc->prpl->get_info )
+        if( !gc->acc->prpl->get_info )
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -441 +508 @@
         else
         {
-                gc->prpl->get_info( gc, cmd[2] );
+                gc->acc->prpl->get_info( gc, cmd[2] );
         }
 }
@@ -476 +543 @@
                 else if( u->send_handler == buddy_send_handler )
                 {
-                        nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
+                        nick_set( irc, u->handle, u->gc->acc->prpl, cmd[2] );
                 }
                 
@@ -495 +562 @@
         s = g_strdup( u->handle );
         
-        u->gc->prpl->remove_buddy( u->gc, u->handle, NULL );
+        u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
         user_del( irc, cmd[1] );
         nick_del( irc, cmd[1] );
@@ -552 +619 @@
         }
         
-        if( !gc->prpl->add_deny || !gc->prpl->rem_permit )
+        if( !gc->acc->prpl->add_deny || !gc->acc->prpl->rem_permit )
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -611 +678 @@
         }
         
-        if( !gc->prpl->rem_deny || !gc->prpl->add_permit )
+        if( !gc->acc->prpl->rem_deny || !gc->acc->prpl->add_permit )
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -666 +733 @@
         if( cmd[1] && cmd[2] )
         {
-                set_setstr( irc, cmd[1], cmd[2] );
+                set_setstr( &irc->set, cmd[1], cmd[2] );
                 
                 if( ( strcmp( cmd[2], "=" ) ) == 0 && cmd[3] )
@@ -673 +740 @@
         if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */
         {
-                char *s = set_getstr( irc, cmd[1] );
+                char *s = set_getstr( &irc->set, cmd[1] );
                 if( s )
                         irc_usermsg( irc, "%s = `%s'", cmd[1], s );
+                else
+                        irc_usermsg( irc, "%s is empty", cmd[1] );
         }
         else
@@ -684 +753 @@
                         if( s->value || s->def )
                                 irc_usermsg( irc, "%s = `%s'", s->key, s->value?s->value:s->def );
+                        else
+                                irc_usermsg( irc, "%s is empty", s->key );
                         s = s->next;
                 }
@@ -727 +798 @@
                 if( online == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
                         irc_usermsg( irc, format, u->nick, s, "Online" );
                 }
@@ -738 +809 @@
                 if( away == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
                         irc_usermsg( irc, format, u->nick, s, u->away );
                 }
@@ -748 +819 @@
                 if( offline == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
                         irc_usermsg( irc, format, u->nick, s, "Offline" );
                 }
@@ -773 +844 @@
                 irc_usermsg( irc, "Your name is `%s'" , a->gc->displayname ? a->gc->displayname : "NULL" );
         }
-        else if ( !a->gc->prpl->set_info ) 
+        else if ( !a->prpl->set_info ) 
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -781 +852 @@
                 irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
                 
-                a->gc->prpl->set_info( a->gc, cmd[2] );
+                a->prpl->set_info( a->gc, cmd[2] );
         }
 }
@@ -800 +871 @@
         for( num = 0; q; q = q->next, num ++ )
                 if( q->gc ) /* Not necessary yet, but it might come later */
-                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->prpl->name, q->gc->username, q->question );
+                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->acc->prpl->name, q->gc->username, q->question );
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
@@ -828 +899 @@
                         user_t *u;
                         
+                        /* FIXME: Hmmm, this is actually pretty dangerous code... REMOVEME? :-) */
                         for( u = irc->users; u; u = u->next )
                                 if( u->gc == gc )
                                 {
-                                        u->gc->prpl->remove_buddy( u->gc, u->handle, NULL );
+                                        u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
                                         user_del( irc, u->nick );
                                 }
@@ -846 +918 @@
         for( n = gc->irc->nicks; n; n = n->next )
         {
-                if( n->proto == gc->prpl && !user_findhandle( gc, n->handle ) )
-                {
-                        gc->prpl->add_buddy( gc, n->handle );
+                if( n->proto == gc->acc->prpl && !user_findhandle( gc, n->handle ) )
+                {
+                        gc->acc->prpl->add_buddy( gc, n->handle );
                         add_buddy( gc, NULL, n->handle, NULL );
                 }

set.c

@@ -26 +26 @@
 #include "bitlbee.h"
 
-set_t *set_add( irc_t *irc, char *key, char *def, void *eval )
-{
-        set_t *s = set_find( irc, key );
-        
-        if( !s )
-        {
-                if( ( s = irc->set ) )
+set_t *set_add( set_t **head, char *key, char *def, void *eval, void *data )
+{
+        set_t *s = set_find( head, key );
+        
+        /* Possibly the setting already exists. If it doesn't exist yet,
+           we create it. If it does, we'll just change the default. */
+        if( !s )
+        {
+                if( ( s = *head ) )
                 {
                         while( s->next ) s = s->next;
-                        s->next = g_new ( set_t, 1 );
+                        s->next = g_new0( set_t, 1 );
                         s = s->next;
                 }
                 else
                 {
-                        s = irc->set = g_new( set_t, 1 );
+                        s = *head = g_new0( set_t, 1 );
                 }
-                memset( s, 0, sizeof( set_t ) );
                 s->key = g_strdup( key );
         }
@@ -53 +54 @@
         if( def ) s->def = g_strdup( def );
         
-        if( s->eval )
-        {
-                g_free( s->eval );
-                s->eval = NULL;
-        }
-        if( eval ) s->eval = eval;
-        
-        return( s );
-}
-
-set_t *set_find( irc_t *irc, char *key )
-{
-        set_t *s = irc->set;
+        s->eval = eval;
+        s->data = data;
+        
+        return s;
+}
+
+set_t *set_find( set_t **head, char *key )
+{
+        set_t *s = *head;
         
         while( s )
@@ -74 +71 @@
         }
         
-        return( s );
-}
-
-char *set_getstr( irc_t *irc, char *key )
-{
-        set_t *s = set_find( irc, key );
+        return s;
+}
+
+char *set_getstr( set_t **head, char *key )
+{
+        set_t *s = set_find( head, key );
         
         if( !s || ( !s->value && !s->def ) )
-                return( NULL );
-        
-        return( s->value?s->value:s->def );
-}
-
-int set_getint( irc_t *irc, char *key )
-{
-        char *s = set_getstr( irc, key );
+                return NULL;
+        
+        return s->value ? s->value : s->def;
+}
+
+int set_getint( set_t **head, char *key )
+{
+        char *s = set_getstr( head, key );
         int i = 0;
         
         if( !s )
-                return( 0 );
+                return 0;
         
         if( ( g_strcasecmp( s, "true" ) == 0 ) || ( g_strcasecmp( s, "yes" ) == 0 ) || ( g_strcasecmp( s, "on" ) == 0 ) )
-                return( 1 );
+                return 1;
         
         if( sscanf( s, "%d", &i ) != 1 )
-                return( 0 );
-        
-        return( i );
-}
-
-int set_setstr( irc_t *irc, char *key, char *value )
-{
-        set_t *s = set_find( irc, key );
+                return 0;
+        
+        return i;
+}
+
+int set_getbool( set_t **head, char *key )
+{
+        char *s = set_getstr( head, key );
+        
+        if( !s )
+                return 0;
+        
+        return bool2int( s );
+}
+
+int set_setstr( set_t **head, char *key, char *value )
+{
+        set_t *s = set_find( head, key );
         char *nv = value;
         
         if( !s )
-                s = set_add( irc, key, NULL, NULL );
-        
-        if( s->eval && !( nv = s->eval( irc, s, value ) ) )
-                return( 0 );
+                s = set_add( head, key, NULL, NULL, NULL );
+        
+        if( s->eval && !( nv = s->eval( s, value ) ) )
+                return 0;
         
         if( s->value )
@@ -121 +128 @@
         }
         
+        /* If there's a default setting and it's equal to what we're trying to
+           set, stick with s->value = NULL. Otherwise, remember the setting. */
         if( !s->def || ( strcmp( nv, s->def ) != 0 ) )
                 s->value = g_strdup( nv );
@@ -127 +136 @@
                 g_free( nv );
         
-        return( 1 );
-}
-
-int set_setint( irc_t *irc, char *key, int value )
+        return 1;
+}
+
+int set_setint( set_t **head, char *key, int value )
 {
         char s[24];     /* Not quite 128-bit clean eh? ;-) */
         
-        sprintf( s, "%d", value );
-        return( set_setstr( irc, key, s ) );
-}
-
-void set_del( irc_t *irc, char *key )
-{
-        set_t *s = irc->set, *t = NULL;
+        g_snprintf( s, sizeof( s ), "%d", value );
+        return set_setstr( head, key, s );
+}
+
+void set_del( set_t **head, char *key )
+{
+        set_t *s = *head, *t = NULL;
         
         while( s )
@@ -153 +162 @@
                         t->next = s->next;
                 else
-                        irc->set = s->next;
+                        *head = s->next;
                 
                 g_free( s->key );
@@ -162 +171 @@
 }
 
-char *set_eval_int( irc_t *irc, set_t *set, char *value )
-{
-        char *s = value;
-        
-        for( ; *s; s ++ )
-                if( *s < '0' || *s > '9' )
-                        return( NULL );
-        
-        return( value );
-}
-
-char *set_eval_bool( irc_t *irc, set_t *set, char *value )
-{
-        if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) )
-                return( value );
-        if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) )
-                return( value );
-        return( set_eval_int( irc, set, value ) );
-}
-
-char *set_eval_to_char( irc_t *irc, set_t *set, char *value )
+char *set_eval_int( set_t *set, char *value )
+{
+        char *s;
+        
+        for( s = value; *s; s ++ )
+                if( !isdigit( *s ) )
+                        return NULL;
+        
+        return value;
+}
+
+char *set_eval_bool( set_t *set, char *value )
+{
+        return is_bool( value ) ? value : NULL;
+}
+
+char *set_eval_to_char( set_t *set, char *value )
 {
         char *s = g_new( char, 3 );
@@ -191 +196 @@
                 sprintf( s, "%c ", *value );
         
-        return( s );
-}
-
-char *set_eval_ops( irc_t *irc, set_t *set, char *value )
-{
+        return s;
+}
+
+char *set_eval_ops( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        
         if( g_strcasecmp( value, "user" ) == 0 )
-        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "+o-o", irc->nick, irc->mynick );
-                return( value );
-        }
         else if( g_strcasecmp( value, "root" ) == 0 )
-        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "-o+o", irc->nick, irc->mynick );
-                return( value );
-        }
         else if( g_strcasecmp( value, "both" ) == 0 )
-        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "+oo", irc->nick, irc->mynick );
-                return( value );
-        }
         else if( g_strcasecmp( value, "none" ) == 0 )
-        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "-oo", irc->nick, irc->mynick );
-                return( value );
-        }
-        
-        return( NULL );
-}
-
+        else
+                return NULL;
+        
+        return value;
+}
+
+char *set_eval_charset( set_t *set, char *value )
+{
+        GIConv cd;
+
+        if ( g_strncasecmp( value, "none", 4 ) == 0 )
+                return value;
+
+        cd = g_iconv_open( "UTF-8", value );
+        if( cd == (GIConv) -1 )
+                return NULL;
+
+        g_iconv_close( cd );
+        return value;
+}

set.h

@@ -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                *
   \********************************************************************/
 
@@ -26 +26 @@
 typedef struct set
 {
+        void *data;
+        
         char *key;
         char *value;
         char *def;      /* Default */
         
-        /* Eval: Returns NULL if the value is incorrect. Can return a
-           corrected value. set_setstr() should be able to free() the
-           returned string! */
-        char *(*eval) ( irc_t *irc, struct set *set, char *value );
+        int flags;
+        
+        /* Eval: Returns NULL if the value is incorrect or exactly the
+           passed value variable. When returning a corrected value,
+           set_setstr() should be able to free() the returned string! */
+        char *(*eval) ( struct set *set, char *value );
         struct set *next;
 } set_t;
 
-set_t *set_add( irc_t *irc, char *key, char *def, void *eval );
-G_MODULE_EXPORT set_t *set_find( irc_t *irc, char *key );
-G_MODULE_EXPORT char *set_getstr( irc_t *irc, char *key );
-G_MODULE_EXPORT int set_getint( irc_t *irc, char *key );
-int set_setstr( irc_t *irc, char *key, char *value );
-int set_setint( irc_t *irc, char *key, int value );
-void set_del( irc_t *irc, char *key );
+set_t *set_add( set_t **head, char *key, char *def, void *eval, void *data );
+set_t *set_find( set_t **head, char *key );
+G_MODULE_EXPORT char *set_getstr( set_t **head, char *key );
+G_MODULE_EXPORT int set_getint( set_t **head, char *key );
+G_MODULE_EXPORT int set_getbool( set_t **head, char *key );
+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 );
 
-char *set_eval_int( irc_t *irc, set_t *set, char *value );
-char *set_eval_bool( irc_t *irc, set_t *set, char *value );
-char *set_eval_to_char( irc_t *irc, set_t *set, char *value );
-char *set_eval_ops( irc_t *irc, set_t *set, char *value );
+char *set_eval_int( set_t *set, char *value );
+char *set_eval_bool( set_t *set, char *value );
 
-
+char *set_eval_to_char( set_t *set, char *value );
+char *set_eval_ops( set_t *set, char *value );
+char *set_eval_charset( set_t *set, char *value );

storage.c

@@ -6 +6 @@
 
 /* Support for multiple storage backends */
+
+/* Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org> */
 
 /*
@@ -29 +31 @@
 
 extern storage_t storage_text;
+extern storage_t storage_xml;
 
-static GList text_entry = { &storage_text, NULL, NULL };
-static GList *storage_backends = &text_entry;
+static GList *storage_backends = NULL;
 
 void register_storage_backend(storage_t *backend)
@@ -41 +43 @@
 {
         GList *gl;
-        storage_t *st;
+        storage_t *st = NULL;
 
         for (gl = storage_backends; gl; gl = gl->next) {
@@ -63 +65 @@
         int i;
         storage_t *storage;
-
+        
+        register_storage_backend(&storage_text);
+        register_storage_backend(&storage_xml);
+        
         storage = storage_init_single(primary);
         if (storage == NULL)

storage.h

@@ -33 +33 @@
         STORAGE_ALREADY_EXISTS,
         STORAGE_OTHER_ERROR /* Error that isn't caused by user input, such as 
-                                                   a database that is unreachable. log() will be 
-                                                   used for the exact error message */
+                               a database that is unreachable. log() will be 
+                               used for the exact error message */
 } storage_status_t;
 

storage_text.c

@@ -116 +116 @@
         }
         fclose( fp );
-        
-        if( set_getint( irc, "auto_connect" ) )
-        {
-                strcpy( s, "account on" );      /* Can't do this directly because r_c_s alters the string */
-                root_command_string( irc, ru, s, 0 );
-        }
         
         return STORAGE_OK;

unix.c

@@ -48 +48 @@
         
         b_main_init();
-        
         log_init();
-
         nogaim_init();
-
+        
+        srand( time( NULL ) ^ getpid() );
+        
         CONF_FILE = g_strdup( CONF_FILE_DEF );
-        
         global.helpfile = g_strdup( HELP_FILE );
-
+        
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
                 return( 1 );
-
-
+        
         if( global.conf->runmode == RUNMODE_INETD )
         {
@@ -89 +87 @@
         if( i != 0 )
                 return( i );
-
+        
         global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
         if ( global.storage == NULL) {

user.c

@@ -67 +67 @@
         
         u->user = u->realname = u->host = u->nick = g_strdup( nick );
-        u->is_private = set_getint( irc, "private" );
+        u->is_private = set_getint( &irc->set, "private" );
         
         key = g_strdup( nick );
@@ -147 +147 @@
         while( u )
         {
-                if( u->gc == gc && u->handle && gc->prpl->cmp_buddynames ( u->handle, handle ) == 0 )
+                if( u->gc == gc && u->handle && gc->acc->prpl->cmp_buddynames ( u->handle, handle ) == 0 )
                         break;
                 u = u->next;