Changeset 9779c18

Timestamp:

2006-06-03T20:20:43Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

5973412

Parents:

a15c097 (diff), fb62f81f (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] Wilmer

Files:

• account.c (modified) (2 diffs)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (2 diffs)
• conf.c (modified) (1 diff)
• configure (modified) (3 diffs)
• doc/README (modified) (1 diff)
• doc/bitlbee.8 (modified) (1 diff)
• doc/bitlbee.xinetd (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (3 diffs)
• ipc.c (modified) (2 diffs)
• ipc.h (modified) (1 diff)
• irc.c (modified) (23 diffs)
• irc.h (modified) (2 diffs)
• irc_commands.c (modified) (5 diffs)
• log.h (modified) (1 diff)
• protocols/http_client.c (modified) (13 diffs)
• protocols/http_client.h (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (5 diffs)
• protocols/jabber/xmlparse.c (modified) (4 diffs)
• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/msn/passport.c (modified) (9 diffs)
• protocols/msn/passport.h (modified) (1 diff)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/msn/tables.c (modified) (1 diff)
• protocols/nogaim.c (modified) (17 diffs)
• protocols/nogaim.h (modified) (12 diffs)
• protocols/oscar/aim.h (modified) (1 diff)
• protocols/oscar/chat.c (modified) (1 diff)
• protocols/oscar/im.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (12 diffs)
• protocols/oscar/oscar_util.c (modified) (2 diffs)
• protocols/oscar/service.c (modified) (3 diffs)
• protocols/ssl_nss.c (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (2 diffs)
• query.c (modified) (1 diff)
• root_commands.c (modified) (9 diffs)
• set.c (modified) (1 diff)
• user.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (added)
• utils/bitlbeed.c (modified) (1 diff)

account.c

@@ -53 +53 @@
 {
         account_t *a, *ret = NULL;
+        char *handle, *s;
         int nr;
+        
+        /* This checks if the id string ends with (...) */
+        if( ( handle = strchr( id, '(' ) ) && ( s = strchr( handle, ')' ) ) && s[1] == 0 )
+        {
+                struct prpl *proto;
+                
+                *s = *handle = 0;
+                handle ++;
+                
+                if( ( proto = find_protocol( id ) ) )
+                {
+                        for( a = irc->accounts; a; a = a->next )
+                                if( a->prpl == proto &&
+                                    a->prpl->cmp_buddynames( handle, a->user ) == 0 )
+                                        ret = a;
+                }
+                
+                /* Restore the string. */
+                handle --;
+                *handle = '(';
+                *s = ')';
+                
+                if( ret )
+                        return ret;
+        }
         
         if( sscanf( id, "%d", &nr ) == 1 && nr < 1000 )
@@ -141 +167 @@
 void account_off( irc_t *irc, account_t *a )
 {
-        account_offline( a->gc );
+        a->gc->wants_to_die = TRUE;
+        signoff( a->gc );
         a->gc = NULL;
         if( a->reconnect )

bitlbee.c

@@ -111 +111 @@
                    BitlBee process. So let's only close TTY-fds. */
                 if( isatty( 0 ) ) close( 0 );
-                if( isatty( 0 ) ) close( 1 );
-                if( isatty( 0 ) ) close( 2 );
+                if( isatty( 1 ) ) close( 1 );
+                if( isatty( 2 ) ) close( 2 );
         }
 #endif

bitlbee.h

@@ -111 +111 @@
 #include "query.h"
 #include "sock.h"
+#include "util.h"
 
 typedef struct global {
@@ -133 +134 @@
 void root_command( irc_t *irc, char *command[] );
 void bitlbee_shutdown( gpointer data );
-double gettime( void );
-G_MODULE_EXPORT void http_encode( char *s );
-G_MODULE_EXPORT void http_decode( char *s );
-G_MODULE_EXPORT char *strip_newlines(char *source);
 
 extern global_t global;

conf.c

@@ -95 +95 @@
                         conf->port = i;
                 }
-                else if( opt == 'p' )
+                else if( opt == 'P' )
                 {
                         g_free( conf->pidfile );

configure

@@ -171 +171 @@
 CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
 EOF
-        echo '#define GLIB2' >> config.h
-elif type glib-config > /dev/null 2> /dev/null; then
-        cat<<EOF>>Makefile.settings
-EFLAGS+=`glib-config --libs`
-CFLAGS+=`glib-config --cflags`
-EOF
-        echo '#define GLIB1' >> config.h
-else
-        echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
+else
+        echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
         exit 1;
 fi
-
-if [ -r /usr/include/iconv.h ]; then
-        :;
-elif [ -r /usr/local/include/iconv.h ]; then
-        echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
-else
-        echo
-        echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-        echo 'Makefile.settings to tell where this file is.';
-fi
-
 
 detect_gnutls()
@@ -333 +315 @@
 
 echo
-if [ -z "$BITLBEE_VERSION" -a -d .bzr -a -x "`which bzr`" ]; then
+if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
+        nick=`bzr nick`
+        if [ -n "$nick" -a "$nick" != "bitlbee" ]; then
+                nick="-$nick"
+        else
+                nick=""
+        fi
         rev=`bzr revno`
         echo 'Using bzr revision #'$rev' as version number'
-        BITLBEE_VERSION=\"bzr-$rev\"
+        BITLBEE_VERSION=\"bzr$nick-$rev\"
 fi
 
@@ -409 +397 @@
 ;;
 *BSD )
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
+;;
+Darwin )
+;;
+IRIX )
 ;;
 SunOS )
         echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
         echo 'STRIP=\# skip strip' >> Makefile.settings
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
-;;
-Darwin )
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
-;;
-IRIX )
 ;;
 CYGWIN* )

doc/README

@@ -47 +47 @@
 
 BitlBee's only real dependency is GLib. This is available on virtually every
-platform. Any recent version of GLib (including 1.x versions) will work.
+platform. Any recent version of GLib (2.0 or higher) will work.
 
 These days, MSN Messenger clients have to connect to the MS Passport servers

doc/bitlbee.8

@@ -116 +116 @@
 .SH AUTHORS
 .PP
- Wilmer van der Gaast <lintux@lintux.cx>
+ Wilmer van der Gaast <wilmer@gaast.net>
 .BR
  Jelmer Vernooij <jelmer@vernstok.nl>

doc/bitlbee.xinetd

@@ -14 +14 @@
         server          = /usr/local/sbin/bitlbee
         
-        ## xinetd is fucking retarded, what's the use of this port flag if
-        ## it HAS to be the same as in /etc/services ?
-        # port          = 6667
+        ## You might want to limit access to localhost only:
+        # bind            = 127.0.0.1
+        
+        ## Thanks a lot to friedman@splode.com for telling us about the type
+        ## argument, so now this file can be used without having to edit
+        ## /etc/services too.
+        type            = UNLISTED
+        port            = 6667
 }

doc/user-guide/commands.xml

@@ -141 +141 @@
                 <short-description>Add a buddy to your contact list</short-description>
                 <syntax>add &lt;connection&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
+                <syntax>add -tmp &lt;connection&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
 
                 <description>
@@ -149 +150 @@
                         <para>
                                 If you want, you can also tell BitlBee what nick to give the new contact. Of course you can also use the <emphasis>rename</emphasis> command for that, but sometimes this might be more convenient.
+                        </para>
+                        
+                        <para>
+                                Adding -tmp adds the buddy to the internal BitlBee structures only, not to the real contact list (like done by <emphasis>set handle_unknown add</emphasis>). This allows you to talk to people who are not in your contact list.
                         </para>
                 </description>
@@ -616 +621 @@
 
                         <para>
-                                To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command.
+                                To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command. To change your password later, you can use the <emphasis>set password</emphasis> command.
                         </para>
                 </description>

ipc.c

@@ -507 +507 @@
         }
 
-        if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
+        if (bind(serversock, (struct sockaddr *)&un_addr, sizeof(un_addr)) == -1) {
                 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
                 return 0;
@@ -571 +571 @@
         ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" );
         
+        fclose( fp );
         return 1;
 }

ipc.h

@@ -47 +47 @@
 
 void ipc_to_master( char **cmd );
-void ipc_to_master_str( char *format, ... );
+void ipc_to_master_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 void ipc_to_children( char **cmd );
-void ipc_to_children_str( char *format, ... );
+void ipc_to_children_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 
 /* We need this function in inetd mode, so let's just make it non-static. */

irc.c

@@ -55 +55 @@
         irc->fd = fd;
         irc->io_channel = g_io_channel_unix_new( fd );
-#ifdef GLIB2
         g_io_channel_set_encoding (irc->io_channel, NULL, NULL);
         g_io_channel_set_buffered (irc->io_channel, FALSE);
         g_io_channel_set_flags( irc->io_channel, G_IO_FLAG_NONBLOCK, NULL );
-#else
-        fcntl( irc->fd, F_SETFL, O_NONBLOCK);
-#endif
         irc->r_watch_source_id = g_io_add_watch( irc->io_channel, G_IO_IN | G_IO_ERR | G_IO_HUP, bitlbee_io_current_client_read, irc );
         
@@ -199 +195 @@
 }
 
-static gboolean irc_free_userhash( gpointer key, gpointer value, gpointer data )
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
 {
         g_free( key );
@@ -233 +229 @@
         
         for (account = irc->accounts; account; account = account->next) {
-                if (account->gc)
-                        account_offline(account->gc);
-                else if (account->reconnect)
-                        g_source_remove(account->reconnect);
+                if (account->gc) {
+                        account->gc->wants_to_die = TRUE;
+                        signoff(account->gc);
+                } else if (account->reconnect) {
+                        cancel_auto_reconnect(account);
+                }
         }
         
@@ -285 +283 @@
         }
         
-        g_hash_table_foreach_remove(irc->userhash, irc_free_userhash, NULL);
+        g_hash_table_foreach_remove(irc->userhash, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->userhash);
         
-        g_hash_table_foreach_remove(irc->watches, irc_free_userhash, NULL);
+        g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->watches);
         
@@ -346 +344 @@
 void irc_process( irc_t *irc )
 {
-        char **lines, *temp, **cmd;
+        char **lines, *temp, **cmd, *cs;
         int i;
 
@@ -355 +353 @@
                 for( i = 0; *lines[i] != '\0'; i ++ )
                 {
+                        char conv[IRC_MAX_LINE+1];
+                        
+                        /* [WvG] Because irc_tokenize splits at every newline, the lines[] list
+                            should end with an empty string. This is why this actually works.
+                            Took me a while to figure out, Maurits. :-P */
                         if( lines[i+1] == NULL )
                         {
@@ -362 +365 @@
                                 i ++;
                                 break;
-                        }                       
+                        }
+                        
+                        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        {
+                                conv[IRC_MAX_LINE] = 0;
+                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
+                                        lines[i] = conv;
+                        }
                         
                         if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
@@ -388 +398 @@
 }
 
+/* Splits a long string into separate lines. The array is NULL-terminated and, unless the string
+   contains an incomplete line at the end, ends with an empty string. */
 char **irc_tokenize( char *buffer )
 {
@@ -428 +440 @@
 }
 
+/* Split an IRC-style line into little parts/arguments. */
 char **irc_parse_line( char *line )
 {
@@ -487 +500 @@
 }
 
+/* Converts such an array back into a command string. Mainly used for the IPC code right now. */
 char *irc_build_line( char **cmd )
 {
@@ -539 +553 @@
         
         u = user_find( irc, irc->mynick );
-        if( u ) is_private = u->is_private;
+        is_private = u->is_private;
         
         va_start( params, format );
@@ -563 +577 @@
 {
         int size;
-        char line[IRC_MAX_LINE];
-        
+        char line[IRC_MAX_LINE+1], *cs;
+                
         if( irc->quit )
                 return;
-
-        g_vsnprintf( line, IRC_MAX_LINE - 3, format, params );
-
+        
+        line[IRC_MAX_LINE] = 0;
+        g_vsnprintf( line, IRC_MAX_LINE - 2, format, params );
+        
         strip_newlines( line );
+        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+        {
+                char conv[IRC_MAX_LINE+1];
+                
+                conv[IRC_MAX_LINE] = 0;
+                if( do_iconv( "UTF-8", cs, line, conv, 0, IRC_MAX_LINE - 2 ) != -1 )
+                        strcpy( line, conv );
+        }
         strcat( line, "\r\n" );
-
+        
         if( irc->sendbuffer != NULL ) {
                 size = strlen( irc->sendbuffer ) + strlen( line );
@@ -803 +826 @@
                         irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title );
                 else
-                        irc_reply( irc, 331, "%s :No topic for this channel" );
+                        irc_reply( irc, 331, "%s :No topic for this channel", channel );
         }
 }
@@ -859 +882 @@
         if( g_hash_table_lookup( irc->watches, nick ) )
         {
-                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged online" );
+                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged online" );
         }
         g_free( nick );
@@ -876 +899 @@
 void irc_kill( irc_t *irc, user_t *u )
 {
-        char *nick;
-        
-        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, "Leaving..." );
+        char *nick, *s;
+        char reason[64];
+        
+        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
+        {
+                if( u->gc->user->proto_opt[0][0] )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    u->gc->user->proto_opt[0] );
+                else if( ( s = strchr( u->gc->username, '@' ) ) )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    s + 1 );
+                else
+                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
+                                    u->gc->prpl->name, irc->myhost );
+                
+                /* proto_opt might contain garbage after the : */
+                if( ( s = strchr( reason, ':' ) ) )
+                        *s = 0;
+        }
+        else
+        {
+                strcpy( reason, "Leaving..." );
+        }
+        
+        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
         
         nick = g_strdup( u->nick );
@@ -884 +929 @@
         if( g_hash_table_lookup( irc->watches, nick ) )
         {
-                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged offline" );
+                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged offline" );
         }
         g_free( nick );
@@ -984 +1029 @@
         else if( c && c->gc && c->gc->prpl )
         {
-                return( serv_send_chat( irc, c->gc, c->id, s ) );
+                return( bim_chat_msg( c->gc, c->id, s ) );
         }
         
@@ -994 +1039 @@
         user_t *u = data;
         
+        /* Shouldn't happen, but just to be sure. */
+        if( u->sendbuf_len < 2 )
+                return FALSE;
+        
         u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
-        serv_send_im( u->gc->irc, u, u->sendbuf, u->sendbuf_flags );
+        bim_buddy_msg( u->gc, u->handle, u->sendbuf, u->sendbuf_flags );
         
         g_free( u->sendbuf );
@@ -1003 +1052 @@
         u->sendbuf_flags = 0;
         
-        return( FALSE );
+        return FALSE;
 }
 
@@ -1016 +1065 @@
                 if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
                 {
-                        //Flush the buffer
+                        /* Flush the buffer */
                         g_source_remove( u->sendbuf_timer );
                         buddy_send_handler_delayed( u );
@@ -1024 +1073 @@
                 {
                         u->sendbuf_len = strlen( msg ) + 2;
-                        u->sendbuf = g_new (char, u->sendbuf_len );
+                        u->sendbuf = g_new( char, u->sendbuf_len );
                         u->sendbuf[0] = 0;
                         u->sendbuf_flags = flags;
@@ -1031 +1080 @@
                 {
                         u->sendbuf_len += strlen( msg ) + 1;
-                        u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );
+                        u->sendbuf = g_renew( char, u->sendbuf, u->sendbuf_len );
                 }
                 
@@ -1047 +1096 @@
         else
         {
-                serv_send_im( irc, u, msg, flags );
+                bim_buddy_msg( u->gc, u->handle, msg, flags );
         }
 }

irc.h

@@ -105 +105 @@
 
 irc_t *irc_new( int fd );
-void irc_abort( irc_t *irc, int immed, char *format, ... );
+void irc_abort( irc_t *irc, int immed, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
 void irc_free( irc_t *irc );
 
@@ -114 +114 @@
 
 void irc_vawrite( irc_t *irc, char *format, va_list params );
-void irc_write( irc_t *irc, char *format, ... );
-void irc_write_all( int now, char *format, ... );
-void irc_reply( irc_t *irc, int code, char *format, ... );
-G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... );
+void irc_write( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+void irc_write_all( int now, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+void irc_reply( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
+G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
 char **irc_tokenize( char *buffer );
 

irc_commands.c

@@ -177 +177 @@
                                 if( !u->gc->prpl->chat_open( u->gc, u->handle ) )
                                 {
-                                        irc_usermsg( irc, "Could not open a groupchat with %s, maybe you don't have a connection to him/her yet?", u->nick );
+                                        irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick );
                                 }
                         }
@@ -321 +321 @@
 {
         user_t *u;
-        char buff[IRC_MAX_LINE];
+        char buff[IRC_MAX_LINE], *s;
         int lenleft, i;
         
@@ -331 +331 @@
         for( i = 1; cmd[i]; i ++ )
         {
-                if( ( u = user_find( irc, cmd[i] ) ) && u->online )
-                {
-                        /* [SH] Make sure we don't use too much buffer space. */
-                        lenleft -= strlen( u->nick ) + 1;
-                        
-                        if( lenleft < 0 )
+                char *this, *next;
+                
+                this = cmd[i];
+                while( *this )
+                {
+                        if( ( next = strchr( this, ' ' ) ) )
+                                *next = 0;
+                        
+                        if( ( u = user_find( irc, this ) ) && u->online )
+                        {
+                                lenleft -= strlen( u->nick ) + 1;
+                                
+                                if( lenleft < 0 )
+                                        break;
+                                
+                                strcat( buff, u->nick );
+                                strcat( buff, " " );
+                        }
+                        
+                        if( next )
+                        {
+                                *next = ' ';
+                                this = next + 1;
+                        }
+                        else
                         {
                                 break;
-                        }
-                        
-                        /* [SH] Add the nick to the buffer. Note
-                         * that an extra space is always added. Even
-                         * if it's the last nick in the list. Who
-                         * cares?
-                         */
-                        
-                        strcat( buff, u->nick );
-                        strcat( buff, " " );
-                }
-        }
-        
-        /* [WvG] Well, maybe someone cares, so why not remove it? */
+                        }    
+                }
+                
+                /* *sigh* */
+                if( lenleft < 0 )
+                        break;
+        }
+        
         if( strlen( buff ) > 0 )
                 buff[strlen(buff)-1] = '\0';
@@ -385 +398 @@
                         
                         if( u && u->online )
-                                irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "is online" );
+                                irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );
                         else
-                                irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", time( NULL ), "is offline" );
+                                irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );
                 }
                 else if( cmd[i][0] == '-' )
@@ -448 +461 @@
                 
                 if( gc && gc->flags & OPT_LOGGED_IN )
-                        proto_away( gc, u->away );
+                        bim_set_away( gc, u->away );
         }
 }

log.h

@@ -54 +54 @@
 void log_init(void);
 void log_link(int level, int output);
-void log_message(int level, char *message, ...);
+void log_message(int level, char *message, ...) G_GNUC_PRINTF( 2, 3 );
 void log_error(char *functionname);
 

protocols/http_client.c

@@ -69 +69 @@
         
         return( req );
+}
+
+void *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
+{
+        url_t *url = g_new0( url_t, 1 );
+        char *request;
+        void *ret;
+        
+        if( !url_set( url, url_string ) )
+        {
+                g_free( url );
+                return NULL;
+        }
+        
+        if( url->proto != PROTO_HTTP && url->proto != PROTO_HTTPS )
+        {
+                g_free( url );
+                return NULL;
+        }
+        
+        request = g_strdup_printf( "GET %s HTTP/1.0\r\n"
+                                   "Host: %s\r\n"
+                                   "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n"
+                                   "\r\n", url->file, url->host );
+        
+        ret = http_dorequest( url->host, url->port,
+                              url->proto == PROTO_HTTPS, request, func, data );
+        
+        g_free( url );
+        g_free( request );
+        return ret;
 }
 
@@ -126 +157 @@
         
 error:
+        req->status_string = g_strdup( "Error while writing HTTP request" );
+        
         req->func( req );
         
@@ -185 +218 @@
                         if( !sockerr_again() )
                         {
+                                req->status_string = g_strdup( strerror( errno ) );
                                 goto cleanup;
                         }
@@ -209 +243 @@
 
 got_reply:
+        /* Maybe if the webserver is overloaded, or when there's bad SSL
+           support... */
+        if( req->bytes_read == 0 )
+        {
+                req->status_string = g_strdup( "Empty HTTP reply" );
+                goto cleanup;
+        }
+        
         /* Zero termination is very convenient. */
         req->reply_headers[req->bytes_read] = 0;
@@ -222 +264 @@
                 evil_server = 1;
         }
-        else
+        else if( end1 )
         {
                 end1 += 2;
         }
-        
-        if( end1 )
-        {
-                *end1 = 0;
-                
-                if( evil_server )
-                        req->reply_body = end1 + 1;
+        else
+        {
+                req->status_string = g_strdup( "Malformed HTTP reply" );
+                goto cleanup;
+        }
+        
+        *end1 = 0;
+        
+        if( evil_server )
+                req->reply_body = end1 + 1;
+        else
+                req->reply_body = end1 + 2;
+        
+        req->body_size = req->reply_headers + req->bytes_read - req->reply_body;
+        
+        if( ( end1 = strchr( req->reply_headers, ' ' ) ) != NULL )
+        {
+                if( sscanf( end1 + 1, "%d", &req->status_code ) != 1 )
+                {
+                        req->status_string = g_strdup( "Can't parse status code" );
+                        req->status_code = -1;
+                }
                 else
-                        req->reply_body = end1 + 2;
-        }
-        
-        if( ( end1 = strchr( req->reply_headers, ' ' ) ) != NULL )
-        {
-                if( sscanf( end1 + 1, "%d", &req->status_code ) != 1 )
-                        req->status_code = -1;
-        }
-        else
-        {
+                {
+                        char *eol;
+                        
+                        if( evil_server )
+                                eol = strchr( end1, '\n' );
+                        else
+                                eol = strchr( end1, '\r' );
+                        
+                        req->status_string = g_strndup( end1 + 1, eol - end1 - 1 );
+                        
+                        /* Just to be sure... */
+                        if( ( eol = strchr( req->status_string, '\r' ) ) )
+                                *eol = 0;
+                        if( ( eol = strchr( req->status_string, '\n' ) ) )
+                                *eol = 0;
+                }
+        }
+        else
+        {
+                req->status_string = g_strdup( "Can't locate status code" );
                 req->status_code = -1;
         }
@@ -252 +319 @@
                 int error = 0, new_port, new_proto;
                 
+                /* We might fill it again, so let's not leak any memory. */
+                g_free( req->status_string );
+                req->status_string = NULL;
+                
                 loc = strstr( req->reply_headers, "\nLocation: " );
                 if( loc == NULL ) /* We can't handle this redirect... */
+                {
+                        req->status_string = g_strdup( "Can't locate Location: header" );
                         goto cleanup;
+                }
                 
                 loc += 11;
@@ -271 +345 @@
                            don't need this yet anyway, I won't implement it. */
                         
+                        req->status_string = g_strdup( "Can't handle recursive redirects" );
+                        
                         goto cleanup;
                 }
@@ -288 +364 @@
                         if( !url_set( url, loc ) )
                         {
+                                req->status_string = g_strdup( "Malformed redirect URL" );
                                 g_free( url );
                                 goto cleanup;
@@ -298 +375 @@
                            going to use strcat(), whether you like it or not. :-) */
                         
-                        /* First, find the GET/POST/whatever from the original request. */
-                        s = strchr( req->request, ' ' );
+                        sprintf( new_request, "GET %s HTTP/1.0", url->file );
+                        
+                        s = strstr( req->request, "\r\n" );
                         if( s == NULL )
                         {
+                                req->status_string = g_strdup( "Error while rebuilding request string" );
                                 g_free( new_request );
                                 g_free( url );
@@ -307 +386 @@
                         }
                         
-                        *s = 0;
-                        sprintf( new_request, "%s %s HTTP/1.0\r\n", req->request, url->file );
-                        *s = ' ';
-                        
-                        s = strstr( req->request, "\r\n" );
-                        if( s == NULL )
-                        {
-                                g_free( new_request );
-                                g_free( url );
-                                goto cleanup;
-                        }
-                        
-                        strcat( new_request, s + 2 );
+                        strcat( new_request, s );
                         new_host = g_strdup( url->host );
                         new_port = url->port;
@@ -333 +400 @@
                 
                 req->fd = -1;
-                req->ssl = 0;
+                req->ssl = NULL;
                 
                 if( new_proto == PROTO_HTTPS )
@@ -351 +418 @@
                 if( error )
                 {
+                        req->status_string = g_strdup( "Connection problem during redirect" );
                         g_free( new_request );
                         goto cleanup;
@@ -379 +447 @@
         g_free( req->request );
         g_free( req->reply_headers );
+        g_free( req->status_string );
         g_free( req );
 }

protocols/http_client.h

@@ -37 +37 @@
         int request_length;
         int status_code;
+        char *status_string;
         char *reply_headers;
         char *reply_body;
+        int body_size;
         int finished;
         
@@ -53 +55 @@
 
 void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
+void *http_dorequest_url( char *url_string, http_input_function func, gpointer data );

protocols/jabber/jabber.c

@@ -1045 +1045 @@
          */
         if(find_buddy(GJ_GC(jap->gjc), jap->user) == NULL) {
-                show_got_added(GJ_GC(jap->gjc), NULL, jap->user, NULL, NULL);
+                show_got_added(GJ_GC(jap->gjc), jap->user, NULL);
         }
         g_free(jap->user);
@@ -1549 +1549 @@
         if(jd->gjc != NULL) {
                 gjab_delete(jd->gjc);
+                /* YAY for modules with their own memory pool managers!...
                 g_free(jd->gjc->sid);
+                And a less sarcastic yay for valgrind. :-) */
                 jd->gjc = NULL;
         }
@@ -1885 +1887 @@
 }
 
-static void jabber_set_idle(struct gaim_connection *gc, int idle) {
-        struct jabber_data *jd = (struct jabber_data *)gc->proto_data;
-        jd->idle = idle ? time(NULL) - idle : idle;
-}
-
 static void jabber_keepalive(struct gaim_connection *gc) {
         struct jabber_data *jd = (struct jabber_data *)gc->proto_data;
         gjab_send_raw(jd->gjc, "  \t  ");
-}
-
-static void jabber_buddy_free(struct buddy *b)
-{
-        while (b->proto_data) {
-                g_free(((GSList *)b->proto_data)->data);
-                b->proto_data = g_slist_remove(b->proto_data, ((GSList *)b->proto_data)->data);
-        }
 }
 
@@ -2338 +2327 @@
 }
 
-
-static GList *jabber_actions()
-{
-        GList *m = NULL;
-
-        m = g_list_append(m, _("Set User Info"));
-        /*
-        m = g_list_append(m, _("Set Dir Info"));
-        m = g_list_append(m, _("Change Password"));
-         */
-
-        return m;
-}
-
-
 void jabber_init()
 {
         struct prpl *ret = g_new0(struct prpl, 1);
 
-        /* the NULL's aren't required but they're nice to have */
         ret->name = "jabber";
         ret->away_states = jabber_away_states;
-        ret->actions = jabber_actions;
         ret->login = jabber_login;
         ret->close = jabber_close;
@@ -2368 +2340 @@
         ret->set_away = jabber_set_away;
         ret->get_away = jabber_get_away_msg;
-        ret->set_idle = jabber_set_idle;
         ret->add_buddy = jabber_add_buddy;
         ret->remove_buddy = jabber_remove_buddy;
-        ret->add_permit = NULL;
-        ret->add_deny = NULL;
-        ret->rem_permit = NULL;
-        ret->rem_deny = NULL;
-        ret->set_permit_deny = NULL;
         ret->keepalive = jabber_keepalive;
-        ret->buddy_free = jabber_buddy_free;
         ret->alias_buddy = jabber_roster_update;
         ret->group_buddy = jabber_group_change;

protocols/jabber/xmlparse.c

@@ -1461 +1461 @@
 s = protocolEncodingName;
 #endif
-    if ((ns ? XmlInitEncodingNS : XmlInitEncoding)(&initEncoding, &encoding, s))
+    if (ns ? XmlInitEncodingNS(&initEncoding, &encoding, s) : XmlInitEncoding(&initEncoding, &encoding, s))
         return XML_ERROR_NONE;
     return handleUnknownEncoding(parser, protocolEncodingName);
@@ -1475 +1475 @@
     int standalone = -1;
     if (!(ns
-            ? XmlParseXmlDeclNS
-            : XmlParseXmlDecl)(isGeneralTextEntity,
+            ? XmlParseXmlDeclNS(isGeneralTextEntity,
                                encoding,
                                s,
@@ -1484 +1483 @@
                                &encodingName,
                                &newEncoding,
-                               &standalone))
+                               &standalone)
+            : XmlParseXmlDecl(isGeneralTextEntity,
+                               encoding,
+                               s,
+                               next,
+                               &eventPtr,
+                               &version,
+                               &encodingName,
+                               &newEncoding,
+                               &standalone)))
         return XML_ERROR_SYNTAX;
     if (!isGeneralTextEntity && standalone == 1)
@@ -1537 +1545 @@
             }
             enc = (ns
-                   ? XmlInitUnknownEncodingNS
-                   : XmlInitUnknownEncoding)(unknownEncodingMem,
+                   ? XmlInitUnknownEncodingNS(unknownEncodingMem,
                                              info.map,
                                              info.convert,
-                                             info.data);
+                                             info.data)
+                   : XmlInitUnknownEncoding(unknownEncodingMem,
+                                             info.map,
+                                             info.convert,
+                                             info.data));
             if (enc) {
                 unknownEncodingData = info.data;

protocols/msn/msn_util.c

@@ -130 +130 @@
 {
         msn_buddy_list_add( bla->gc, "AL", bla->handle, bla->realname );
+        
+        if( find_buddy( bla->gc, bla->handle ) == NULL )
+                show_got_added( bla->gc, bla->handle, NULL );
         
         g_free( bla->handle );

protocols/msn/ns.c

@@ -650 +650 @@
         if( key == NULL )
         {
-                hide_login_progress( gc, "Error during Passport authentication" );
+                char *err;
+                
+                err = g_strdup_printf( "Error during Passport authentication (%s)",
+                                       rep->error_string ? rep->error_string : "Unknown error" );
+                
+                hide_login_progress( gc, err );
                 signoff( gc );
+                
+                g_free( err );
         }
         else

protocols/msn/passport.c

@@ -69 +69 @@
         }
         
-        reqs = g_malloc( strlen( header ) + strlen( dummy ) + 128 );
-        sprintf( reqs, "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
+        reqs = g_strdup_printf( "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
         
         *dummy = 0;
@@ -88 +87 @@
         struct passport_reply *rep = req->data;
         
-        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        if( !g_slist_find( msn_connections, rep->data ) )
         {
                 destroy_reply( rep );
@@ -94 +93 @@
         }
         
-        if( req->status_code == 200 )
+        if( req->finished && req->reply_headers && req->status_code == 200 )
         {
                 char *dummy;
@@ -109 +108 @@
                         rep->result = g_strdup( dummy );
                 }
+                else
+                {
+                        rep->error_string = g_strdup( "Could not parse Passport server response" );
+                }
+        }
+        else
+        {
+                rep->error_string = g_strdup_printf( "HTTP error: %s",
+                                      req->status_string ? req->status_string : "Unknown error" );
         }
         
@@ -145 +153 @@
 }
 
-#define PPR_REQUEST "GET /rdr/pprdr.asp HTTP/1.0\r\n\r\n"
 static int passport_retrieve_dalogin( gpointer func, gpointer data, char *header )
 {
@@ -155 +162 @@
         rep->header = header;
         
-        req = http_dorequest( "nexus.passport.com", 443, 1, PPR_REQUEST, passport_retrieve_dalogin_ready, rep );
+        req = http_dorequest_url( "https://nexus.passport.com/rdr/pprdr.asp", passport_retrieve_dalogin_ready, rep );
         
         if( !req )
@@ -169 +176 @@
         char *urlend;
         
-        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        if( !g_slist_find( msn_connections, rep->data ) )
         {
                 destroy_reply( rep );
@@ -175 +182 @@
         }
         
+        if( !req->finished || !req->reply_headers || req->status_code != 200 )
+        {
+                rep->error_string = g_strdup_printf( "HTTP error while fetching DALogin: %s",
+                                        req->status_string ? req->status_string : "Unknown error" );
+                goto failure;
+        }
+        
         dalogin = strstr( req->reply_headers, "DALogin=" );     
         
         if( !dalogin )
+        {
+                rep->error_string = g_strdup( "Parse error while fetching DALogin" );
                 goto failure;
+        }
         
         dalogin += strlen( "DALogin=" );
@@ -208 +225 @@
         g_free( rep->result );
         g_free( rep->header );
+        g_free( rep->error_string );
         g_free( rep );
 }

protocols/msn/passport.h

@@ -39 +39 @@
         char *result;
         char *header;
+        char *error_string;
 };
 

protocols/msn/sb.c

@@ -523 +523 @@
                 {
                         msn_sb_destroy( sb );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_FATAL )
+                        return 0;
+                }
+                else if( err->flags & STATUS_FATAL )
                 {
                         signoff( gc );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_SB_IM_SPARE )
+                        return 0;
+                }
+                else if( err->flags & STATUS_SB_IM_SPARE )
                 {
                         if( sb->who )
@@ -553 +553 @@
                                 sb->msgq = NULL;
                         }
+                        
+                        /* Do NOT return 0 here, we want to keep this sb. */
                 }
         }

protocols/msn/tables.c

@@ -127 +127 @@
         
         { 910, "Server is busy",                                        STATUS_FATAL },
-        { 911, "Authentication failed",                                 STATUS_FATAL },
+        { 911, "Authentication failed",                                 STATUS_SB_FATAL | STATUS_FATAL },
         { 912, "Server is busy",                                        STATUS_FATAL },
         { 913, "Not allowed when hiding",                               0 },

protocols/nogaim.c

@@ -37 +37 @@
 #include "nogaim.h"
 #include <ctype.h>
-#include <iconv.h>
-
-static char *proto_away_alias[8][5] =
-{
-        { "Away from computer", "Away", "Extended away", NULL },
-        { "NA", "N/A", "Not available", NULL },
-        { "Busy", "Do not disturb", "DND", "Occupied", NULL },
-        { "Be right back", "BRB", NULL },
-        { "On the phone", "Phone", "On phone", NULL },
-        { "Out to lunch", "Lunch", "Food", NULL },
-        { "Invisible", "Hidden" },
-        { NULL }
-};
-static char *proto_away_alias_find( GList *gcm, char *away );
 
 static int remove_chat_buddy_silent( struct conversation *b, char *handle );
@@ -159 +145 @@
 GSList *get_connections() { return connections; }
 
-int proto_away( struct gaim_connection *gc, char *away )
-{
-        GList *m, *ms;
-        char *s;
-        
-        if( !away ) away = "";
-        ms = m = gc->prpl->away_states( gc );
-        
-        while( m )
-        {
-                if( *away )
-                {
-                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
-                                break;
-                }
-                else
-                {
-                        if( g_strcasecmp( m->data, "Available" ) == 0 )
-                                break;
-                        if( g_strcasecmp( m->data, "Online" ) == 0 )
-                                break;
-                }
-                m = m->next;
-        }
-        
-        if( m )
-        {
-                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
-        }
-        else
-        {
-                s = proto_away_alias_find( ms, away );
-                if( s )
-                {
-                        gc->prpl->set_away( gc, s, away );
-                        if( set_getint( gc->irc, "debug" ) )
-                                serv_got_crap( gc, "Setting away state to %s", s );
-                }
-                else
-                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
-        }
-        
-        g_list_free( ms );
-        
-        return( 1 );
-}
-
-static char *proto_away_alias_find( GList *gcm, char *away )
-{
-        GList *m;
-        int i, j;
-        
-        for( i = 0; *proto_away_alias[i]; i ++ )
-        {
-                for( j = 0; proto_away_alias[i][j]; j ++ )
-                        if( g_strncasecmp( away, proto_away_alias[i][j], strlen( proto_away_alias[i][j] ) ) == 0 )
-                                break;
-                
-                if( !proto_away_alias[i][j] )   /* If we reach the end, this row */
-                        continue;               /* is not what we want. Next!    */
-                
-                /* Now find an entry in this row which exists in gcm */
-                for( j = 0; proto_away_alias[i][j]; j ++ )
-                {
-                        m = gcm;
-                        while( m )
-                        {
-                                if( g_strcasecmp( proto_away_alias[i][j], m->data ) == 0 )
-                                        return( proto_away_alias[i][j] );
-                                m = m->next;
-                        }
-                }
-        }
-        
-        return( NULL );
-}
-
 /* multi.c */
 
@@ -306 +215 @@
 {
         va_list params;
-        char text[1024], buf[1024], *acc_id;
-        char *msg;
+        char *text;
         account_t *a;
         
         va_start( params, format );
-        g_vsnprintf( text, sizeof( text ), format, params );
+        text = g_strdup_vprintf( format, params );
         va_end( params );
 
-        if( g_strncasecmp( set_getstr( gc->irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF8", set_getstr( gc->irc, "charset" ), text, buf, 0, 1024 ) != -1 )
-                msg = buf;
-        else
-                msg = text;
-        
         if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
             ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
-                strip_html( msg );
+                strip_html( text );
         
         /* Try to find a different connection on the same protocol. */
@@ -329 +231 @@
                         break;
         
-        /* If we found one, add the screenname to the acc_id. */
+        /* If we found one, include the screenname in the message. */
         if( a )
-                acc_id = g_strdup_printf( "%s(%s)", gc->prpl->name, gc->username );
+                irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, text );
         else
-                acc_id = g_strdup( gc->prpl->name );
-        
-        irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
-        
-        g_free( acc_id );
+                irc_usermsg( gc->irc, "%s - %s", gc->prpl->name, text );
+        
+        g_free( text );
 }
 
@@ -369 +269 @@
         /* Also necessary when we're not away, at least for some of the
            protocols. */
-        proto_away( gc, u->away );
-        
-        if( strcmp( gc->prpl->name, "ICQ" ) == 0 )
-        {
-                for( u = gc->irc->users; u; u = u->next )
-                        if( u->gc == gc )
-                                break;
-                
-                if( u == NULL )
-                        serv_got_crap( gc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
-                                              "See \x02""help import_buddies\x02"" for more information." );
-        }
+        bim_set_away( gc, u->away );
 }
 
@@ -397 +286 @@
         while( g_source_remove_by_user_data( (gpointer) a ) );
         a->reconnect = 0;
-}
-
-void account_offline( struct gaim_connection *gc )
-{
-        gc->wants_to_die = TRUE;
-        signoff( gc );
 }
 
@@ -412 +295 @@
         
         serv_got_crap( gc, "Signing off.." );
-
+        gc->flags |= OPT_LOGGING_OUT;
+        
         gaim_input_remove( gc->keepalive );
         gc->keepalive = 0;
@@ -510 +394 @@
         else if( gc->user->proto_opt[0] && *gc->user->proto_opt[0] )
         {
-                u->host = g_strdup( gc->user->proto_opt[0] );
+                char *colon;
+                
+                if( ( colon = strchr( gc->user->proto_opt[0], ':' ) ) )
+                        u->host = g_strndup( gc->user->proto_opt[0],
+                                             colon - gc->user->proto_opt[0] );
+                else
+                        u->host = g_strdup( gc->user->proto_opt[0] );
+                
                 u->user = g_strdup( handle );
                 
@@ -559 +450 @@
 {
         user_t *u = user_findhandle( gc, handle );
-        char *name, buf[1024];
         
         if( !u ) return;
         
-        /* Convert all UTF-8 */
-        if( g_strncasecmp( set_getstr( gc->irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF-8", set_getstr( gc->irc, "charset" ), realname, buf, 0, sizeof( buf ) ) != -1 )
-                name = buf;
-        else
-                name = realname;
-        
-        if( g_strcasecmp( u->realname, name ) != 0 )
+        if( g_strcasecmp( u->realname, realname ) != 0 )
         {
                 if( u->realname != u->nick ) g_free( u->realname );
                 
-                u->realname = g_strdup( name );
+                u->realname = g_strdup( realname );
                 
                 if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
@@ -584 +467 @@
 /* prpl.c */
 
-void show_got_added( struct gaim_connection *gc, char *id, char *handle, const char *realname, const char *msg )
-{
-        return;
+struct show_got_added_data
+{
+        struct gaim_connection *gc;
+        char *handle;
+};
+
+void show_got_added_no( gpointer w, struct show_got_added_data *data )
+{
+        g_free( data->handle );
+        g_free( data );
+}
+
+void show_got_added_yes( gpointer w, struct show_got_added_data *data )
+{
+        data->gc->prpl->add_buddy( data->gc, data->handle );
+        add_buddy( data->gc, NULL, data->handle, data->handle );
+        
+        return show_got_added_no( w, data );
+}
+
+void show_got_added( struct gaim_connection *gc, char *handle, const char *realname )
+{
+        struct show_got_added_data *data = g_new0( struct show_got_added_data, 1 );
+        char *s;
+        
+        /* TODO: Make a setting for this! */
+        if( user_findhandle( gc, handle ) != NULL )
+                return;
+        
+        s = g_strdup_printf( "The user %s is not in your buddy list yet. Do you want to add him/her now?", handle );
+        
+        data->gc = gc;
+        data->handle = g_strdup( handle );
+        query_add( gc->irc, gc, s, show_got_added_yes, show_got_added_no, data );
 }
 
@@ -616 +530 @@
                         return;
                 }
-                return;
+                /* Why did we have this here....
+                return; */
         }
         
@@ -680 +595 @@
         irc_t *irc = gc->irc;
         user_t *u;
-        char buf[8192];
         
         u = user_findhandle( gc, handle );
@@ -722 +636 @@
                 strip_html( msg );
 
-        if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF-8", set_getstr( irc, "charset" ), msg, buf, 0, 8192 ) != -1 )
-                msg = buf;
-        
         while( strlen( msg ) > 425 )
         {
@@ -822 +732 @@
         struct conversation *c;
         user_t *u;
-        char buf[8192];
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
@@ -834 +743 @@
             ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
-        
-        if( g_strncasecmp( set_getstr( gc->irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF-8", set_getstr( gc->irc, "charset" ), msg, buf, 0, 8192 ) != -1 )
-                msg = buf;
         
         if( c && u )
@@ -956 +861 @@
         
         return( 0 );
-}
-
-
-/* prefs.c */
-
-/* Necessary? */
-void build_block_list()
-{
-        return;
-}
-
-void build_allow_list()
-{
-        return;
 }
 
@@ -1051 +942 @@
 }
 
-int serv_send_im( irc_t *irc, user_t *u, char *msg, int flags )
-{
-        char buf[8192];
-        
-        if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( set_getstr( irc, "charset" ), "UTF-8", msg, buf, 0, 8192 ) != -1 )
+
+
+
+/* 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: */
+
+int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags )
+{
+        char *buf = NULL;
+        int st;
+        
+        if( ( gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                buf = escape_html( msg );
                 msg = buf;
-
-        if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
-        {
-                char *html;
-                
-                html = escape_html( msg );
-                strncpy( buf, html, 8192 );
-                g_free( html );
-                
+        }
+        
+        st = gc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
+        g_free( buf );
+        
+        return st;
+}
+
+int bim_chat_msg( struct gaim_connection *gc, int id, char *msg )
+{
+        char *buf = NULL;
+        int st;
+        
+        if( ( gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                buf = escape_html( msg );
                 msg = buf;
         }
         
-        return( ((struct gaim_connection *)u->gc)->prpl->send_im( u->gc, u->handle, msg, strlen( msg ), flags ) );
-}
-
-int serv_send_chat( irc_t *irc, struct gaim_connection *gc, int id, char *msg )
-{
-        char buf[8192];
-        
-        if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( set_getstr( irc, "charset" ), "UTF-8", msg, buf, 0, 8192 ) != -1 )
-                msg = buf;
-
-        if( gc->flags & OPT_CONN_HTML) {
-                char * html = escape_html(msg);
-                strncpy(buf, html, 8192);
-                g_free(html);
-        }
-        
-        return( gc->prpl->chat_send( gc, id, msg ) );
-}
-
-/* Convert from one charset to another.
-   
-   from_cs, to_cs: Source and destination charsets
-   src, dst: Source and destination strings
-   size: Size if src. 0 == use strlen(). strlen() is not reliable for UNICODE/UTF16 strings though.
-   maxbuf: Maximum number of bytes to write to dst
-   
-   Returns the number of bytes written to maxbuf or -1 on an error.
-*/
-signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf )
-{
-        iconv_t cd;
-        size_t res;
-        size_t inbytesleft, outbytesleft;
-        char *inbuf = src;
-        char *outbuf = dst;
-        
-        cd = iconv_open( to_cs, from_cs );
-        if( cd == (iconv_t) -1 )
-                return( -1 );
-        
-        inbytesleft = size ? size : strlen( src );
-        outbytesleft = maxbuf - 1;
-        res = iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
-        *outbuf = '\0';
-        iconv_close( cd );
-        
-        if( res == (size_t) -1 )
-                return( -1 );
+        st = gc->prpl->chat_send( gc, id, msg );
+        g_free( buf );
+        
+        return st;
+}
+
+static char *bim_away_alias_find( GList *gcm, char *away );
+
+int bim_set_away( struct gaim_connection *gc, char *away )
+{
+        GList *m, *ms;
+        char *s;
+        
+        if( !away ) away = "";
+        ms = m = gc->prpl->away_states( gc );
+        
+        while( m )
+        {
+                if( *away )
+                {
+                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
+                                break;
+                }
+                else
+                {
+                        if( g_strcasecmp( m->data, "Available" ) == 0 )
+                                break;
+                        if( g_strcasecmp( m->data, "Online" ) == 0 )
+                                break;
+                }
+                m = m->next;
+        }
+        
+        if( m )
+        {
+                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
+        }
         else
-                return( outbuf - dst );
-}
-
-char *set_eval_charset( irc_t *irc, set_t *set, char *value )
-{
-        iconv_t cd;
-
-        if ( g_strncasecmp( value, "none", 4 ) == 0 )
-                return( value );
-
-        cd = iconv_open( "UTF-8", value );
-        if( cd == (iconv_t) -1 )
-                return( NULL );
-
-        iconv_close( cd );
-        return( value );
-}
+        {
+                s = bim_away_alias_find( ms, away );
+                if( s )
+                {
+                        gc->prpl->set_away( gc, s, away );
+                        if( set_getint( gc->irc, "debug" ) )
+                                serv_got_crap( gc, "Setting away state to %s", s );
+                }
+                else
+                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
+        }
+        
+        g_list_free( ms );
+        
+        return( 1 );
+}
+
+static char *bim_away_alias_list[8][5] =
+{
+        { "Away from computer", "Away", "Extended away", NULL },
+        { "NA", "N/A", "Not available", NULL },
+        { "Busy", "Do not disturb", "DND", "Occupied", NULL },
+        { "Be right back", "BRB", NULL },
+        { "On the phone", "Phone", "On phone", NULL },
+        { "Out to lunch", "Lunch", "Food", NULL },
+        { "Invisible", "Hidden" },
+        { NULL }
+};
+
+static char *bim_away_alias_find( GList *gcm, char *away )
+{
+        GList *m;
+        int i, j;
+        
+        for( i = 0; *bim_away_alias_list[i]; i ++ )
+        {
+                for( j = 0; bim_away_alias_list[i][j]; j ++ )
+                        if( g_strncasecmp( away, bim_away_alias_list[i][j], strlen( bim_away_alias_list[i][j] ) ) == 0 )
+                                break;
+                
+                if( !bim_away_alias_list[i][j] )        /* If we reach the end, this row */
+                        continue;                       /* is not what we want. Next!    */
+                
+                /* Now find an entry in this row which exists in gcm */
+                for( j = 0; bim_away_alias_list[i][j]; j ++ )
+                {
+                        m = gcm;
+                        while( m )
+                        {
+                                if( g_strcasecmp( bim_away_alias_list[i][j], m->data ) == 0 )
+                                        return( bim_away_alias_list[i][j] );
+                                m = m->next;
+                        }
+                }
+        }
+        
+        return( NULL );
+}
+
+void bim_add_allow( struct gaim_connection *gc, char *handle )
+{
+        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        {
+                gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
+        }
+        
+        gc->prpl->add_permit( gc, handle );
+}
+
+void bim_rem_allow( struct gaim_connection *gc, char *handle )
+{
+        GSList *l;
+        
+        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        {
+                g_free( l->data );
+                gc->permit = g_slist_delete_link( gc->permit, l );
+        }
+        
+        gc->prpl->rem_permit( gc, handle );
+}
+
+void bim_add_block( struct gaim_connection *gc, char *handle )
+{
+        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        {
+                gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
+        }
+        
+        gc->prpl->add_deny( gc, handle );
+}
+
+void bim_rem_block( struct gaim_connection *gc, char *handle )
+{
+        GSList *l;
+        
+        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        {
+                g_free( l->data );
+                gc->deny = g_slist_delete_link( gc->deny, l );
+        }
+        
+        gc->prpl->rem_deny( gc, handle );
+}

protocols/nogaim.h

@@ -15 +15 @@
  * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  *                          (and possibly other members of the Gaim team)
- * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx>
+ * Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net>
  */
 
@@ -52 +52 @@
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
 
-#define PERMIT_ALL      1
-#define PERMIT_NONE     2
-#define PERMIT_SOME     3
-#define DENY_SOME       4
-
-#define WEBSITE "http://www.bitlee.org/"
+#define WEBSITE "http://www.bitlbee.org/"
 #define IM_FLAG_AWAY 0x0020
-#define OPT_CONN_HTML 0x00000001
-#define OPT_LOGGED_IN 0x00010000
 #define GAIM_AWAY_CUSTOM "Custom"
 
-#define GAIM_LOGO       0
-#define GAIM_ERROR      1
-#define GAIM_WARNING    2
-#define GAIM_INFO       3
+#define OPT_CONN_HTML   0x00000001
+#define OPT_LOGGED_IN   0x00010000
+#define OPT_LOGGING_OUT 0x00020000
 
 /* ok. now the fun begins. first we create a connection structure */
-struct gaim_connection {
-        /* we need to do either oscar or TOC */
-        /* we make this as an int in case if we want to add more protocols later */
+struct gaim_connection
+{
         struct prpl *prpl;
         guint32 flags;
         
+        /* each connection then can have its own protocol-specific data */
+        void *proto_data;
+        
         /* all connections need an input watcher */
         int inpa;
+        guint keepalive;
         
         /* buddy list stuff. there is still a global groups for the buddy list, but
@@ -84 +79 @@
         int permdeny;
         
-        /* all connections need a list of chats, even if they don't have chat */
-        GSList *buddy_chats;
-        
-        /* each connection then can have its own protocol-specific data */
-        void *proto_data;
-        
         struct aim_user *user;
         
@@ -95 +84 @@
         char displayname[128];
         char password[32];
-        guint keepalive;
-        /* stuff needed for per-connection idle times */
-        guint idle_timer;
-        time_t login_time;
-        time_t lastsent;
-        int is_idle;
         
         char *away;
-        int is_auto_away;
         
         int evil;
@@ -110 +92 @@
         /* BitlBee */
         irc_t *irc;
-        int lstitems;  /* added for msnP8 */
         
         struct conversation *conversations;
@@ -164 +145 @@
         const char *name;
 
-        /* for ICQ and Yahoo, who have off/on per-conversation options */
-        /* char *checkbox; this should be per-connection */
-
-        GList *(* away_states)(struct gaim_connection *gc);
-        GList *(* actions)();
-        void   (* do_action)(struct gaim_connection *, char *);
-        /* user_opts returns a GList* of g_malloc'd struct proto_user_opts */
-        GList *(* user_opts)();
-        GList *(* chat_info)(struct gaim_connection *);
-
-        /* all the server-related functions */
-
-        /* a lot of these (like get_dir) are protocol-dependent and should be removed. ones like
-         * set_dir (which is also protocol-dependent) can stay though because there's a dialog
-         * (i.e. the prpl says you can set your dir info, the ui shows a dialog and needs to call
-         * set_dir in order to set it) */
-
         void (* login)          (struct aim_user *);
+        void (* keepalive)      (struct gaim_connection *);
         void (* close)          (struct gaim_connection *);
+        
         int  (* send_im)        (struct gaim_connection *, char *who, char *message, int len, int away);
-        int  (* send_typing)    (struct gaim_connection *, char *who, int typing);
-        void (* set_info)       (struct gaim_connection *, char *info);
-        void (* get_info)       (struct gaim_connection *, char *who);
         void (* set_away)       (struct gaim_connection *, char *state, char *message);
         void (* get_away)       (struct gaim_connection *, char *who);
-        void (* set_idle)       (struct gaim_connection *, int idletime);
+        int  (* send_typing)    (struct gaim_connection *, char *who, int typing);
+        
         void (* add_buddy)      (struct gaim_connection *, char *name);
+        void (* group_buddy)    (struct gaim_connection *, char *who, char *old_group, char *new_group);
         void (* remove_buddy)   (struct gaim_connection *, char *name, char *group);
         void (* add_permit)     (struct gaim_connection *, char *name);
@@ -197 +162 @@
         void (* rem_deny)       (struct gaim_connection *, char *name);
         void (* set_permit_deny)(struct gaim_connection *);
+        
+        void (* set_info)       (struct gaim_connection *, char *info);
+        void (* get_info)       (struct gaim_connection *, char *who);
+        void (* alias_buddy)    (struct gaim_connection *, char *who);  /* save/store buddy's alias on server list/roster */
+        
+        /* Group chat stuff. */
         void (* join_chat)      (struct gaim_connection *, GList *data);
         void (* chat_invite)    (struct gaim_connection *, int id, char *who, char *message);
         void (* chat_leave)     (struct gaim_connection *, int id);
-        void (* chat_whisper)   (struct gaim_connection *, int id, char *who, char *message);
         int  (* chat_send)      (struct gaim_connection *, int id, char *message);
         int  (* chat_open)      (struct gaim_connection *, char *who);
-        void (* keepalive)      (struct gaim_connection *);
-
-        /* get "chat buddy" info and away message */
-        void (* get_cb_info)    (struct gaim_connection *, int, char *who);
-        void (* get_cb_away)    (struct gaim_connection *, int, char *who);
-
-        /* save/store buddy's alias on server list/roster */
-        void (* alias_buddy)    (struct gaim_connection *, char *who);
-
-        /* change a buddy's group on a server list/roster */
-        void (* group_buddy)    (struct gaim_connection *, char *who, char *old_group, char *new_group);
-
-        void (* buddy_free)     (struct buddy *);
-
+        
+        /* DIE! */
         char *(* get_status_string) (struct gaim_connection *gc, int stat);
-
+        
+        GList *(* away_states)(struct gaim_connection *gc);
+        
+        /* Mainly for AOL, since they think "Bung hole" == "Bu ngho le". *sigh* */
         int (* cmp_buddynames) (const char *who1, const char *who2);
 };
@@ -235 +196 @@
 
 /* nogaim.c */
-int serv_send_im(irc_t *irc, user_t *u, char *msg, int flags);
-int serv_send_chat(irc_t *irc, struct gaim_connection *gc, int id, char *msg );
-
-G_MODULE_EXPORT signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf );
-char *set_eval_charset( irc_t *irc, set_t *set, char *value );
+int bim_set_away( struct gaim_connection *gc, char *away );
+int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags );
+int bim_chat_msg( struct gaim_connection *gc, int id, char *msg );
+
+void bim_add_allow( struct gaim_connection *gc, char *handle );
+void bim_rem_allow( struct gaim_connection *gc, char *handle );
+void bim_add_block( struct gaim_connection *gc, char *handle );
+void bim_rem_block( struct gaim_connection *gc, char *handle );
 
 void nogaim_init();
-int proto_away( struct gaim_connection *gc, char *away );
 char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
 
@@ -254 +217 @@
 G_MODULE_EXPORT void hide_login_progress( struct gaim_connection *gc, char *msg );
 G_MODULE_EXPORT void hide_login_progress_error( struct gaim_connection *gc, char *msg );
-G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... );
+G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
 G_MODULE_EXPORT void account_online( struct gaim_connection *gc );
-G_MODULE_EXPORT void account_offline( struct gaim_connection *gc );
 G_MODULE_EXPORT void signoff( struct gaim_connection *gc );
 
@@ -264 +226 @@
 
 /* list.c */
-G_MODULE_EXPORT int bud_list_cache_exists( struct gaim_connection *gc );
-G_MODULE_EXPORT void do_import( struct gaim_connection *gc, void *null );
 G_MODULE_EXPORT void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *realname );
 G_MODULE_EXPORT struct buddy *find_buddy( struct gaim_connection *gc, char *handle );
-G_MODULE_EXPORT void do_export( struct gaim_connection *gc );
 G_MODULE_EXPORT void signoff_blocked( struct gaim_connection *gc );
 
@@ -278 +237 @@
 
 /* prpl.c */
-G_MODULE_EXPORT void show_got_added( struct gaim_connection *gc, char *id, char *handle, const char *realname, const char *msg );
+G_MODULE_EXPORT void show_got_added( struct gaim_connection *gc, char *handle, const char *realname );
 
 /* server.c */                    
@@ -289 +248 @@
 G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
 
-/* util.c */
-G_MODULE_EXPORT void strip_linefeed( gchar *text );
-G_MODULE_EXPORT char *add_cr( char *text );
-G_MODULE_EXPORT char *tobase64( const char *text );
-G_MODULE_EXPORT char *normalize( const char *s );
-G_MODULE_EXPORT time_t get_time( int year, int month, int day, int hour, int min, int sec );
-G_MODULE_EXPORT void strip_html( char *msg );
-G_MODULE_EXPORT char *escape_html( const char *html );
-G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
-G_MODULE_EXPORT char *ipv6_wrap( char *src );
-G_MODULE_EXPORT char *ipv6_unwrap( char *src );
-
-/* prefs.c */
-G_MODULE_EXPORT void build_block_list();
-G_MODULE_EXPORT void build_allow_list();
-
 struct conversation *conv_findchannel( char *channel );
 
-
 #endif

protocols/oscar/aim.h

@@ -728 +728 @@
 };
 
-#define AIM_CHATFLAGS_NOREFLECT 0x0001
-#define AIM_CHATFLAGS_AWAY      0x0002
+#define AIM_CHATFLAGS_NOREFLECT         0x0001
+#define AIM_CHATFLAGS_AWAY              0x0002
+#define AIM_CHATFLAGS_UNICODE           0x0004
+#define AIM_CHATFLAGS_ISO_8859_1        0x0008
+
 int aim_chat_send_im(aim_session_t *sess, aim_conn_t *conn, guint16 flags, const char *msg, int msglen);
 int aim_chat_join(aim_session_t *sess, aim_conn_t *conn, guint16 exchange, const char *roomname, guint16 instance);

protocols/oscar/chat.c

@@ -159 +159 @@
         if (flags & AIM_CHATFLAGS_AWAY)
                 aim_addtlvtochain_noval(&otl, 0x0007);
-
+        
+        /* [WvG] This wasn't there originally, but we really should send
+                 the right charset flags, as we also do with normal
+                 messages. Hope this will work. :-) */
+        /*
+        if (flags & AIM_CHATFLAGS_UNICODE)
+                aimbs_put16(&fr->data, 0x0002);
+        else if (flags & AIM_CHATFLAGS_ISO_8859_1)
+                aimbs_put16(&fr->data, 0x0003);
+        else
+                aimbs_put16(&fr->data, 0x0000);
+        
+        aimbs_put16(&fr->data, 0x0000);
+        */
+        
         /*
          * SubTLV: Type 1: Message

protocols/oscar/im.c

@@ -1469 +1469 @@
             case 0x9c:  /* ICQ 5 seems to send this */
                 aim_send_im_ch2_statusmessage(sess, userinfo->sn, args->cookie,
-                        gc->away, sess->aim_icq_state, dc);
+                        gc->away ? gc->away : "", sess->aim_icq_state, dc);
                 break;
 

protocols/oscar/oscar.c

@@ -2 +2 @@
  * gaim
  *
+ * Some code copyright (C) 2002-2006, Jelmer Vernooij <jelmer@samba.org>
+ *                                    and the BitlBee team.
  * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  * libfaim code copyright 1998, 1999 Adam Fritzler <afritz@auk.cx>
@@ -136 +138 @@
         int i, j;
         char *x = strchr(name, '-');
-        if (!x) return NULL;
+        if (!x) return g_strdup(name);
         x = strchr(++x, '-');
-        if (!x) return NULL;
+        if (!x) return g_strdup(name);
         tmp = g_strdup(++x);
 
@@ -383 +385 @@
         if (g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.icq.com") != 0 &&
             g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.oscar.aol.com") != 0) {
-                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.");
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",user->proto_opt[USEROPT_AUTH]);
         }
         
@@ -1119 +1121 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        show_got_added(data->gc, NULL, uin, NULL, NULL);
+        if(find_buddy(data->gc, uin) == NULL)
+                show_got_added(data->gc, uin, NULL);
         
         g_free(uin);
@@ -2057 +2060 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->permit = g_slist_append(gc->permit, name);
-                                                build_allow_list();
                                                 tmp++;
                                         }
@@ -2071 +2073 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->deny = g_slist_append(gc->deny, name);
-                                                build_block_list();
                                                 tmp++;
                                         }
@@ -2277 +2278 @@
                 tm.tm_mday = (int)info->birthday;
                 tm.tm_mon = (int)info->birthmonth-1;
-                tm.tm_year = (int)info->birthyear-1900;
+                tm.tm_year = (int)info->birthyear%100;
                 strftime(date, sizeof(date), "%Y-%m-%d", &tm);
                 info_string_append(str, "\n", _("Birthday"), date);
@@ -2501 +2502 @@
         int ret;
         guint8 len = strlen(message);
+        guint16 flags;
         char *s;
         
@@ -2509 +2511 @@
                 if (*s & 128)
                         break;
-                
+        
+        flags = AIM_CHATFLAGS_NOREFLECT;
+        
         /* Message contains high ASCII chars, time for some translation! */
         if (*s) {
@@ -2516 +2520 @@
                    If we can't, fall back to UTF16. */
                 if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) {
+                        flags |= AIM_CHATFLAGS_ISO_8859_1;
                         len = ret;
                 } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) {
+                        flags |= AIM_CHATFLAGS_UNICODE;
                         len = ret;
                 } else {
@@ -2528 +2534 @@
         }
                 
-        ret = aim_chat_send_im(od->sess, ccon->conn, AIM_CHATFLAGS_NOREFLECT, s, len);
+        ret = aim_chat_send_im(od->sess, ccon->conn, flags, s, len);
                 
         if (s != message) {     
@@ -2601 +2607 @@
         int ret;
         static int chat_id = 0;
-        char * chatname = g_new0(char, strlen(gc->username)+4);
-        
-        g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
+        char * chatname;
+        
+        chatname = g_strdup_printf("%s%d", gc->username, chat_id++);
   
         ret = oscar_chat_join(gc, chatname);

protocols/oscar/oscar_util.c

@@ -109 +109 @@
 
         curPtr = sn;
-        while ( (*curPtr) != (char) NULL) {
+        while ( (*curPtr) != (char) '\0') {
                 if ((*curPtr) != ' ')
                 i++;
@@ -140 +140 @@
         curPtr1 = sn1;
         curPtr2 = sn2;
-        while ( (*curPtr1 != (char) NULL) && (*curPtr2 != (char) NULL) ) {
+        while ( (*curPtr1 != (char) '\0') && (*curPtr2 != (char) '\0') ) {
                 if ( (*curPtr1 == ' ') || (*curPtr2 == ' ') ) {
                         if (*curPtr1 == ' ')

protocols/oscar/service.c

@@ -733 +733 @@
         int tlvlen;
 
-        data = AIM_ICQ_STATE_WEBAWARE | AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */
+        data = AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */
 
         tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
@@ -881 +881 @@
 #endif
 
+/* len can't be 0 here anyway...
                 } else if ((offset == 0x00001000) && (len == 0x00000000)) {
 
@@ -887 +888 @@
                         aimbs_put32(&fr->data, 0xe9800998);
                         aimbs_put32(&fr->data, 0xecf8427e);
-
+*/
                 } else
                         do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim");

protocols/ssl_nss.c

@@ -122 +122 @@
         if( source == -1 )
                 goto ssl_connected_failure;
-
         
-
-
+        /* Until we find out how to handle non-blocking I/O with NSS... */
+        sock_make_blocking( conn->fd );
+        
         conn->prfd = SSL_ImportFD(NULL, PR_ImportTCPSocket(source));
         SSL_OptionSet(conn->prfd, SSL_SECURITY, PR_TRUE);
@@ -181 +181 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        /* Just in case someone calls us, let's return the most likely case: */
+        return GAIM_INPUT_READ;
+}

protocols/yahoo/yahoo.c

@@ -227 +227 @@
                 else if( g_strcasecmp( state, GAIM_AWAY_CUSTOM ) == 0 )
                 {
-                        if (gc->is_idle)
-                                yd->current_status = YAHOO_STATUS_IDLE;
-                        else
-                                yd->current_status = YAHOO_STATUS_AVAILABLE;
+                        yd->current_status = YAHOO_STATUS_AVAILABLE;
                         
                         gc->away = NULL;
                 }
         }
-        else if( gc->is_idle )
-                yd->current_status = YAHOO_STATUS_IDLE;
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
@@ -615 +610 @@
         struct gaim_connection *gc = byahoo_get_gc_by_id( id );
         
-        serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0, 0,
+        serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0,
+                         ( stat == YAHOO_STATUS_IDLE ) ? away : 0,
                          ( stat != YAHOO_STATUS_AVAILABLE ) | ( stat << 1 ), 0 );
 }

query.c

@@ -140 +140 @@
         if( ans )
         {
+                serv_got_crap( q->gc, "Accepted: %s", q->question );
                 q->yes( NULL, q->data );
-                serv_got_crap( q->gc, "Accepted: %s", q->question );
         }
         else
         {
+                serv_got_crap( q->gc, "Rejected: %s", q->question );
                 q->no( NULL, q->data );
-                serv_got_crap( q->gc, "Rejected: %s", q->question );
         }
         q->data = NULL;

root_commands.c

@@ -57 +57 @@
                                 s --;
                         }
+                        else
+                        {
+                                break;
+                        }
+                }
+                else if( *s == '\\' && ( ( !q && s[1] ) || ( q && q == s[1] ) ) )
+                {
+                        char *cpy;
+                        
+                        for( cpy = s; *cpy; cpy ++ )
+                                cpy[0] = cpy[1];
                 }
                 else if( *s == q )
@@ -245 +256 @@
                 int i = 0;
                 
+                if( strchr( irc->umode, 'b' ) )
+                        irc_usermsg( irc, "Account list:" );
+                
                 for( a = irc->accounts; a; a = a->next )
                 {
@@ -347 +361 @@
 {
         account_t *a;
+        int add_for_real = 1;
+        
+        if( g_strcasecmp( cmd[1], "-tmp" ) == 0 )
+        {
+                add_for_real = 0;
+                cmd ++;         /* So evil... :-D */
+        }
         
         if( !( a = account_get( irc, cmd[1] ) ) )
@@ -376 +397 @@
                 }
         }
-        a->gc->prpl->add_buddy( a->gc, cmd[2] );
+        
+        /* By making this optional, you can talk to people without having to
+           add them to your *real* (server-side) contact list. */
+        if( add_for_real )
+                a->gc->prpl->add_buddy( a->gc, cmd[2] );
+                
         add_buddy( a->gc, NULL, cmd[2], cmd[2] );
         
@@ -492 +518 @@
                         format = "%s\t%s";
                 else
-                        format = "%-32.32  %-16.16s";
+                        format = "%-32.32s  %-16.16s";
                 
                 irc_usermsg( irc, format, "Handle", "Nickname" );
@@ -532 +558 @@
         else
         {
-                gc->prpl->rem_permit( gc, cmd[2] );
-                gc->prpl->add_deny( gc, cmd[2] );
-                irc_usermsg( irc, "Buddy `%s' moved from your permit- to your deny-list", cmd[2] );
+                bim_rem_allow( gc, cmd[2] );
+                bim_add_block( gc, cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from your allow- to your block-list", cmd[2] );
         }
 }
@@ -551 +577 @@
                         format = "%s\t%s";
                 else
-                        format = "%-32.32  %-16.16s";
+                        format = "%-32.32s  %-16.16s";
                 
                 irc_usermsg( irc, format, "Handle", "Nickname" );
@@ -591 +617 @@
         else
         {
-                gc->prpl->rem_deny( gc, cmd[2] );
-                gc->prpl->add_permit( gc, cmd[2] );
-                
-                irc_usermsg( irc, "Buddy `%s' moved from your deny- to your permit-list", cmd[2] );
+                bim_rem_block( gc, cmd[2] );
+                bim_add_allow( gc, cmd[2] );
+                
+                irc_usermsg( irc, "Buddy `%s' moved from your block- to your allow-list", cmd[2] );
         }
 }
@@ -753 +779 @@
         else
         {
-                char utf8[1024];
-                
                 irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
                 
-                if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-                    do_iconv( set_getstr( irc, "charset" ), "UTF-8", cmd[2], utf8, 0, 1024 ) != -1 )
-                        a->gc->prpl->set_info( a->gc, utf8 );
-                else
-                        a->gc->prpl->set_info( a->gc, cmd[2] );
+                a->gc->prpl->set_info( a->gc, cmd[2] );
         }
 }

set.c

@@ -150 +150 @@
         if( s )
         {
-                t->next = s->next;
+                if( t )
+                        t->next = s->next;
+                else
+                        irc->set = s->next;
+                
                 g_free( s->key );
                 if( s->value ) g_free( s->value );

user.c

@@ -168 +168 @@
         u->nick = g_strdup( newnick );
         if( !u->user ) u->user = u->nick;
-        if( !u->host ) u->user = u->host;
-        if( !u->realname ) u->user = u->realname;
+        if( !u->host ) u->host = u->nick;
+        if( !u->realname ) u->realname = u->nick;
         
         /* Remove the old reference to this user from the hash and create a

util.c

@@ -445 +445 @@
 }
 #endif
+
+/* Convert from one charset to another.
+   
+   from_cs, to_cs: Source and destination charsets
+   src, dst: Source and destination strings
+   size: Size if src. 0 == use strlen(). strlen() is not reliable for UNICODE/UTF16 strings though.
+   maxbuf: Maximum number of bytes to write to dst
+   
+   Returns the number of bytes written to maxbuf or -1 on an error.
+*/
+signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf )
+{
+        GIConv cd;
+        size_t res;
+        size_t inbytesleft, outbytesleft;
+        char *inbuf = src;
+        char *outbuf = dst;
+        
+        cd = g_iconv_open( to_cs, from_cs );
+        if( cd == (GIConv) -1 )
+                return( -1 );
+        
+        inbytesleft = size ? size : strlen( src );
+        outbytesleft = maxbuf - 1;
+        res = g_iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
+        *outbuf = '\0';
+        g_iconv_close( cd );
+        
+        if( res == (size_t) -1 )
+                return( -1 );
+        else
+                return( outbuf - dst );
+}
+
+char *set_eval_charset( irc_t *irc, set_t *set, char *value )
+{
+        GIConv cd;
+
+        if ( g_strncasecmp( value, "none", 4 ) == 0 )
+                return( value );
+
+        cd = g_iconv_open( "UTF-8", value );
+        if( cd == (GIConv) -1 )
+                return( NULL );
+
+        g_iconv_close( cd );
+        return( value );
+}

utils/bitlbeed.c

@@ -6 +6 @@
 *  (without access to /etc/inetd.conf or whatever)               *
 *                                                                *
-*  Copyright 2002-2004 Wilmer van der Gaast <lintux@debian.org>  *
+*  Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net>   *
 *                                                                *
 *  Licensed under the GNU General Public License                 *