Changeset 814aa52

Timestamp:

2010-06-03T11:00:45Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

a6b2f13

Parents:

5f8ab6a9 (diff), f4bcc22 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in bitlbee 1.2.6

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (5 diffs)
• bitlbee.h (modified) (2 diffs)
• conf.c (modified) (2 diffs)
• configure (modified) (8 diffs)
• debian/bitlbee.init (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/config (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/patches/bitlbee.conf.diff (modified) (1 diff)
• debian/po/POTFILES.in (modified) (1 diff)
• debian/po/ru.po (added)
• debian/postinst (modified) (2 diffs)
• debian/prerm (modified) (1 diff)
• doc/CHANGES (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (9 diffs)
• irc.c (modified) (4 diffs)
• irc_commands.c (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• log.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (3 diffs)
• protocols/jabber/jabber_util.c (modified) (17 diffs)
• protocols/jabber/message.c (modified) (2 diffs)
• protocols/jabber/presence.c (modified) (1 diff)
• 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) (7 diffs)
• protocols/msn/sb.c (modified) (7 diffs)
• protocols/nogaim.c (modified) (9 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (2 diffs)
• 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)
• root_commands.c (modified) (3 diffs)
• storage_xml.c (modified) (1 diff)
• tests/check_jabber_util.c (modified) (3 diffs)
• unix.c (modified) (2 diffs)

Makefile

@@ -128 +128 @@
 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 );
 
@@ -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 );
 }

bitlbee.h

@@ -38 +38 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.5"
+#define BITLBEE_VERSION "1.2.6"
 #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
@@ -168 +170 @@
 
 char *set_eval_root_nick( set_t *set, char *new_nick );
+char *set_eval_control_channel( set_t *set, char *new_name );
 
 extern global_t global;

conf.c

@@ -80 +80 @@
         }
         
-        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. */
         {
@@ -146 +146 @@
                                 "  -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

@@ -20 +20 @@
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
 
 msn=1
@@ -26 +26 @@
 oscar=1
 yahoo=1
+twitter=1
 
 debug=0
@@ -67 +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
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -158 +160 @@
 
 echo CFLAGS=$CFLAGS >> Makefile.settings
-echo CFLAGS+=-I`pwd` -iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
@@ -269 +271 @@
 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
@@ -297 +299 @@
 detect_resolv_dynamic()
 {
-        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        ret=1
+        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
         if [ "$?" = "0" ]; then
                 echo 'EFLAGS+=-lresolv' >> Makefile.settings
-                return 0
-        fi
-
-        return 1
+                ret=0
+        fi
+
+        rm -f $TMPFILE
+        return $ret
 }
 
 detect_resolv_static()
 {
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        ret=1
         for i in $systemlibdirs; do
                 if [ -f $i/libresolv.a ]; then
-                        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
+                        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
                         if [ "$?" = "0" ]; then
                                 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                                return 0
+                                ret=0
                         fi
                 fi
         done
 
-        return 1
+        rm -f $TMPFILE
+        return $ret
 }
 
@@ -494 +502 @@
 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
@@ -542 +564 @@
 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!"

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
         
-        # Clean up after the bug between 1.2-5 and 1.2.1-2 where BitlBee ran
-        # as root. (#494656 and #495877) Fixing this in the postinst script
-        # is not enough since the user will restart his BitlBee after up-
-        # grading the package, and the BitlBee running as root will then
-        # save its settings, re-setting ownership of the file to root.
-        # TODO: Remove this after a few revisions.
-        find /var/lib/bitlbee -uid 0 -name '*.xml' -exec chown bitlbee: {} \;
-
-        start-stop-daemon --start --quiet \
+        start-stop-daemon --start --quiet --pidfile $PIDFILE \
                 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
 }

debian/changelog

@@ +1 @@
+bitlbee (1.2.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed issues with server-side MSN nickname corruption. (Closes: #538756)
+  * Debconf translation fixes/additions. (Closes: #541754, #563504)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 17 Mar 2010 14:59:27 +0000
+
+bitlbee (1.2.4-2) unstable; urgency=low
+
+  * Merging in some changes from bzr-head:
+  * Use libresolv.so where possible. (Closes: #551775)
+  * Some include file changes that make the bitlbee-dev package useful again.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 19 Nov 2009 23:02:43 +0000
+
+bitlbee (1.2.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed issues with Yahoo! (Closes: #536178)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 17 Oct 2009 18:12:45 +0100
+
+bitlbee (1.2.3-2) unstable; urgency=low
+
+  * Fixed bitblee typo in prerm (introduced by NMU 1.2.1-1.1).
+    (Closes: #531287)
+  * Fixed bitlbee.deb dep in bitlbee-dev to deal with binary NMUs.
+    (Closes: #531219)
+  * Fixed free port detection code in debian/config which was a bit limited
+    and also buggy.
+  * Removing code that edits bitlbee.conf from postinst (and chown code in
+    the init script), it's not really necessary anymore; bitlbee may only
+    still run as root if the admin doesn't read conffile diffs.
+    (Closes: #514572)
+  * No longer overwriting port number info in /etc/default/bitlbee with
+    what's in debconf. (Closes: #514148)
+  * Added notes about the above two changes to bitlbee.conf.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Jun 2009 21:17:39 +0100
+
+bitlbee (1.2.3-1) unstable; urgency=critical
+
+  * New upstream version.
+  * Fixes another account hijacking issue. (Closes: #498159)
+  * Restored --pidfile argument to start-stop-daemon, otherwise the init
+    script fails to restart BitlBee when users are connected.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Sep 2008 18:53:04 +0100
+
 bitlbee (1.2.2-1) unstable; urgency=critical
 

debian/config

@@ -2 +2 @@
 
 . /usr/share/debconf/confmodule
+[ -f /etc/default/bitlbee ] && . /etc/default/bitlbee
 
 db_title BitlBee
 
-db_get bitlbee/serveport
-if [ "$RET" = "stillhavetoask" ]; then
-        if netstat -ltn | grep ':6667' 2> /dev/null > /dev/null; then
-                port=6668;
-        else
-                port=6667;
+if [ -n "$BITLBEE_PORT" ]; then
+        db_set bitlbee/serveport "$BITLBEE_PORT"
+else
+        db_get bitlbee/serveport
+        if [ "$RET" = "stillhavetoask" ]; then
+                listens=$(netstat -ltn | awk '{print $4}')
+                for port in 6667 6666 6668 6669; do
+                        if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then
+                                break
+                        fi
+                done
+                db_set bitlbee/serveport $port;
         fi
-        db_set bitlbee/serveport $port;
 fi
 

debian/control

@@ -19 +19 @@
 Package: bitlbee-dev
 Architecture: all
-Depends: bitlbee (= ${binary:Version})
+Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
 Description: An IRC to other chat networks gateway
  This program can be used as an IRC server which forwards everything you

debian/patches/bitlbee.conf.diff

@@ -1 @@
-=== modified file 'bitlbee.conf'
---- debian/bitlbee/etc/bitlbee/bitlbee.conf     2008-08-26 22:33:54 +0000
-+++ debian/bitlbee/etc/bitlbee/bitlbee.conf     2008-08-27 23:18:13 +0000
-@@ -23,7 +23,7 @@
+--- debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-01 00:20:24.000000000 +0100
++++ debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-07 21:16:19.000000000 +0100
+@@ -23,13 +23,18 @@
  ## If BitlBee is started by root as a daemon, it can drop root privileges,
  ## and change to the specified user.
  ##
 -# User = bitlbee
++## DEBIAN NOTE: Without this, BitlBee will run as root!
++##
 +User = bitlbee
  
  ## DaemonPort/DaemonInterface:
  ##
-
+ ## For daemon mode, you can specify on what interface and port the daemon
+ ## should be listening for connections.
+ ##
++## DEBIAN NOTE: The init script passes the -p flag to use the port number
++## set using debconf, this overrides the DaemonPort setting here.
++##
+ # DaemonInterface = 0.0.0.0
+ # DaemonPort = 6667
+ 

debian/po/POTFILES.in

@@ -1 @@
-[type: gettext/rfc822deb] bitlbee.templates.master
+[type: gettext/rfc822deb] templates

debian/postinst

@@ -33 +33 @@
 ## /etc/default/bitlbee: Auto-generated/updated script.
 ##
-## Don't edit this line, use dpkg-reconfigure bitlbee
+## If running in (fork)daemon mode, listen on this TCP port.
 BITLBEE_PORT="$PORT"
 
@@ -61 +61 @@
         else
                 mv /usr/share/bitlbee/help.upgrading /usr/share/bitlbee/help.txt
-        fi
-fi
-
-if ! grep -qi '^User *= *' /etc/bitlbee/bitlbee.conf; then
-        echo 'Updating configuration file, enabling User-setting...'
-        if ! sed -i -e 's/# *User *= *.*/User = bitlbee/i' /etc/bitlbee/bitlbee.conf; then
-                echo 'Failed! BitlBee may run as root now, please check your configs.'
         fi
 fi

debian/prerm

@@ -11 +11 @@
 else
         if which invoke-rc.d >/dev/null 2>&1; then
-                invoke-rc.d bitblee stop || exit 0
+                invoke-rc.d bitlbee stop || exit 0
         else
                 /etc/init.d/bitlbee stop || exit 0

doc/CHANGES

@@ -3 +3 @@
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+
+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 +44 @@
   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>
+                                </description>
+                        </bitlbee-command>
 
                         <bitlbee-command name="yahoo">
@@ -550 +568 @@
 
         <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
-                <default>false</default>
+                <default>true</default>
 
                 <description>
@@ -668 +686 @@
                         </para>
                 </description>
-
+        </bitlbee-setting>
+
+        <bitlbee-setting name="control_channel" type="string" scope="global">
+                <default>&amp;bitlbee</default>
+
+                <description>
+                        <para>
+                                Normally the control channel where you can see all your contacts is called "&amp;bitlbee". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.
+                        </para>
+                </description>
         </bitlbee-setting>
 
@@ -706 +733 @@
                         <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>
@@ -750 +787 @@
                         </para>
                 </description>
-
+        </bitlbee-setting>
+
+        <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                Only supported by OSCAR so far, you can use this setting to ignore ICQ authorization requests, which are hardly used for legitimate (i.e. non-spam) reasons anymore.
+                        </para>
+                </description>
         </bitlbee-setting>
 
@@ -759 +805 @@
                         <para>
                                 Hereby you can change whether you want all lower case nick names or leave the case as it intended by your peer.
+                        </para>
+                </description>
+
+        </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>
@@ -825 +882 @@
         </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>
+        </bitlbee-setting>
+
         <bitlbee-setting name="nick" type="string" scope="chat">
 
@@ -1029 +1105 @@
                         <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>

irc.c

@@ -55 +55 @@
 {
         irc_t *irc = set->data;
+        char *test;
+        gsize test_bytes = 0;
         GIConv ic, oc;
 
@@ -60 +62 @@
                 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;
         }
@@ -175 +191 @@
         s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
         s = set_add( &irc->set, "color_encrypted", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "control_channel", irc->channel, set_eval_control_channel, irc );
         s = set_add( &irc->set, "debug", "false", set_eval_bool, irc );
         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, "halfop_buddies", "encrypted", set_eval_halfop_buddies, irc );
@@ -192 +210 @@
         s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
         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 );

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/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;
 }
 

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 );
 

log.c

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

protocols/jabber/jabber.c

@@ -57 +57 @@
         set_t *s;
         char str[16];
+        
+        s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
         
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
@@ -307 +309 @@
                 bud = jabber_buddy_by_ext_jid( ic, who, 0 );
         else
-                bud = jabber_buddy_by_jid( ic, who, 0 );
+                bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK );
         
         node = xt_new_node( "body", message, NULL );
@@ -352 +354 @@
 static void jabber_get_info( struct im_connection *ic, char *who )
 {
-        struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud;
         
-        if( strchr( who, '/' ) )
-                bud = jabber_buddy_by_jid( ic, who, 0 );
-        else
-        {
-                char *s = jabber_normalize( who );
-                bud = g_hash_table_lookup( jd->buddies, s );
-                g_free( s );
-        }
+        bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST );
         
         while( bud )

protocols/jabber/jabber.h

@@ -108 +108 @@
 };
 
+/* Somewhat messy data structure: We have a hash table with the bare JID as
+   the key and the head of a struct jabber_buddy list as the value. The head
+   is always a bare JID. If the JID has other resources (often the case,
+   except for some transports that don't support multiple resources), those
+   follow. In that case, the bare JID at the beginning doesn't actually
+   refer to a real session and should only be used for operations that
+   support incomplete JIDs. */
 struct jabber_buddy
 {
@@ -121 +128 @@
         char *away_message;
         
-        time_t last_act;
+        time_t last_msg;
         jabber_buddy_flags_t flags;
         
@@ -209 +216 @@
         GET_BUDDY_EXACT = 2,    /* Get an exact match (only makes sense with bare JIDs). */
         GET_BUDDY_FIRST = 4,    /* No selection, simply get the first resource for this JID. */
+        GET_BUDDY_BARE = 8,     /* Get the bare version of the JID (possibly inexistent). */
+        GET_BUDDY_BARE_OK = 16, /* Allow returning a bare JID if that seems better. */
 } get_buddy_flags_t;
 

protocols/jabber/jabber_util.c

@@ -4 +4 @@
 *  Jabber module - Misc. stuff                                              *
 *                                                                           *
-*  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
+*  Copyright 2006-2010 Wilmer van der Gaast <wilmer@gaast.net>              
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
@@ -345 +345 @@
         if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
         {
+                /* The first entry is always a bare JID. If there are more, we
+                   should ignore the first one here. */
+                if( bud->next )
+                        bud = bud->next;
+                
                 /* If this is a transport buddy or whatever, it can't have more
                    than one instance, so this is always wrong: */
@@ -379 +384 @@
         else
         {
-                /* Keep in mind that full_jid currently isn't really
-                   a full JID... */
-                new->bare_jid = g_strdup( full_jid );
+                new->full_jid = new->bare_jid = g_strdup( full_jid );
                 g_hash_table_insert( jd->buddies, new->bare_jid, new );
+                
+                if( s )
+                {
+                        new->next = g_new0( struct jabber_buddy, 1 );
+                        new->next->bare_jid = new->bare_jid;
+                        new = new->next;
+                }
         }
         
@@ -408 +418 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud;
+        struct jabber_buddy *bud, *head;
         char *s, *jid;
         
@@ -420 +430 @@
                 if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) )
                 {
+                        bare_exists = 1;
+                        
+                        if( bud->next )
+                                bud = bud->next;
+                        
                         /* Just return the first one for this bare JID. */
                         if( flags & GET_BUDDY_FIRST )
@@ -441 +456 @@
                                         break;
                 }
-                else
-                {
-                        /* This variable tells the if down here that the bare
-                           JID already exists and we should feel free to add
-                           more resources, if the caller asked for that. */
-                        bare_exists = 1;
-                }
                 
                 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( !bare_exists || imcb_find_buddy( ic, jid ) ) )
+                    ( bare_exists || imcb_find_buddy( ic, jid ) ) )
                 {
                         *s = '/';
@@ -464 +472 @@
                 char *set;
                 
-                bud = g_hash_table_lookup( jd->buddies, jid );
+                head = g_hash_table_lookup( jd->buddies, jid );
+                bud = ( head && head->next ) ? head->next : head;
                 
                 g_free( jid );
@@ -481 +490 @@
                         /* Looks like the caller doesn't care about details. */
                         return bud;
+                else if( flags & GET_BUDDY_BARE )
+                        return head;
                 
                 best_prio = best_time = bud;
@@ -487 +498 @@
                         if( bud->priority > best_prio->priority )
                                 best_prio = bud;
-                        if( bud->last_act > best_time->last_act )
+                        if( bud->last_msg > best_time->last_msg )
                                 best_time = bud;
                 }
@@ -493 +504 @@
                 if( ( set = set_getstr( &ic->acc->set, "resource_select" ) ) == NULL )
                         return NULL;
-                else if( strcmp( set, "activity" ) == 0 )
+                else if( strcmp( set, "priority" ) == 0 )
+                        return best_prio;
+                else if( flags & GET_BUDDY_BARE_OK ) /* && strcmp( set, "activity" ) == 0 */
+                {
+                        if( best_time->last_msg + set_getint( &ic->acc->set, "activity_timeout" ) >= time( NULL ) )
+                                return best_time;
+                        else
+                                return head;
+                }
+                else
                         return best_time;
-                else /* if( strcmp( set, "priority" ) == 0 ) */
-                        return best_prio;
         }
 }
@@ -538 +556 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud, *prev, *bi;
+        struct jabber_buddy *bud, *prev = NULL, *bi;
         char *s, *full_jid;
         
@@ -548 +566 @@
         if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
         {
+                if( bud->next )
+                        bud = (prev=bud)->next;
+                
                 /* If there's only one item in the list (and if the resource
                    matches), removing it is simple. (And the hash reference
@@ -555 +576 @@
                       ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) )
                 {
-                        g_hash_table_remove( jd->buddies, bud->bare_jid );
-                        g_free( bud->bare_jid );
-                        g_free( bud->ext_jid );
-                        g_free( bud->full_jid );
-                        g_free( bud->away_message );
-                        g_free( bud );
-                        
-                        g_free( full_jid );
-                        
-                        return 1;
+                        return jabber_buddy_remove_bare( ic, full_jid );
                 }
                 else if( s == NULL || bud->resource == NULL )
@@ -575 +587 @@
                 else
                 {
-                        for( bi = bud, prev = NULL; bi; bi = (prev=bi)->next )
+                        for( bi = bud; bi; bi = (prev=bi)->next )
                                 if( strcmp( bi->resource, s + 1 ) == 0 )
                                         break;
@@ -586 +598 @@
                                         prev->next = bi->next;
                                 else
-                                        /* The hash table should point at the second
-                                           item, because we're removing the first. */
+                                        /* Don't think this should ever happen anymore. */
                                         g_hash_table_replace( jd->buddies, bi->bare_jid, bi->next );
                                 
@@ -656 +667 @@
 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 )
@@ -677 +687 @@
         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

@@ -71 +71 @@
                         if( bud )
                         {
-                                bud->last_act = time( NULL );
+                                bud->last_msg = time( NULL );
                                 from = bud->ext_jid ? : bud->bare_jid;
                         }
@@ -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/presence.c

@@ -68 +68 @@
                 {
                         bud->away_state = NULL;
-                        /* Let's only set last_act if there's *no* away state,
-                           since it could be some auto-away thingy. */
-                        bud->last_act = time( NULL );
                 }
                 

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 );
 }
 
@@ -167 +165 @@
 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 );
 }
 
@@ -283 +281 @@
 }
 
-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 )
@@ -301 +295 @@
                 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/"
@@ -83 +88 @@
         gint inp;
         struct msn_handler_data *handler;
+        gint keepalive;
         
         int trId;
@@ -161 +167 @@
 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 */
@@ -179 +186 @@
 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 );
 
 #endif //_MSN_H

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 )
@@ -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" );
@@ -422 +408 @@
         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 )
@@ -449 +439 @@
                                    ( 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 )
@@ -553 +545 @@
                 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 )
         {
@@ -583 +578 @@
                 }
         }
+#endif
         else if( strcmp( cmd[0], "IPG" ) == 0 )
         {
@@ -732 +728 @@
         }
 }
+
+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

@@ -168 +168 @@
                 
                 /* Build the message. Convert LF to CR-LF for normal messages. */
-                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
+                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) == 0 )
+                {
+                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
+                        buf = g_new0( char, i );
+                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
+                }
+                else if( strcmp( text, SB_KEEPALIVE_MESSAGE ) == 0 )
+                {
+                        buf = g_strdup( SB_KEEPALIVE_HEADERS );
+                        i = strlen( buf );
+                }
+                else
                 {
                         buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
@@ -182 +193 @@
                         }
                 }
-                else
-                {
-                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
-                        buf = g_new0( char, i );
-                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
-                }
                 
                 /* Build the final packet (MSG command + the message). */
@@ -250 +255 @@
         
         msn_msgq_purge( ic, &sb->msgq );
+        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -471 +477 @@
                 
                 sb->ready = 1;
+                
+                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -520 +528 @@
                         }
                         
+                        msn_sb_start_keepalives( sb, FALSE );
+                        
                         return( st );
                 }
@@ -581 +591 @@
                 if( sb->who )
                 {
+                        msn_sb_stop_keepalives( sb );
+                        
                         /* This is a single-person chat, and the other person is leaving. */
                         g_free( sb->who );
@@ -764 +776 @@
         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;
@@ -132 +133 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
+        extern void twitter_initmodule();
 
 #ifdef WITH_MSN
@@ -147 +149 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
+#endif
+
+#ifdef WITH_TWITTER
+        twitter_initmodule();
 #endif
 
@@ -727 +733 @@
 {
         irc_t *irc = ic->irc;
-        char *wrapped;
+        char *wrapped, *ts = NULL;
         user_t *u;
 
@@ -776 +782 @@
             ( ( 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( msg );
+        g_free( ts );
 }
 
@@ -822 +837 @@
         
         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 );
+                }
+        }
 }
 
@@ -884 +928 @@
         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
@@ -1021 +1069 @@
 
 
+/* Misc. BitlBee stuff which shouldn't really be here */
+
+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, 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
    them all from some wrappers. We'll start to define some down here: */
@@ -1063 +1202 @@
 {
         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

@@ -306 +306 @@
  *   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. */
@@ -328 +329 @@
 
 /* Misc. stuff */
+char *set_eval_timezone( set_t *set, char *value );
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
 void cancel_auto_reconnect( struct account *a );

protocols/oscar/oscar.c

@@ -373 +373 @@
         set_t *s;
         
-        s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
+        if (isdigit(acc->user[0])) {
+                set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
+        }
+        
+        s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc);
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
-        if (isdigit(acc->user[0])) {
-                s = set_add( &acc->set, "web_aware", "false", set_eval_bool, acc );
+        if(isdigit(acc->user[0])) {
+                s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc);
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
@@ -1212 +1216 @@
  */
 static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) {
-        struct icq_auth *data = g_new(struct icq_auth, 1);
+        struct icq_auth *data;
         char *reason = NULL;
         char *dialog_msg;
-        
+
+        if (set_getbool(&ic->acc->set, "ignore_auth_requests"))
+                return;
+        
+        data = g_new(struct icq_auth, 1);
+
         if (strlen(msg) > 6)
                 reason = msg + 6;

root_commands.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -659 +659 @@
                 irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
         }
+        else if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+        {
+                if( strchr( CTYPES, cmd[2][0] ) && nick_ok( cmd[2] + 1 ) )
+                {
+                        u = user_find( irc, irc->nick );
+                        
+                        irc_part( irc, u, irc->channel );
+                        g_free( irc->channel );
+                        irc->channel = g_strdup( cmd[2] );
+                        irc_join( irc, u, irc->channel );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "control_channel", cmd[2] );
+                }
+        }
         else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
         {
@@ -706 +721 @@
         
         return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
+}
+
+char *set_eval_control_channel( set_t *set, char *new_name )
+{
+        irc_t *irc = set->data;
+        
+        if( strcmp( irc->channel, new_name ) != 0 )
+        {
+                char *cmd[] = { "set_rename", irc->channel, new_name, NULL };
+                
+                cmd_rename( irc, cmd );
+        }
+        
+        return strcmp( irc->channel, new_name ) == 0 ? new_name : SET_INVALID;
 }
 

storage_xml.c

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

tests/check_jabber_util.c

@@ -14 +14 @@
         
         budw1 = jabber_buddy_add( ic, "wilmer@gaast.net/BitlBee" );
-        budw1->last_act = time( NULL ) - 100;
+        budw1->last_msg = time( NULL ) - 100;
         budw2 = jabber_buddy_add( ic, "WILMER@gaast.net/Telepathy" );
         budw2->priority = 2;
-        budw2->last_act = time( NULL );
+        budw2->last_msg = time( NULL );
         budw3 = jabber_buddy_add( ic, "wilmer@GAAST.NET/bitlbee" );
-        budw3->last_act = time( NULL ) - 200;
+        budw3->last_msg = time( NULL ) - 200;
         budw3->priority = 4;
         /* TODO(wilmer): Shouldn't this just return budw3? */
@@ -60 +60 @@
         fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/Telepathy" ) );
         fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/telepathy" ) );
-        fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) == budw1 );
+        
+        /* Test activity_timeout and GET_BUDDY_BARE_OK. */
+        fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) == budw1 );
+        budw1->last_msg -= 50;
+        fail_unless( ( bud = jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) ) != NULL );
+        fail_unless( strcmp( bud->full_jid, "wilmer@gaast.net" ) == 0 );
         
         fail_if( jabber_buddy_remove( ic, "wilmer@gaast.net" ) );
         fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) == budw1 );
         
+        fail_if( jabber_buddy_remove( ic, "wilmer@gaast.net" ) );
+        fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/bitlbee" ) );
+        fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/BitlBee" ) );
+        fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) );
+        
         /* Check if remove_bare() indeed gets rid of all. */
+        /* disable this one for now.
         fail_unless( jabber_buddy_remove_bare( ic, "wilmer@gaast.net" ) );
         fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) );
+        */
 
         fail_if( jabber_buddy_remove( ic, "nekkid@lamejab.net/Illegal" ) );
         fail_unless( jabber_buddy_remove( ic, "nekkid@lamejab.net" ) );
         fail_if( jabber_buddy_by_jid( ic, "nekkid@lamejab.net", 0 ) );
+        
+        /* Fixing a bug in this branch that caused information to get lost when
+           removing the first full JID from a list. */
+        jabber_buddy_add( ic, "bugtest@google.com/A" );
+        jabber_buddy_add( ic, "bugtest@google.com/B" );
+        jabber_buddy_add( ic, "bugtest@google.com/C" );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/A" ) );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/B" ) );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/C" ) );
 }
 
@@ -85 +106 @@
         jd->buddies = g_hash_table_new( g_str_hash, g_str_equal );
         set_add( &ic->acc->set, "resource_select", "priority", NULL, ic->acc );
+        set_add( &ic->acc->set, "activity_timeout", "120", NULL, ic->acc );
         
         suite_add_tcase (s, tc_core);

unix.c

@@ -83 +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 );
@@ -106 +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 )