Changes in / [ba7d16f:51a799e]

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (8 diffs)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (2 diffs)
• configure (modified) (8 diffs)
• dcc.c (modified) (8 diffs)
• debian/bitlbee.init (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/rules (modified) (3 diffs)
• doc/CHANGES (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (9 diffs)
• help.c (modified) (2 diffs)
• help.h (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• irc.c (modified) (8 diffs)
• irc_commands.c (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• 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/misc.c (modified) (2 diffs)
• lib/misc.h (modified) (1 diff)
• lib/oauth.c (added)
• lib/oauth.h (added)
• 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)
• lib/url.c (modified) (1 diff)
• lib/url.h (modified) (1 diff)
• lib/xmltree.c (modified) (3 diffs)
• log.c (modified) (1 diff)
• protocols/jabber/conference.c (modified) (1 diff)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/jabber/message.c (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (7 diffs)
• protocols/msn/invitation.c (modified) (6 diffs)
• protocols/msn/msn.c (modified) (4 diffs)
• protocols/msn/msn.h (modified) (5 diffs)
• protocols/msn/msn_util.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (8 diffs)
• protocols/msn/sb.c (modified) (9 diffs)
• protocols/nogaim.c (modified) (14 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• protocols/oscar/oscar.c (modified) (10 diffs)
• protocols/purple/Makefile (added)
• protocols/purple/ft-direct.c (added)
• protocols/purple/ft.c (added)
• protocols/purple/purple.c (added)
• protocols/twitter/Makefile (added)
• protocols/twitter/twitter.c (added)
• protocols/twitter/twitter.h (added)
• protocols/twitter/twitter_http.c (added)
• protocols/twitter/twitter_http.h (added)
• protocols/twitter/twitter_lib.c (added)
• protocols/twitter/twitter_lib.h (added)
• protocols/yahoo/yahoo.c (modified) (4 diffs)
• set.c (modified) (10 diffs)
• set.h (modified) (1 diff)
• storage_xml.c (modified) (1 diff)
• unix.c (modified) (6 diffs)

Makefile

@@ -126 +126 @@
 ctags: 
         ctags `find . -name "*.c"` `find . -name "*.h"`
+
+# Using this as a bogus Make target to test if a GNU-compatible version of
+# make is available.
+helloworld:
+        @echo Hello World

bitlbee.c

@@ -36 +36 @@
 static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition condition );
 
+static gboolean try_listen( struct addrinfo *res )
+{
+        int i;
+        
+        global.listen_socket = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
+        if( global.listen_socket < 0 )
+        {
+                log_error( "socket" );
+                return FALSE;
+        }
+
+#ifdef IPV6_V6ONLY              
+        if( res->ai_family == AF_INET6 )
+        {
+                i = 0;
+                setsockopt( global.listen_socket, IPPROTO_IPV6, IPV6_V6ONLY,
+                            (char *) &i, sizeof( i ) );
+        }
+#endif
+
+        /* TIME_WAIT (?) sucks.. */
+        i = 1;
+        setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
+
+        i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
+        if( i == -1 )
+        {
+                closesocket( global.listen_socket );
+                global.listen_socket = -1;
+                
+                log_error( "bind" );
+                return FALSE;
+        }
+        
+        return TRUE;
+}
+
 int bitlbee_daemon_init()
 {
@@ -42 +79 @@
         FILE *fp;
         
-        log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-        log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+        log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+        log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
         
         memset( &hints, 0, sizeof( hints ) );
@@ -63 +100 @@
 
         global.listen_socket = -1;
-
+        
+        /* Try IPv6 first (which will become an IPv6+IPv4 socket). */
         for( res = addrinfo_bind; res; res = res->ai_next )
-        {
-                global.listen_socket = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
-                if( global.listen_socket < 0 )
-                        continue;
-
-                /* TIME_WAIT (?) sucks.. */
-                i = 1;
-                setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
-
-                i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
-                if( i == -1 )
-                {
-                        log_error( "bind" );
-                        return( -1 );
-                }
-
-                break;
-        }
-
+                if( res->ai_family == AF_INET6 && try_listen( res ) )
+                        break;
+        
+        /* The rest (so IPv4, I guess). */
+        if( res == NULL )
+                for( res = addrinfo_bind; res; res = res->ai_next )
+                        if( res->ai_family != AF_INET6 && try_listen( res ) )
+                                break;
+        
         freeaddrinfo( addrinfo_bind );
 
@@ -93 +121 @@
         }
         
-        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
@@ -107 +135 @@
                         exit( 0 );
                 
+                setsid();
                 chdir( "/" );
                 
@@ -137 +166 @@
 #endif
         
+        if( !global.conf->nofork )
+        {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+        }
+        
         return( 0 );
 }
@@ -286 +321 @@
                         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 +349 @@
                         /* 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] );

bitlbee.h

@@ -35 +35 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.5"
+#define BITLBEE_VERSION "1.2.6a"
 #define VERSION BITLBEE_VERSION
+#define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#define BITLBEE_VERSION_CODE BITLBEE_VER(1, 2, 6)
 
 #define MAX_STRING 511

conf.c

@@ -82 +82 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:V" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -148 +148 @@
                                 "  -d  Specify alternative user configuration directory\n"
                                 "  -x  Command-line interface to password encryption/hashing\n"
-                                "  -h  Show this help page.\n" );
+                                "  -h  Show this help page.\n"
+                                "  -V  Show version info.\n" );
+                        return NULL;
+                }
+                else if( opt == 'V' )
+                {
+                        printf( "BitlBee %s\nAPI version %06x\n",
+                                BITLBEE_VERSION, BITLBEE_VERSION_CODE );
                         return NULL;
                 }

configure

@@ -26 +26 @@
 oscar=1
 yahoo=1
+twitter=1
+purple=1
 
 debug=0
@@ -66 +68 @@
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
+--twitter=0/1 Disable/enable Twitter part               $twitter
+
+--purple=0/1    Disable/enable libpurple support        $purple
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -267 +272 @@
 detect_ldap()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -295 +300 @@
 detect_resolv_dynamic()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         ret=1
         echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
@@ -309 +314 @@
 detect_resolv_static()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         ret=1
         for i in $systemlibdirs; do
@@ -476 +481 @@
 fi
 
+if ! make helloworld > /dev/null 2>&1; then
+        echo "WARNING: Your version of make (BSD make?) does not support BitlBee's makefiles."
+        echo "BitlBee needs GNU make to build properly. On most systems GNU make is available"
+        echo "under the name 'gmake'."
+        echo
+        if gmake helloworld > /dev/null 2>&1; then
+                echo "gmake seems to be available on your machine, great."
+                echo
+        else
+                echo "gmake is not installed (or not working). Please try to install it."
+                echo
+        fi
+fi
+
 cat <<EOF>bitlbee.pc
 prefix=$prefix
@@ -492 +511 @@
 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
+        twitter=0
+        
+        if [ "$events" = "libevent" ]; then
+                echo
+                echo 'Warning: Some libpurple modules (including msn-pecan) do their event handling'
+                echo 'outside libpurple, talking to GLib directly. At least for now the combination'
+                echo 'libpurple + libevent is *not* recommended!'
+        fi
+fi
+
 if [ "$msn" = 0 ]; then
         echo '#undef WITH_MSN' >> config.h
@@ -524 +575 @@
 fi
 
+if [ "$twitter" = 0 ]; then
+        echo '#undef WITH_TWITTER' >> config.h
+else
+        echo '#define WITH_TWITTER' >> config.h
+        protocols=$protocols'twitter '
+        protoobjs=$protoobjs'twitter_mod.o '
+fi
+
 if [ "$protocols" = "PROTOCOLS = " ]; then
         echo "Warning: You haven't selected any communication protocol to compile!"

dcc.c

@@ -154 +154 @@
 
         /* watch */
-        df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_send_proto, df );
+        df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_send_proto, df );
 
         df->ic->irc->file_transfers = g_slist_prepend( df->ic->irc->file_transfers, file );
@@ -267 +267 @@
         file_transfer_t *file = df->ft;
         
-        if( ( cond & GAIM_INPUT_READ ) &&
+        if( ( cond & B_EV_IO_READ ) &&
             ( file->status & FT_STATUS_LISTENING ) )
         {       
@@ -287 +287 @@
 
                 /* reschedule for reading on new fd */
-                df->watch_in = b_input_add( fd, GAIM_INPUT_READ, dccs_send_proto, df );
+                df->watch_in = b_input_add( fd, B_EV_IO_READ, dccs_send_proto, df );
 
                 return FALSE;
         }
 
-        if( cond & GAIM_INPUT_READ ) 
+        if( cond & B_EV_IO_READ ) 
         {
                 int ret;
@@ -364 +364 @@
 
         /* watch */
-        df->watch_out = b_input_add( df->fd, GAIM_INPUT_WRITE, dccs_recv_proto, df );
+        df->watch_out = b_input_add( df->fd, B_EV_IO_WRITE, dccs_recv_proto, df );
         ft->write_request = dccs_recv_write_request;
 
@@ -377 +377 @@
         file_transfer_t *ft = df->ft;
 
-        if( ( cond & GAIM_INPUT_WRITE ) &&
+        if( ( cond & B_EV_IO_WRITE ) &&
             ( ft->status & FT_STATUS_CONNECTING ) )
         {
                 ft->status = FT_STATUS_TRANSFERRING;
 
-                //df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );
+                //df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_recv_proto, df );
 
                 df->watch_out = 0;
@@ -388 +388 @@
         }
 
-        if( cond & GAIM_INPUT_READ )
+        if( cond & B_EV_IO_READ )
         {
                 int ret, done;
@@ -445 +445 @@
                 return dcc_abort( df, "BUG: write_request() called while watching" );
 
-        df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );
+        df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_recv_proto, df );
 
         return TRUE;
@@ -488 +488 @@
 
         if( df->bytes_sent < df->ft->file_size )
-                df->watch_out = b_input_add( df->fd, GAIM_INPUT_WRITE, dccs_send_can_write, df );
+                df->watch_out = b_input_add( df->fd, B_EV_IO_WRITE, dccs_send_can_write, df );
 
         return TRUE;

debian/bitlbee.init

@@ -38 +38 @@
 d_start() {
         # Make sure BitlBee can actually write its PID...
-        touch /var/run/bitlbee.pid
-        chown bitlbee: /var/run/bitlbee.pid
+        touch $PIDFILE
+        chown bitlbee: $PIDFILE
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \

debian/changelog

@@ +1 @@
+bitlbee (1.2.6a-1) unstable; urgency=low
+
+  * New upstream version.
+  * Native support for Twitter.
+  * Fixed /WHOIS response format. (Closes: #576120)
+  * Problems with bitlbee-skype are solved by now. (Closes: #575572)
+
+ -- Wilmer van der Gaast <wilmer@peer.gaast.net>  Tue, 20 Apr 2010 00:34:51 +0200
+
 bitlbee (1.2.5-1) unstable; urgency=low
 

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.8.0
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf, libpurple-dev
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/

debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
 
+BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
 
@@ -14 +15 @@
 build-arch-stamp:
         [ -d debian ]
-        ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent
+        ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE)
 #       $(MAKE) -C doc/ all
@@ -99 +100 @@
                 find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
 
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
+        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0
 
         dpkg --build debian/bitlbee-dev ..

doc/CHANGES

@@ -3 +3 @@
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+
+Version 1.2.6a:
+- Fixed a typo that renders the Twitter groupchat mode unusable. A last-
+  minute change that came a few minutes late.
+
+Finished 19 Apr 2010
+
+Version 1.2.6:
+- Native (very basic) support for Twitter, implemented by Geert Mulders.
+  Currently supported are posting tweets, reading the ones of people you
+  follow, and sending (not yet receiving!) direct messages.
+- Fixed format of status messages in /WHOIS to improve IRC client
+  compatibility.
+- Show timestamps of offline messages/channel backlogs.
+- Allow saving MSN display names locally since sometimes this stuff breaks
+  server-side. (Use the local_display_name per-account setting.)
+- Suppress empty "Headline:" messages for certain new XMPP broadcast 
+  messages.
+- Better handling of XMPP contacts with multiple resources on-line. Default
+  behaviour now is to write to wherever the last message came from, or to
+  the bare JID (usually becomes a broadcast) if there wasn't any recent msg.
+- Added a switchboard_keepalives setting which should solve some issues with
+  talking to offline MSN contacts. (Although full support for offline
+  messages is not ready yet!)
+- The usual misc. bug fixes.
+
+Finished 19 Apr 2010
 
 Version 1.2.5:
@@ -23 +50 @@
   the main client).
 
-Fixed 17 Mar 2010
+Finished 17 Mar 2010
 
 Version 1.2.4:

doc/user-guide/commands.xml

@@ -21 +21 @@
                         <description>
                                 <para>
-                                        Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ) and Yahoo. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
+                                        Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ), Yahoo and Twitter. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
                                 </para>
                         </description>
@@ -63 +63 @@
                                 </ircexample>
                         </bitlbee-command>
+                        
+                        <bitlbee-command name="twitter">
+                                <syntax>account add twitter &lt;handle&gt; &lt;password&gt;</syntax>
+
+                                <description>
+                                        <para>
+                                                This module gives you simple access to Twitter. Although it uses the Twitter API, only Twitter itself is supported at the moment.
+                                        </para>
+                                        
+                                        <para>
+                                                By default all your Twitter contacts will come from a contact called twitter_(yourusername). You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
+                                        </para>
+                                        
+                                        <para>
+                                                To send tweets yourself, send them to the twitter_(yourusername) contact, or just write in the groupchat channel if you enabled that option.
+                                        </para>
+
+                                        <para>
+                                                Since Twitter now requires OAuth authentication, you should not enter your Twitter password into BitlBee. Just type a bogus password. The first time you log in, BitlBee will start OAuth authentication. (See <emphasis>help set oauth</emphasis>.)
+                                        </para>
+                                </description>
+                        </bitlbee-command>
 
                         <bitlbee-command name="yahoo">
@@ -401 +423 @@
 
         <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
-                <default>false</default>
+                <default>true</default>
 
                 <description>
@@ -556 +578 @@
                         <para>
                                 With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name".
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="display_timestamps" type="boolean" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                When incoming messages are old (i.e. offline messages and channel backlogs), BitlBee will prepend them with a timestamp. If you find them ugly or useless, you can use this setting to hide them.
                         </para>
                 </description>
@@ -609 +641 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="local_display_name" type="boolean" scope="account">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Mostly meant to work around a bug in MSN servers (forgetting the display name set by the user), this setting tells BitlBee to store your display name locally and set this name on the MSN servers when connecting.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="mail_notifications" type="boolean" scope="account">
                 <default>false</default>
@@ -615 +658 @@
                         <para>
                                 Some protocols (MSN, Yahoo!) can notify via IM about new e-mail. Since most people use their Hotmail/Yahoo! addresses as a spam-box, this is disabled default. If you want these notifications, you can enable this setting.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
+        <bitlbee-setting name="message_length" type="integer" scope="account">
+                <default>140</default>
+
+                <description>
+                        <para>
+                                Since Twitter rejects messages longer than 140 characters, BitlBee can count message length and emit a warning instead of waiting for Twitter to reject it.
+                        </para>
+
+                        <para>
+                                You can change this limit here but this won't disable length checks on Twitter's side. You can also set it to 0 to disable the check in case you believe BitlBee doesn't count the characters correctly.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
+        <bitlbee-setting name="mode" type="string" scope="account">
+                <possible-values>one, many, chat</possible-values>
+                <default>one</default>
+
+                <description>
+                        <para>
+                                By default, everything from the Twitter module will come from one nick, twitter_(yourusername). If you prefer to have individual nicks for everyone, you can set this setting to "many" instead.
+                        </para>
+                        
+                        <para>
+                                If you prefer to have all your Twitter things in a separate channel, you can set this setting to "chat".
+                        </para>
+                        
+                        <para>
+                                In the last two modes, you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
                         </para>
                 </description>
@@ -644 +722 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="oauth" type="boolean" scope="account">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                This enables OAuth authentication for Twitter accounts. From June 2010 this will be mandatory.
+                        </para>
+
+                        <para>
+                                With OAuth enabled, you shouldn't tell BitlBee your Twitter password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with Twitter. If this succeeds, Twitter will return a PIN code which you can give back to BitlBee to finish the process.
+                        </para>
+
+                        <para>
+                                The resulting access token will be saved permanently, so you have to do this only once.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="ops" type="string" scope="global">
                 <default>both</default>
@@ -779 +876 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="show_offline" type="boolean" scope="global">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                If enabled causes BitlBee to also show offline users in Channel. Online-users will get op, away-users voice and offline users none of both. This option takes effect as soon as you reconnect.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="simulate_netsplit" type="boolean" scope="global">
                 <default>true</default>
@@ -824 +931 @@
                         <para>
                                 If BitlBee fails to detect this sometimes (most likely in AIM messages over an ICQ connection), you can set this setting to <emphasis>always</emphasis>, but this might sometimes accidentally strip non-HTML things too.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="switchboard_keepalives" type="boolean" scope="account">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Turn on this flag if you have difficulties talking to offline/invisible contacts.
+                        </para>
+                        
+                        <para>
+                                With this setting enabled, BitlBee will send keepalives to MSN switchboards with offline/invisible contacts every twenty seconds. This should keep the server and client on the other side from shutting it down.
+                        </para>
+                        
+                        <para>
+                                This is useful because BitlBee doesn't support MSN offline messages yet and the MSN servers won't let the user reopen switchboards to offline users. Once offline messaging is supported, this flag might be removed.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="timezone" type="string" scope="global">
+                <default>local</default>
+                <possible-values>local, utc, gmt, timezone-spec</possible-values>
+
+                <description>
+                        <para>
+                                If message timestamps are available for offline messages or chatroom backlogs, BitlBee will display them as part of the message. By default it will use the local timezone. If you're not in the same timezone as the BitlBee server, you can adjust the timestamps using this setting.
+                        </para>
+
+                        <para>
+                                Values local/utc/gmt should be self-explanatory. timezone-spec is a time offset in hours:minutes, for example: -8 for Pacific Standard Time, +2 for Central European Summer Time, +5:30 for Indian Standard Time.
                         </para>
                 </description>

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

@@ -52 +52 @@
 {
         irc_t *irc = set->data;
+        char *test;
+        gsize test_bytes = 0;
         GIConv ic, oc;
 
@@ -57 +59 @@
                 value = g_strdup( "utf-8" );
 
+        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
+        {
+                return NULL;
+        }
+        
+        /* Do a test iconv to see if the user picked an IRC-compatible
+           charset (for example utf-16 goes *horribly* wrong). */
+        if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL ||
+            test_bytes > 1 )
+        {
+                g_free( test );
+                g_iconv_close( oc );
+                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
+                                  "only supports 8-bit character sets." );
+                return NULL;
+        }
+        g_free( test );
+        
         if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
         {
-                return NULL;
-        }
-        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
-        {
-                g_iconv_close( ic );
+                g_iconv_close( oc );
                 return NULL;
         }
@@ -109 +125 @@
         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;
@@ -175 +191 @@
         s = set_add( &irc->set, "default_target", "root", NULL, irc );
         s = set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "display_timestamps", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "handle_unknown", "root", NULL, irc );
         s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
@@ -184 +201 @@
         s = set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc );
         s = set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "show_offline", "false", set_eval_bool, irc );
         s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "status", NULL,  set_eval_away_status, irc );
         s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "strip_html", "true", NULL, irc );
+        s = set_add( &irc->set, "timezone", "local", set_eval_timezone, irc );
         s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
         s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
@@ -195 +214 @@
         /* Evaluator sets the iconv/oconv structures. */
         set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
+        
+        nogaim_init();
         
         return( irc );
@@ -677 +698 @@
                    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 +727 @@
                 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;

irc_commands.c

@@ -498 +498 @@
                         irc_reply( irc, 301, "%s :%s", u->nick, u->away );
                 if( u->status_msg )
-                        irc_reply( irc, 333, "%s :Status: %s", u->nick, u->status_msg );
+                        irc_reply( irc, 320, "%s :%s", u->nick, u->status_msg );
                 
                 irc_reply( irc, 318, "%s :End of /WHOIS list", nick );

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ftutil.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall

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/misc.c

@@ -77 +77 @@
         
         return mktime(&tm);
+}
+
+time_t mktime_utc( struct tm *tp )
+{
+        struct tm utc;
+        time_t res, tres;
+        
+        tp->tm_isdst = -1;
+        res = mktime( tp );
+        /* Problem is, mktime() just gave us the GMT timestamp for the
+           given local time... While the given time WAS NOT local. So
+           we should fix this now.
+           
+           Now I could choose between messing with environment variables
+           (kludgy) or using timegm() (not portable)... Or doing the
+           following, which I actually prefer...
+           
+           tzset() may also work but in other places I actually want to
+           use local time.
+           
+           FFFFFFFFFFFFFFFFFFFFFUUUUUUUUUUUUUUUUUUUU!! */
+        gmtime_r( &res, &utc );
+        utc.tm_isdst = -1;
+        if( utc.tm_hour == tp->tm_hour && utc.tm_min == tp->tm_min )
+                /* Sweet! We're in UTC right now... */
+                return res;
+        
+        tres = mktime( &utc );
+        res += res - tres;
+        
+        /* Yes, this is a hack. And it will go wrong around DST changes.
+           BUT this is more likely to be threadsafe than messing with
+           environment variables, and possibly more portable... */
+        
+        return res;
 }
 
@@ -271 +306 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                /* if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' ) */
-                if( !isalnum( t[i] ) )
+                if( !isalnum( t[i] ) && !strchr( "._-~", t[i] ) )
                 {
                         sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );

lib/misc.h

@@ -43 +43 @@
 
 G_MODULE_EXPORT time_t get_time( int year, int month, int day, int hour, int min, int sec );
+G_MODULE_EXPORT time_t mktime_utc( struct tm *tp );
 double gettime( void );
 

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 */
+}

lib/url.c

@@ -27 +27 @@
 
 /* Convert an URL to a url_t structure */
-int url_set( url_t *url, char *set_url )
+int url_set( url_t *url, const char *set_url )
 {
         char s[MAX_STRING+1];

lib/url.h

@@ -42 +42 @@
 } url_t;
 
-int url_set( url_t *url, char *set_url );
+int url_set( url_t *url, const char *set_url );

lib/xmltree.c

@@ -449 +449 @@
         while( node )
         {
-                if( g_strcasecmp( node->name, name ) == 0 )
+                char *colon;
+                
+                if( g_strcasecmp( node->name, name ) == 0 ||
+                    ( ( colon = strchr( node->name, ':' ) ) &&
+                      g_strcasecmp( colon + 1, name ) == 0 ) )
                         break;
                 
@@ -461 +465 @@
 {
         int i;
+        char *colon;
         
         if( !node )
@@ -468 +473 @@
                 if( g_strcasecmp( node->attr[i].key, key ) == 0 )
                         break;
+        
+        /* This is an awful hack that only takes care of namespace prefixes
+           inside a tag. Since IMHO excessive namespace usage in XMPP is
+           massive overkill anyway (this code exists for almost four years
+           now and never really missed it): Meh. */
+        if( !node->attr[i].key && strcmp( key, "xmlns" ) == 0 &&
+            ( colon = strchr( node->name, ':' ) ) )
+        {
+                *colon = '\0';
+                for( i = 0; node->attr[i].key; i ++ )
+                        if( strncmp( node->attr[i].key, "xmlns:", 6 ) == 0 &&
+                            strcmp( node->attr[i].key + 6, node->name ) == 0 )
+                                break;
+                *colon = ':';
+        }
         
         return node->attr[i].value;

log.c

@@ -172 +172 @@
                 fprintf(stdout, "Debug: %s\n", message);
 #endif
+        /* Always log stuff in syslogs too. */
+        log_syslog(level, message);
         return;
 }

protocols/jabber/conference.c

@@ -272 +272 @@
                 }
                 
-                if( bud != jc->me )
-                {
+                if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
+                {
+                        /* If JIDs are anonymized, add them to the local
+                           list for the duration of this chat. */
                         imcb_add_buddy( ic, bud->ext_jid, NULL );
                         imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );

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/jabber/jabber_util.c

@@ -671 +671 @@
 time_t jabber_get_timestamp( struct xt_node *xt )
 {
-        struct tm tp, utc;
         struct xt_node *c;
-        time_t res, tres;
         char *s = NULL;
+        struct tm tp;
         
         for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
@@ -692 +691 @@
         tp.tm_year -= 1900;
         tp.tm_mon --;
-        tp.tm_isdst = -1; /* GRRRRRRRRRRR */
-        
-        res = mktime( &tp );
-        /* Problem is, mktime() just gave us the GMT timestamp for the
-           given local time... While the given time WAS NOT local. So
-           we should fix this now.
-        
-           Now I could choose between messing with environment variables
-           (kludgy) or using timegm() (not portable)... Or doing the
-           following, which I actually prefer... */
-        gmtime_r( &res, &utc );
-        utc.tm_isdst = -1; /* Once more: GRRRRRRRRRRRRRRRRRR!!! */
-        if( utc.tm_hour == tp.tm_hour && utc.tm_min == tp.tm_min )
-                /* Sweet! We're in UTC right now... */
-                return res;
-        
-        tres = mktime( &utc );
-        res += res - tres;
-        
-        /* Yes, this is a hack. And it will go wrong around DST changes.
-           BUT this is more likely to be threadsafe than messing with
-           environment variables, and possibly more portable... */
-        
-        return res;
+        
+        return mktime_utc( &tp );
 }
 

protocols/jabber/message.c

@@ -80 +80 @@
                 if( type && strcmp( type, "headline" ) == 0 )
                 {
-                        c = xt_find_node( node->children, "subject" );
-                        g_string_append_printf( fullmsg, "Headline: %s\n", c && c->text_len > 0 ? c->text : "" );
+                        if( ( c = xt_find_node( node->children, "subject" ) ) && c->text_len > 0 )
+                                g_string_append_printf( fullmsg, "Headline: %s\n", c->text );
                         
                         /* <x xmlns="jabber:x:oob"><url>http://....</url></x> can contain a URL, it seems. */

protocols/jabber/s5bytestream.c

@@ -406 +406 @@
                         bt->phase = BS_PHASE_CONNECTED;
                         
-                        bt->tf->watch_out = b_input_add( fd, GAIM_INPUT_WRITE, jabber_bs_recv_handshake, bt );
+                        bt->tf->watch_out = b_input_add( fd, B_EV_IO_WRITE, jabber_bs_recv_handshake, bt );
 
                         /* since it takes forever(3mins?) till connect() fails on itself we schedule a timeout */
@@ -433 +433 @@
                         bt->phase = BS_PHASE_REQUEST;
 
-                        bt->tf->watch_in = b_input_add( fd, GAIM_INPUT_READ, jabber_bs_recv_handshake, bt );
+                        bt->tf->watch_in = b_input_add( fd, B_EV_IO_READ, jabber_bs_recv_handshake, bt );
 
                         bt->tf->watch_out = 0;
@@ -589 +589 @@
 
         tf->ft->data = tf;
-        tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_recv_read, bt );
+        tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_recv_read, bt );
         tf->ft->write_request = jabber_bs_recv_write_request;
 
@@ -631 +631 @@
                 if( ( ret == -1 ) && ( errno == EAGAIN ) )
                 {
-                        tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_recv_read, bt );
+                        tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_recv_read, bt );
                         return FALSE;
                 }
@@ -707 +707 @@
                 imcb_file_finished( ft );
         else
-                bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
+                bt->tf->watch_out = b_input_add( tf->fd, B_EV_IO_WRITE, jabber_bs_send_can_write, bt );
                 
         return TRUE;
@@ -918 +918 @@
                                 bt->streamhosts = g_slist_append( bt->streamhosts, sh );
 
-                                bt->tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_send_handshake, bt );
+                                bt->tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_send_handshake, bt );
                                 bt->connect_timeout = b_timeout_add( JABBER_BS_LISTEN_TIMEOUT * 1000, jabber_bs_connect_timeout, bt );
                         } else {
@@ -1055 +1055 @@
                         bt->phase = BS_PHASE_CONNECTED;
 
-                        bt->tf->watch_in = b_input_add( fd, GAIM_INPUT_READ, jabber_bs_send_handshake, bt );
+                        bt->tf->watch_in = b_input_add( fd, B_EV_IO_READ, jabber_bs_send_handshake, bt );
                         return FALSE;
                 }

protocols/msn/invitation.c

@@ -209 +209 @@
         sock_make_nonblocking( fd );
 
-        msn_file->r_event_id = b_input_add( fd, GAIM_INPUT_READ, msn_ftp_read, file );
+        msn_file->r_event_id = b_input_add( fd, B_EV_IO_READ, msn_ftp_read, file );
 
         return FALSE;
@@ -230 +230 @@
         }
 
-        msn_file->r_event_id = b_input_add( msn_file->fd, GAIM_INPUT_READ, msn_ftps_connected, file );
+        msn_file->r_event_id = b_input_add( msn_file->fd, B_EV_IO_READ, msn_ftps_connected, file );
 
         g_snprintf( buf, sizeof( buf ),
@@ -318 +318 @@
         
         sock_make_nonblocking( msn_file->fd );
-        msn_file->r_event_id = b_input_add( msn_file->fd, GAIM_INPUT_READ, msn_ftp_read, file );
+        msn_file->r_event_id = b_input_add( msn_file->fd, B_EV_IO_READ, msn_ftp_read, file );
         
         return FALSE;
@@ -415 +415 @@
             ( msn_file->data_sent + msn_file->sbufpos - 3 < file->file_size ) ) {
                 if( !msn_file->w_event_id )
-                        msn_file->w_event_id = b_input_add( msn_file->fd, GAIM_INPUT_WRITE, msn_ftp_send, file );
+                        msn_file->w_event_id = b_input_add( msn_file->fd, B_EV_IO_WRITE, msn_ftp_send, file );
                 return TRUE;
         }
@@ -452 +452 @@
                 /* we might already be listening if this is data from an overflow */
                 if( !msn_file->w_event_id )
-                        msn_file->w_event_id = b_input_add( msn_file->fd, GAIM_INPUT_WRITE, msn_ftp_send, file );
+                        msn_file->w_event_id = b_input_add( msn_file->fd, B_EV_IO_WRITE, msn_ftp_send, file );
         }
 
@@ -617 +617 @@
 
         msn_file->r_event_id = 
-                b_input_add( msn_file->fd, GAIM_INPUT_READ, msn_ftp_read, file );
+                b_input_add( msn_file->fd, B_EV_IO_READ, msn_ftp_read, file );
 
         return TRUE;

protocols/msn/msn.c

@@ -31 +31 @@
 GSList *msn_switchboards;
 
-static char *msn_set_display_name( set_t *set, char *value );
+static char *set_eval_display_name( set_t *set, char *value );
 
 static void msn_init( account_t *acc )
 {
-        set_t *s;
-        
-        s = set_add( &acc->set, "display_name", NULL, msn_set_display_name, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
-
-        s = set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
+        set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc );
+        set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
 }
 
@@ -171 +169 @@
 static void msn_set_my_name( struct im_connection *ic, char *info )
 {
-        msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );
+        msn_set_display_name( ic, info );
 }
 
@@ -287 +285 @@
 }
 
-static char *msn_set_display_name( set_t *set, char *value )
+static char *set_eval_display_name( set_t *set, char *value )
 {
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        struct msn_data *md;
-        char buf[1024], *fn;
-        
-        /* Double-check. */
+        
+        /* Allow any name if we're offline. */
         if( ic == NULL )
-                return NULL;
-        
-        md = ic->proto_data;
+                return value;
         
         if( strlen( value ) > 129 )
@@ -305 +299 @@
                 return NULL;
         }
-        
-        fn = msn_http_encode( value );
-        
-        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
-        msn_write( ic, buf, strlen( buf ) );
-        g_free( fn );
         
         /* Returning NULL would be better, because the server still has to
            confirm the name change. However, it looks a bit confusing to the
            user. */
-        return value;
+        return msn_set_display_name( ic, value ) ? value : NULL;
 }
 

protocols/msn/msn.h

@@ -31 +31 @@
 #define TYPING_NOTIFICATION_MESSAGE "\r\r\rBEWARE, ME R TYPINK MESSAGE!!!!\r\r\r"
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
+#define SB_KEEPALIVE_MESSAGE "\r\r\rDONT HANG UP ON ME!\r\r\r"
 
 #ifdef DEBUG_MSN
@@ -53 +54 @@
                            "TypingUser: %s\r\n" \
                            "\r\n\r\n"
+
+#define SB_KEEPALIVE_HEADERS "MIME-Version: 1.0\r\n" \
+                             "Content-Type: text/x-ping\r\n" \
+                             "\r\n\r\n"
 
 #define PROFILE_URL "http://members.msn.com/"
@@ -84 +89 @@
         gint inp;
         struct msn_handler_data *handler;
+        gint keepalive;
         
         int trId;
@@ -162 +168 @@
 char *msn_http_encode( const char *input );
 void msn_msgq_purge( struct im_connection *ic, GSList **list );
+gboolean msn_set_display_name( struct im_connection *ic, const char *rawname );
 
 /* tables.c */
@@ -180 +187 @@
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );
 int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial );
+void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
 /* invitation.c */

protocols/msn/msn_util.c

@@ -38 +38 @@
                 imcb_error( ic, "Short write() to main server" );
                 imc_logout( ic, TRUE );
-                return( 0 );
-        }
-        
-        return( 1 );
+                return 0;
+        }
+        
+        return 1;
 }
 
@@ -377 +377 @@
         g_string_free( ret, TRUE );
 }
+
+gboolean msn_set_display_name( struct im_connection *ic, const char *rawname )
+{
+        char *fn = msn_http_encode( rawname );
+        struct msn_data *md = ic->proto_data;
+        char buf[1024];
+        
+        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
+        g_free( fn );
+        
+        return msn_write( ic, buf, strlen( buf ) ) != 0;
+}

protocols/msn/ns.c

@@ -35 +35 @@
 
 static void msn_auth_got_passport_token( struct msn_auth_data *mad );
+static gboolean msn_ns_got_display_name( struct im_connection *ic, char *name );
 
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
@@ -75 +76 @@
         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" );
         }
@@ -231 +232 @@
                 else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
-                        set_t *s;
-                        
                         if( num_parts == 7 )
-                        {
-                                http_decode( cmd[4] );
-                                
-                                strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
-                                ic->displayname[sizeof(ic->displayname)-1] = 0;
-                                
-                                if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
-                                {
-                                        g_free( s->value );
-                                        s->value = g_strdup( cmd[4] );
-                                }
-                        }
+                                msn_ns_got_display_name( ic, cmd[4] );
                         else
-                        {
                                 imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
-                        }
                         
                         imcb_log( ic, "Authenticated, getting buddy list" );
@@ -436 +422 @@
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
-                if( cmd[1] )
-                        imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                if( cmd[1] == NULL )
+                        return 1;
+                
+                imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                
+                msn_sb_start_keepalives( msn_sb_by_handle( ic, cmd[1] ), TRUE );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
@@ -463 +453 @@
                                    ( st != msn_away_state_list ? OPT_AWAY : 0 ),
                                    st->name, NULL );
+                
+                msn_sb_stop_keepalives( msn_sb_by_handle( ic, cmd[2] ) );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )
@@ -567 +559 @@
                 return( 0 );
         }
+#if 0
+        /* Discard this one completely for now since I don't care about the ack
+           and since MSN servers can apparently screw up the formatting. */
         else if( strcmp( cmd[0], "REA" ) == 0 )
         {
@@ -597 +592 @@
                 }
         }
+#endif
         else if( strcmp( cmd[0], "IPG" ) == 0 )
         {
@@ -746 +742 @@
         }
 }
+
+static gboolean msn_ns_got_display_name( struct im_connection *ic, char *name )
+{
+        set_t *s;
+        
+        if( ( s = set_find( &ic->acc->set, "display_name" ) ) == NULL )
+                return FALSE; /* Shouldn't happen.. */
+        
+        http_decode( name );
+        
+        if( s->value && strcmp( s->value, name ) == 0 )
+        {
+                return TRUE;
+                /* The names match, nothing to worry about. */
+        }
+        else if( s->value != NULL &&
+                 ( strcmp( name, ic->acc->user ) == 0 ||
+                   set_getbool( &ic->acc->set, "local_display_name" ) ) )
+        {
+                /* The server thinks our display name is our e-mail address
+                   which is probably wrong, or the user *wants* us to do this:
+                   Always use the locally set display_name. */
+                return msn_set_display_name( ic, s->value );
+        }
+        else
+        {
+                if( s->value && *s->value )
+                        imcb_log( ic, "BitlBee thinks your display name is `%s' but "
+                                      "the MSN server says it's `%s'. Using the MSN "
+                                      "server's name. Set local_display_name to true "
+                                      "to use the local name.", s->value, name );
+                
+                if( g_utf8_validate( name, -1, NULL ) )
+                {
+                        g_free( s->value );
+                        s->value = g_strdup( name );
+                }
+                else
+                {
+                        imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
+                }
+                
+                return TRUE;
+        }
+}

protocols/msn/sb.c

@@ -180 +180 @@
                         i = strlen( buf );
                 }
+                else if( strcmp( text, SB_KEEPALIVE_MESSAGE ) == 0 )
+                {
+                        buf = g_strdup( SB_KEEPALIVE_HEADERS );
+                        i = strlen( buf );
+                }
                 else
                 {
@@ -256 +261 @@
         
         msn_msgq_purge( ic, &sb->msgq );
+        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -315 +321 @@
         
         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 );
@@ -328 +334 @@
         struct msn_data *md = ic->proto_data;
         
-        if( msn_handler( sb->handler ) == -1 )
+        if( msn_handler( sb->handler ) != -1 )
+                return TRUE;
+        
+        if( sb->msgq != NULL )
         {
                 time_t now = time( NULL );
+                char buf[1024];
                 
                 if( now - md->first_sb_failure > 600 )
@@ -347 +357 @@
                                       "There might be problems delivering your messages." );
                 
-                if( sb->msgq != NULL )
-                {
-                        char buf[1024];
-                        
-                        if( md->msgq == NULL )
-                        {
-                                md->msgq = sb->msgq;
-                        }
-                        else
-                        {
-                                GSList *l;
-                                
-                                for( l = md->msgq; l->next; l = l->next );
-                                l->next = sb->msgq;
-                        }
-                        sb->msgq = NULL;
-                        
-                        debug( "Moved queued messages back to the main queue, creating a new switchboard to retry." );
-                        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                        if( !msn_write( ic, buf, strlen( buf ) ) )
-                                return FALSE;
-                }
-                
-                msn_sb_destroy( sb );
-                
-                return FALSE;
-        }
-        else
-        {
-                return TRUE;
-        }
+                if( md->msgq == NULL )
+                {
+                        md->msgq = sb->msgq;
+                }
+                else
+                {
+                        GSList *l;
+                        
+                        for( l = md->msgq; l->next; l = l->next );
+                        l->next = sb->msgq;
+                }
+                sb->msgq = NULL;
+                
+                debug( "Moved queued messages back to the main queue, "
+                       "creating a new switchboard to retry." );
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
+                        return FALSE;
+        }
+        
+        msn_sb_destroy( sb );
+        return FALSE;
 }
 
@@ -477 +478 @@
                 
                 sb->ready = 1;
+                
+                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -526 +529 @@
                         }
                         
+                        msn_sb_start_keepalives( sb, FALSE );
+                        
                         return( st );
                 }
@@ -587 +592 @@
                 if( sb->who )
                 {
+                        msn_sb_stop_keepalives( sb );
+                        
                         /* This is a single-person chat, and the other person is leaving. */
                         g_free( sb->who );
@@ -749 +756 @@
         return( 1 );
 }
+
+static gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond )
+{
+        struct msn_switchboard *sb = data;
+        return sb->ready && msn_sb_sendmessage( sb, SB_KEEPALIVE_MESSAGE );
+}
+
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial )
+{
+        struct buddy *b;
+        
+        if( sb && sb->who && sb->keepalive == 0 &&
+            ( b = imcb_find_buddy( sb->ic, sb->who ) ) && !b->present &&
+            set_getbool( &sb->ic->acc->set, "switchboard_keepalives" ) )
+        {
+                if( initial )
+                        msn_sb_keepalive( sb, 0, 0 );
+                
+                sb->keepalive = b_timeout_add( 20000, msn_sb_keepalive, sb );
+        }
+}
+
+void msn_sb_stop_keepalives( struct msn_switchboard *sb )
+{
+        if( sb && sb->keepalive > 0 )
+        {
+                b_event_remove( sb->keepalive );
+                sb->keepalive = 0;
+        }
+}

protocols/nogaim.c

@@ -39 +39 @@
 
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
+static char *format_timestamp( irc_t *irc, time_t msg_ts );
 
 GSList *connections;
@@ -116 +117 @@
 {
         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 +136 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
+        extern void twitter_initmodule();
+        extern void purple_initmodule();
 
 #ifdef WITH_MSN
@@ -147 +153 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
+#endif
+
+#ifdef WITH_TWITTER
+        twitter_initmodule();
+#endif
+        
+#ifdef WITH_PURPLE
+        purple_initmodule();
 #endif
 
@@ -651 +665 @@
         u->away = u->status_msg = NULL;
         
-        if( ( flags & OPT_LOGGED_IN ) && !u->online )
-        {
+        if( set_getbool( &ic->irc->set, "show_offline" ) && !u->online )
+        {
+                /* always set users as online */
                 irc_spawn( ic->irc, u );
                 u->online = 1;
+                if( !( flags & OPT_LOGGED_IN ) )
+                {
+                        /* set away message if user isn't really online */
+                        u->away = g_strdup( "User is offline" );
+                }
+        }
+        else if( ( flags & OPT_LOGGED_IN ) && !u->online )
+        {
+                irc_spawn( ic->irc, u );
+                u->online = 1;
         }
         else if( !( flags & OPT_LOGGED_IN ) && u->online )
@@ -660 +685 @@
                 struct groupchat *c;
                 
-                irc_kill( ic->irc, u );
-                u->online = 0;
-                
-                /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
-                for( c = ic->groupchats; c; c = c->next )
-                        remove_chat_buddy_silent( c, handle );
-        }
-        
+                if( set_getbool( &ic->irc->set, "show_offline" ) )
+                {
+                        /* keep offline users in channel and set away message to "offline" */
+                        u->away = g_strdup( "User is offline" );
+
+                        /* Keep showing him/her in the control channel but not in groupchats. */
+                        for( c = ic->groupchats; c; c = c->next )
+                        {
+                                if( remove_chat_buddy_silent( c, handle ) && c->joined )
+                                        irc_part( c->ic->irc, u, c->channel );
+                        }
+                }
+                else
+                {
+                        /* kill offline users */
+                        irc_kill( ic->irc, u );
+                        u->online = 0;
+
+                        /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
+                        for( c = ic->groupchats; c; c = c->next )
+                                remove_chat_buddy_silent( c, handle );
+                }
+        }
+
         if( flags & OPT_AWAY )
         {
@@ -692 +733 @@
         }
         
-        /* LISPy... */
-        if( ( set_getbool( &ic->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 */
-              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
+        /* early if-clause for show_offline even if there is some redundant code here because this isn't LISP but C ;) */
+        if( set_getbool( &ic->irc->set, "show_offline" ) && set_getbool( &ic->irc->set, "away_devoice" ) )
         {
                 char *from;
@@ -709 +747 @@
                                                             ic->irc->myhost );
                 }
-                irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
-                                                          u->away?'-':'+', u->nick );
-                g_free( from );
+
+                /* if we use show_offline, we op online users, voice away users, and devoice/deop offline users */
+                if( flags & OPT_LOGGED_IN )
+                {
+                        /* user is "online" (either really online or away) */
+                        irc_write( ic->irc, ":%s MODE %s %cv%co %s %s", from, ic->irc->channel,
+                                                                  u->away?'+':'-', u->away?'-':'+', u->nick, u->nick );
+                }
+                else
+                {
+                        /* user is offline */
+                        irc_write( ic->irc, ":%s MODE %s -vo %s %s", from, ic->irc->channel, u->nick, u->nick );
+                }
+        }
+        else
+        { 
+                /* LISPy... */
+                if( ( set_getbool( &ic->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 */
+                      ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
+                {
+                        char *from;
+
+                        if( set_getbool( &ic->irc->set, "simulate_netsplit" ) )
+                        {
+                                from = g_strdup( ic->irc->myhost );
+                        }
+                        else
+                        {
+                                from = g_strdup_printf( "%s!%s@%s", ic->irc->mynick, ic->irc->mynick,
+                                                                    ic->irc->myhost );
+                        }
+                        irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
+                                                                  u->away?'-':'+', u->nick );
+                        g_free( from );
+                }
         }
 }
@@ -718 +790 @@
 {
         irc_t *irc = ic->irc;
-        char *wrapped;
+        char *wrapped, *ts = NULL;
         user_t *u;
         
@@ -760 +832 @@
             ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
                 strip_html( msg );
-
+        
+        if( set_getbool( &ic->irc->set, "display_timestamps" ) &&
+            ( ts = format_timestamp( irc, sent_at ) ) )
+        {
+                char *new = g_strconcat( ts, msg, NULL );
+                g_free( ts );
+                ts = msg = new;
+        }
+        
         wrapped = word_wrap( msg, 425 );
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
+        g_free( ts );
 }
 
@@ -805 +886 @@
         
         return c;
+}
+
+void imcb_chat_name_hint( struct groupchat *c, const char *name )
+{
+        if( !c->joined )
+        {
+                struct im_connection *ic = c->ic;
+                char stripped[MAX_NICK_LENGTH+1], *full_name;
+                
+                strncpy( stripped, name, MAX_NICK_LENGTH );
+                stripped[MAX_NICK_LENGTH] = '\0';
+                nick_strip( stripped );
+                if( set_getbool( &ic->irc->set, "lcnicks" ) )
+                        nick_lc( stripped );
+                
+                full_name = g_strdup_printf( "&%s", stripped );
+                
+                if( stripped[0] &&
+                    nick_cmp( stripped, ic->irc->channel + 1 ) != 0 &&
+                    irc_chat_by_channel( ic->irc, full_name ) == NULL )
+                {
+                        g_free( c->channel );
+                        c->channel = full_name;
+                }
+                else
+                {
+                        g_free( full_name );
+                }
+        }
 }
 
@@ -867 +977 @@
         if( c && u )
         {
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
+                char *ts = NULL;
+                if( set_getbool( &ic->irc->set, "display_timestamps" ) )
+                        ts = format_timestamp( ic->irc, sent_at );
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? : "", wrapped );
+                g_free( ts );
         }
         else
@@ -1061 +1175 @@
 }
 
-
-
+char *set_eval_timezone( set_t *set, char *value )
+{
+        char *s;
+        
+        if( strcmp( value, "local" ) == 0 ||
+            strcmp( value, "gmt" ) == 0 || strcmp( value, "utc" ) == 0 )
+                return value;
+        
+        /* Otherwise: +/- at the beginning optional, then one or more numbers,
+           possibly followed by a colon and more numbers. Don't bother bound-
+           checking them since users are free to shoot themselves in the foot. */
+        s = value;
+        if( *s == '+' || *s == '-' )
+                s ++;
+        
+        /* \d+ */
+        if( !isdigit( *s ) )
+                return SET_INVALID;
+        while( *s && isdigit( *s ) ) s ++;
+        
+        /* EOS? */
+        if( *s == '\0' )
+                return value;
+        
+        /* Otherwise, colon */
+        if( *s != ':' )
+                return SET_INVALID;
+        s ++;
+        
+        /* \d+ */
+        if( !isdigit( *s ) )
+                return SET_INVALID;
+        while( *s && isdigit( *s ) ) s ++;
+        
+        /* EOS */
+        return *s == '\0' ? value : SET_INVALID;
+}
+
+static char *format_timestamp( irc_t *irc, time_t msg_ts )
+{
+        time_t now_ts = time( NULL );
+        struct tm now, msg;
+        char *set;
+        
+        /* If the timestamp is <= 0 or less than a minute ago, discard it as
+           it doesn't seem to add to much useful info and/or might be noise. */
+        if( msg_ts <= 0 || msg_ts > now_ts - 60 )
+                return NULL;
+        
+        set = set_getstr( &irc->set, "timezone" );
+        if( strcmp( set, "local" ) == 0 )
+        {
+                localtime_r( &now_ts, &now );
+                localtime_r( &msg_ts, &msg );
+        }
+        else
+        {
+                int hr, min = 0, sign = 60;
+                
+                if( set[0] == '-' )
+                {
+                        sign *= -1;
+                        set ++;
+                }
+                else if( set[0] == '+' )
+                {
+                        set ++;
+                }
+                
+                if( sscanf( set, "%d:%d", &hr, &min ) >= 1 )
+                {
+                        msg_ts += sign * ( hr * 60 + min );
+                        now_ts += sign * ( hr * 60 + min );
+                }
+                
+                gmtime_r( &now_ts, &now );
+                gmtime_r( &msg_ts, &msg );
+        }
+        
+        if( msg.tm_year == now.tm_year && msg.tm_yday == now.tm_yday )
+                return g_strdup_printf( "\x02[\x02\x02\x02%02d:%02d:%02d\x02]\x02 ",
+                                        msg.tm_hour, msg.tm_min, msg.tm_sec );
+        else
+                return g_strdup_printf( "\x02[\x02\x02\x02%04d-%02d-%02d "
+                                        "%02d:%02d:%02d\x02]\x02 ",
+                                        msg.tm_year + 1900, msg.tm_mon + 1, msg.tm_mday,
+                                        msg.tm_hour, msg.tm_min, msg.tm_sec );
+}
 
 /* The plan is to not allow straight calls to prpl functions anymore, but do
@@ -1105 +1305 @@
 {
         char *away, *msg = NULL;
+        
+        if( ic->acc->prpl->away_states == NULL ||
+            ic->acc->prpl->set_away == NULL )
+                return 0;
         
         away = set_getstr( &ic->acc->set, "away" ) ?

protocols/nogaim.h

@@ -134 +134 @@
          * - 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
@@ -307 +308 @@
  *   user, too. */
 G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
+G_MODULE_EXPORT void imcb_chat_name_hint( struct groupchat *c, const char *name );
 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, const char *handle );
 /* To remove a handle from a group chat. Reason can be NULL. */
@@ -329 +331 @@
 
 /* Misc. stuff */
+char *set_eval_timezone( 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 );

protocols/oscar/oscar.c

@@ -205 +205 @@
 static int gaim_icbm_param_info  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_genericerr (aim_session_t *, aim_frame_t *, ...);
-static int gaim_memrequest       (aim_session_t *, aim_frame_t *, ...);
 static int gaim_selfinfo         (aim_session_t *, aim_frame_t *, ...);
 static int gaim_offlinemsg       (aim_session_t *, aim_frame_t *, ...);
@@ -291 +290 @@
         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 +362 @@
 
         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);
         
@@ -493 +492 @@
 
         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"));
@@ -570 +569 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ERROR, gaim_parse_genericerr, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BOS, AIM_CB_BOS_ERROR, gaim_parse_genericerr, 0);
-        aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, 0x1f, gaim_memrequest, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_SELFINFO, gaim_selfinfo, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSG, gaim_offlinemsg, 0);
@@ -604 +602 @@
 }
 
-struct pieceofcrap {
-        struct im_connection *ic;
-        unsigned long offset;
-        unsigned long len;
-        char *modname;
-        int fd;
-        aim_conn_t *conn;
-        unsigned int inpa;
-};
-
-static gboolean damn_you(gpointer data, gint source, b_input_condition c)
-{
-        struct pieceofcrap *pos = data;
-        struct oscar_data *od = pos->ic->proto_data;
-        char in = '\0';
-        int x = 0;
-        unsigned char m[17];
-
-        while (read(pos->fd, &in, 1) == 1) {
-                if (in == '\n')
-                        x++;
-                else if (in != '\r')
-                        x = 0;
-                if (x == 2)
-                        break;
-                in = '\0';
-        }
-        if (in != '\n') {
-                imcb_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
-                                " You may be disconnected shortly.");
-                b_event_remove(pos->inpa);
-                closesocket(pos->fd);
-                g_free(pos);
-                return FALSE;
-        }
-        /* [WvG] Wheeeee! Who needs error checking anyway? ;-) */
-        read(pos->fd, m, 16);
-        m[16] = '\0';
-        b_event_remove(pos->inpa);
-        closesocket(pos->fd);
-        aim_sendmemblock(od->sess, pos->conn, 0, 16, m, AIM_SENDMEMBLOCK_FLAG_ISHASH);
-        g_free(pos);
-        
-        return FALSE;
-}
-
-static gboolean straight_to_hell(gpointer data, gint source, b_input_condition cond) {
-        struct pieceofcrap *pos = data;
-        char buf[BUF_LONG];
-
-        if (source < 0) {
-                imcb_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
-                                " You may be disconnected shortly.");
-                if (pos->modname)
-                        g_free(pos->modname);
-                g_free(pos);
-                return FALSE;
-        }
-
-        g_snprintf(buf, sizeof(buf), "GET " AIMHASHDATA
-                        "?offset=%ld&len=%ld&modname=%s HTTP/1.0\n\n",
-                        pos->offset, pos->len, pos->modname ? pos->modname : "");
-        write(pos->fd, buf, strlen(buf));
-        if (pos->modname)
-                g_free(pos->modname);
-        pos->inpa = b_input_add(pos->fd, GAIM_INPUT_READ, damn_you, pos);
-        return FALSE;
-}
-
 /* size of icbmui.ocm, the largest module in AIM 3.5 */
 #define AIM_MAX_FILE_SIZE 98304
-
-int gaim_memrequest(aim_session_t *sess, aim_frame_t *fr, ...) {
-        va_list ap;
-        struct pieceofcrap *pos;
-        guint32 offset, len;
-        char *modname;
-        int fd;
-
-        va_start(ap, fr);
-        offset = (guint32)va_arg(ap, unsigned long);
-        len = (guint32)va_arg(ap, unsigned long);
-        modname = va_arg(ap, char *);
-        va_end(ap);
-
-        if (len == 0) {
-                aim_sendmemblock(sess, fr->conn, offset, len, NULL,
-                                AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-                return 1;
-        }
-        /* uncomment this when you're convinced it's right. remember, it's been wrong before.
-        if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) {
-                char *buf;
-                int i = 8;
-                if (modname)
-                        i += strlen(modname);
-                buf = g_malloc(i);
-                i = 0;
-                if (modname) {
-                        memcpy(buf, modname, strlen(modname));
-                        i += strlen(modname);
-                }
-                buf[i++] = offset & 0xff;
-                buf[i++] = (offset >> 8) & 0xff;
-                buf[i++] = (offset >> 16) & 0xff;
-                buf[i++] = (offset >> 24) & 0xff;
-                buf[i++] = len & 0xff;
-                buf[i++] = (len >> 8) & 0xff;
-                buf[i++] = (len >> 16) & 0xff;
-                buf[i++] = (len >> 24) & 0xff;
-                aim_sendmemblock(sess, command->conn, offset, i, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-                g_free(buf);
-                return 1;
-        }
-        */
-
-        pos = g_new0(struct pieceofcrap, 1);
-        pos->ic = sess->aux_data;
-        pos->conn = fr->conn;
-
-        pos->offset = offset;
-        pos->len = len;
-        pos->modname = modname ? g_strdup(modname) : NULL;
-
-        fd = proxy_connect("gaim.sourceforge.net", 80, straight_to_hell, pos);
-        if (fd < 0) {
-                if (pos->modname)
-                        g_free(pos->modname);
-                g_free(pos);
-                imcb_error(sess->aux_data, "Gaim was unable to get a valid hash for logging into AIM."
-                                " You may be disconnected shortly.");
-        }
-        pos->fd = fd;
-
-        return 1;
-}
 
 static int gaim_parse_login(aim_session_t *sess, aim_frame_t *fr, ...) {
@@ -838 +702 @@
 
         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);
         
@@ -866 +730 @@
 
         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);
         
@@ -902 +766 @@
         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);
@@ -2651 +2515 @@
         char * chatname;
         
-        chatname = g_strdup_printf("%s%d", ic->acc->user, chat_id++);
+        chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
+                                   ic->acc->user, chat_id++);
   
         ret = oscar_chat_join(ic, chatname, NULL, NULL);

protocols/yahoo/yahoo.c

@@ -138 +138 @@
         struct im_connection *ic = imcb_new( acc );
         struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 );
+        char *s;
         
         yd->logged_in = FALSE;
         yd->current_status = YAHOO_STATUS_AVAILABLE;
+        
+        if( ( s = strchr( acc->user, '@' ) ) && g_strcasecmp( s, "@yahoo.com" ) == 0 )
+                imcb_error( ic, "Your Yahoo! username should just be a username. "
+                                "Do not include any @domain part." );
         
         imcb_log( ic, "Connecting" );
@@ -681 +686 @@
                 
                 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 +697 @@
                 
                 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
@@ -828 +833 @@
         YList *m;
         
+        if( g_strcasecmp( who, ic->acc->user ) == 0 )
+                /* WTF, Yahoo! seems to echo these now? */
+                return;
+        
         inv = g_malloc( sizeof( struct byahoo_conf_invitation ) );
         memset( inv, 0, sizeof( struct byahoo_conf_invitation ) );

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... */

storage_xml.c

@@ -496 +496 @@
                 goto write_error;
         
+        fsync( fd );
         close( fd );
         

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 )
@@ -73 +83 @@
         
                 i = bitlbee_inetd_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "BitlBee %s starting in inetd mode.", BITLBEE_VERSION );
 
         }
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
-                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
 
                 i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "BitlBee %s starting in daemon mode.", BITLBEE_VERSION );
         }
         else if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
+
                 /* In case the operator requests a restart, we need this. */
                 old_cwd = g_malloc( 256 );
@@ -96 +109 @@
                 
                 i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "BitlBee %s starting in forking daemon mode.", BITLBEE_VERSION );
         }
         if( i != 0 )
@@ -113 +126 @@
                         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 +145 @@
         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();