Changes in / [ae3dc99:b5b40ff]

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (5 diffs)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (2 diffs)
• configure (modified) (7 diffs)
• debian/bitlbee.init (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/rules (modified) (1 diff)
• doc/CHANGES (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (7 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_util.c (modified) (2 diffs)
• protocols/jabber/message.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) (6 diffs)
• protocols/nogaim.c (modified) (9 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/twitter/Makefile (deleted)
• protocols/twitter/twitter.c (deleted)
• protocols/twitter/twitter.h (deleted)
• protocols/twitter/twitter_http.c (deleted)
• protocols/twitter/twitter_http.h (deleted)
• protocols/twitter/twitter_lib.c (deleted)
• protocols/twitter/twitter_lib.h (deleted)
• storage_xml.c (modified) (1 diff)
• unix.c (modified) (2 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()
 {
@@ -79 +42 @@
         FILE *fp;
         
-        log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
-        log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
+        log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+        log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
         
         memset( &hints, 0, sizeof( hints ) );
@@ -100 +63 @@
 
         global.listen_socket = -1;
-        
-        /* Try IPv6 first (which will become an IPv6+IPv4 socket). */
+
         for( res = addrinfo_bind; res; res = res->ai_next )
-                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;
-        
+        {
+                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;
+        }
+
         freeaddrinfo( addrinfo_bind );
 
@@ -135 +107 @@
                         exit( 0 );
                 
-                setsid();
                 chdir( "/" );
                 
@@ -166 +137 @@
 #endif
         
-        if( !global.conf->nofork )
-        {
-                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
-        }
-        
         return( 0 );
 }

bitlbee.h

@@ -35 +35 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.6a"
+#define BITLBEE_VERSION "1.2.5"
 #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:V" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 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"
-                                "  -V  Show version info.\n" );
-                        return NULL;
-                }
-                else if( opt == 'V' )
-                {
-                        printf( "BitlBee %s\nAPI version %06x\n",
-                                BITLBEE_VERSION, BITLBEE_VERSION_CODE );
+                                "  -h  Show this help page.\n" );
                         return NULL;
                 }

configure

@@ -26 +26 @@
 oscar=1
 yahoo=1
-twitter=1
 purple=0
 
@@ -68 +67 @@
 --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
@@ -272 +270 @@
 detect_ldap()
 {
-        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        TMPFILE=$(mktemp)
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -300 +298 @@
 detect_resolv_dynamic()
 {
-        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        TMPFILE=$(mktemp)
         ret=1
         echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
@@ -314 +312 @@
 detect_resolv_static()
 {
-        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        TMPFILE=$(mktemp)
         ret=1
         for i in $systemlibdirs; do
@@ -481 +479 @@
 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
@@ -567 +551 @@
 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 $PIDFILE
-        chown bitlbee: $PIDFILE
+        touch /var/run/bitlbee.pid
+        chown bitlbee: /var/run/bitlbee.pid
         
         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/rules

@@ -100 +100 @@
                 find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
 
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0
+        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
 
         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:
@@ -50 +23 @@
   the main client).
 
-Finished 17 Mar 2010
+Fixed 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), Yahoo and Twitter. 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) and Yahoo. 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">
@@ -419 +401 @@
 
         <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
-                <default>true</default>
+                <default>false</default>
 
                 <description>
@@ -574 +556 @@
                         <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>
@@ -637 +609 @@
         </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>
@@ -654 +615 @@
                         <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="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>
@@ -883 +824 @@
                         <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

@@ -53 +53 @@
 {
         irc_t *irc = set->data;
-        char *test;
-        gsize test_bytes = 0;
         GIConv ic, oc;
 
@@ -60 +58 @@
                 value = g_strdup( "utf-8" );
 
+        if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
+        {
+                return NULL;
+        }
         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 )
-        {
-                g_iconv_close( oc );
+                g_iconv_close( ic );
                 return NULL;
         }
@@ -192 +176 @@
         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 );
@@ -206 +189 @@
         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 );

irc_commands.c

@@ -498 +498 @@
                         irc_reply( irc, 301, "%s :%s", u->nick, u->away );
                 if( u->status_msg )
-                        irc_reply( irc, 320, "%s :%s", u->nick, u->status_msg );
+                        irc_reply( irc, 333, "%s :Status: %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_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 )
@@ -691 +692 @@
         tp.tm_year -= 1900;
         tp.tm_mon --;
-        
-        return mktime_utc( &tp );
+        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;
 }
 

protocols/jabber/message.c

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

protocols/msn/msn.c

@@ -31 +31 @@
 GSList *msn_switchboards;
 
-static char *set_eval_display_name( set_t *set, char *value );
+static char *msn_set_display_name( set_t *set, char *value );
 
 static void msn_init( account_t *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 );
+        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 );
 }
 
@@ -169 +171 @@
 static void msn_set_my_name( struct im_connection *ic, char *info )
 {
-        msn_set_display_name( ic, info );
+        msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );
 }
 
@@ -285 +287 @@
 }
 
-static char *set_eval_display_name( set_t *set, char *value )
+static char *msn_set_display_name( set_t *set, char *value )
 {
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        
-        /* Allow any name if we're offline. */
+        struct msn_data *md;
+        char buf[1024], *fn;
+        
+        /* Double-check. */
         if( ic == NULL )
-                return value;
+                return NULL;
+        
+        md = ic->proto_data;
         
         if( strlen( value ) > 129 )
@@ -299 +305 @@
                 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 msn_set_display_name( ic, value ) ? value : NULL;
+        return value;
 }
 

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
@@ -54 +53 @@
                            "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/"
@@ -89 +84 @@
         gint inp;
         struct msn_handler_data *handler;
-        gint keepalive;
         
         int trId;
@@ -168 +162 @@
 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 */
@@ -187 +180 @@
 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 )
@@ -232 +231 @@
                 else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
+                        set_t *s;
+                        
                         if( num_parts == 7 )
-                                msn_ns_got_display_name( ic, cmd[4] );
+                        {
+                                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] );
+                                }
+                        }
                         else
+                        {
                                 imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
+                        }
                         
                         imcb_log( ic, "Authenticated, getting buddy list" );
@@ -422 +436 @@
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
-                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 );
+                if( cmd[1] )
+                        imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
@@ -453 +463 @@
                                    ( 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 )
@@ -559 +567 @@
                 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 )
         {
@@ -592 +597 @@
                 }
         }
-#endif
         else if( strcmp( cmd[0], "IPG" ) == 0 )
         {
@@ -742 +746 @@
         }
 }
-
-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
                 {
@@ -261 +256 @@
         
         msn_msgq_purge( ic, &sb->msgq );
-        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -483 +477 @@
                 
                 sb->ready = 1;
-                
-                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -534 +526 @@
                         }
                         
-                        msn_sb_start_keepalives( sb, FALSE );
-                        
                         return( st );
                 }
@@ -597 +587 @@
                 if( sb->who )
                 {
-                        msn_sb_stop_keepalives( sb );
-                        
                         /* This is a single-person chat, and the other person is leaving. */
                         g_free( sb->who );
@@ -761 +749 @@
         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;
@@ -136 +135 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
-        extern void twitter_initmodule();
         extern void purple_initmodule();
 
@@ -153 +151 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
-#endif
-
-#ifdef WITH_TWITTER
-        twitter_initmodule();
 #endif
         
@@ -732 +726 @@
 {
         irc_t *irc = ic->irc;
-        char *wrapped, *ts = NULL;
+        char *wrapped;
         user_t *u;
         
@@ -774 +768 @@
             ( ( 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 );
 }
 
@@ -828 +813 @@
         
         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 );
-                }
-        }
 }
 
@@ -919 +875 @@
         if( c && u )
         {
-                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 );
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
         }
         else
@@ -1117 +1069 @@
 }
 
-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
@@ -1247 +1113 @@
 {
         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

@@ -308 +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. */
@@ -331 +330 @@
 
 /* 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 );

storage_xml.c

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

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_CONSOLE );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
 
                 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 );
@@ -109 +106 @@
                 
                 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 )