Changeset c4a1036

Timestamp:

2008-06-09T01:52:28Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

12ebe74

Parents:

e46e077 (diff), 783e9b7 (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 integration branch.

Files:

• bitlbee.c (modified) (2 diffs)
• bitlbee.conf (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (4 diffs)
• conf.h (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (2 diffs)
• debian/rules (modified) (6 diffs)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (3 diffs)
• lib/arc.h (modified) (1 diff)
• lib/proxy.c (modified) (2 diffs)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/msn/msn.h (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (5 diffs)
• protocols/yahoo/yahoo.c (modified) (2 diffs)
• query.c (modified) (3 diffs)
• query.h (modified) (1 diff)
• root_commands.c (modified) (6 diffs)

bitlbee.c

@@ -54 +54 @@
         ;
 
-        i = getaddrinfo( global.conf->iface, global.conf->port, &hints, &addrinfo_bind );
+        i = getaddrinfo( global.conf->iface_in, global.conf->port, &hints, &addrinfo_bind );
         if( i )
         {
                 log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s",
-                                           global.conf->iface, gai_strerror(i) );
+                                           global.conf->iface_in, gai_strerror(i) );
                 return -1;
         }
@@ -225 +225 @@
         if( st == size )
         {
-                g_free( irc->sendbuffer );
-                irc->sendbuffer = NULL;
-                irc->w_watch_source_id = 0;
-                
                 if( irc->status & USTATUS_SHUTDOWN )
+                {
                         irc_free( irc );
+                }
+                else
+                {
+                        g_free( irc->sendbuffer );
+                        irc->sendbuffer = NULL;
+                        irc->w_watch_source_id = 0;
+                }
                 
                 return FALSE;

bitlbee.conf

@@ -34 +34 @@
 # DaemonInterface = 0.0.0.0
 # DaemonPort = 6667
+
+## ClientInterface:
+##
+## If for any reason, you want BitlBee to use a specific address/interface
+## for outgoing traffic (IM connections, HTTP(S), etc.), set it here.
+##
+# ClientInterface = 0.0.0.0
 
 ## AuthMode

bitlbee.h

@@ -157 +157 @@
 gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );
 
+char *set_eval_root_nick( set_t *set, char *new_nick );
+
 extern global_t global;
 

conf.c

@@ -45 +45 @@
         conf = g_new0( conf_t, 1 );
         
-        conf->iface = NULL;
+        conf->iface_in = NULL;
+        conf->iface_out = NULL;
         conf->port = g_strdup( "6667" );
         conf->nofork = 0;
@@ -82 +83 @@
                 if( opt == 'i' )
                 {
-                        conf->iface = g_strdup( optarg );
+                        conf->iface_in = g_strdup( optarg );
                 }
                 else if( opt == 'p' )
@@ -202 +203 @@
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
                         {
-                                g_free( conf->iface );
-                                conf->iface = g_strdup( ini->value );
+                                g_free( conf->iface_in );
+                                conf->iface_in = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
@@ -209 +210 @@
                                 g_free( conf->port );
                                 conf->port = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "clientinterface" ) == 0 )
+                        {
+                                g_free( conf->iface_out );
+                                conf->iface_out = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "authmode" ) == 0 )

conf.h

@@ -32 +32 @@
 typedef struct conf
 {
-        char *iface;
+        char *iface_in, *iface_out;
         char *port;
         int nofork;

debian/changelog

@@ +1 @@
+bitlbee (1.2-5) UNRELEASED; urgency=low
+
+  * Add Homepage and Vcs-Bzr fields.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
+
 bitlbee (1.2-4) unstable; urgency=low
 
-  * Not a real release, just a placeholder for the changelog.
   * Fixed init script to use the BITLBEE_OPTS variable, not an undefined
-    DAEMON_OPT.
+    DAEMON_OPT. (Closes: #474583)
   * Added dependency information to the init script. (Closes: #472567)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 29 Mar 2008 21:10:33 +0000
+  * Added bitlbee-dev package. Patch from RISKO Gergely <risko@debian.org>
+    with some small modifications. (Closes: #473480)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 07 May 2008 22:40:40 -0700
 
 bitlbee (1.2-3) unstable; urgency=low

debian/control

@@ -5 +5 @@
 Standards-Version: 3.5.9
 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
+Homepage: http://www.bitlbee.org/
+Vcs-Bzr: http://code.bitlbee.org/bitlbee/
 
 Package: bitlbee
@@ -12 +14 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
+
+Package: bitlbee-dev
+Architecture: all
+Depends: bitlbee (= ${binary:Version})
+Description: An IRC to other chat networks gateway
+ This program can be used as an IRC server which forwards everything you
+ say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
+ .
+ This package holds development stuff for compiling plug-ins.

debian/rules

@@ -13 +13 @@
 build-arch: build-arch-stamp
 build-arch-stamp:
-        if [ ! -d debian ]; then exit 1; fi
+        [ -d debian ]
         ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent
         $(MAKE)
@@ -20 +20 @@
 
 clean:
-        if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
-        rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files
+        [ "`whoami`" = "root" -a -d debian ]
+        rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files debian/bitlbee-dev
         -$(MAKE) distclean
 #       -$(MAKE) -C doc/ clean
@@ -27 +27 @@
 
 install-arch: build-arch
-        if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
+        [ "`whoami`" = "root" -a -d debian ]
         mkdir -p debian/bitlbee/DEBIAN/
         $(MAKE) install install-etc DESTDIR=`pwd`/debian/bitlbee
@@ -35 +35 @@
         cp doc/user-guide/user-guide.html debian/bitlbee/usr/share/doc/bitlbee/
 
+install-indep: install-arch
+        [ "`whoami`" = "root" -a -d debian ]
+        mkdir -p debian/bitlbee-dev/DEBIAN/
+        $(MAKE) install-dev DESTDIR=`pwd`/debian/bitlbee-dev
+
+        mkdir -p debian/bitlbee-dev/usr/share/doc/bitlbee-dev/
+
 binary-arch: build-arch install-arch
-        if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
+        [ "`whoami`" = "root" -a -d debian ]
 
         chmod 755 debian/post* debian/pre* debian/config debian/bitlbee.init
@@ -52 +59 @@
                         doc/bitlbee/examples/* man/man8/bitlbee.8 man/man5/bitlbee.conf.5
         
-        chown -R root.root debian/bitlbee/
+        chown -R root:root debian/bitlbee/
         find debian/bitlbee/usr/share/ -type d -exec chmod 755 {} \;
         find debian/bitlbee/usr/share/ -type f -exec chmod 644 {} \;
@@ -77 +84 @@
         dpkg --build debian/bitlbee ..
 
-debug-build:
-        BITLBEE_VERSION=\"`date +%Y%m%d`-`hostname`-debug\" debian/rules clean binary DEBUG=1
+binary-indep: install-indep
+        [ "`whoami`" = "root" -a -d debian ]
 
-binary: binary-arch
+        chown -R root.root debian/bitlbee-dev/
+        find debian/bitlbee-dev/usr/share/ -type d -exec chmod 755 {} \;
+        find debian/bitlbee-dev/usr/share/ -type f -exec chmod 644 {} \;
+
+        cp debian/changelog debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
+        gzip -9 debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
+        cp debian/copyright debian/bitlbee-dev/usr/share/doc/bitlbee-dev/copyright
+
+        cd debian/bitlbee-dev; \
+                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
+
+        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
+
+        dpkg --build debian/bitlbee-dev ..
+
+binary: binary-arch binary-indep
 build: build-arch
-install: install-arch
+install: install-arch install-indep
 
-.PHONY: build-arch build clean binary-arch binary install-arch install
+.PHONY: build-arch build clean binary-arch binary install-arch install binary-indep install-indep

doc/user-guide/commands.xml

@@ -589 +589 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="root_nick" type="string" scope="global">
+                <default>root</default>
+
+                <description>
+                        <para>
+                                Normally the "bot" that takes all your BitlBee commands is called "root". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="save_on_quit" type="boolean" scope="global">
                 <default>true</default>

irc.c

@@ -151 +151 @@
         set_add( &irc->set, "private", "true", set_eval_bool, irc );
         set_add( &irc->set, "query_order", "lifo", NULL, irc );
+        set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc );
         set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
         set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
@@ -199 +200 @@
         if( irc->sendbuffer && !immed )
         {
-                /* We won't read from this socket anymore. Instead, we'll connect a timer
-                   to it that should shut down the connection in a second, just in case
-                   bitlbee_.._write doesn't do it first. */
+                /* Set up a timeout event that should shut down the connection
+                   in a second, just in case ..._write doesn't do it first. */
                 
                 b_event_remove( irc->r_watch_source_id );
-                irc->r_watch_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
+                irc->r_watch_source_id = 0;
+                
+                b_event_remove( irc->ping_source_id );
+                irc->ping_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
         }
         else
@@ -274 +277 @@
         if( irc->ping_source_id > 0 )
                 b_event_remove( irc->ping_source_id );
-        b_event_remove( irc->r_watch_source_id );
+        if( irc->r_watch_source_id > 0 )
+                b_event_remove( irc->r_watch_source_id );
         if( irc->w_watch_source_id > 0 )
                 b_event_remove( irc->w_watch_source_id );

lib/arc.h

@@ -31 +31 @@
 };
 
+#ifndef G_GNUC_MALLOC
+#define G_GNUC_MALLOC
+#endif
+
 G_GNUC_MALLOC struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles );
 unsigned char arc_getbyte( struct arc_state *st );

lib/proxy.c

@@ -114 +114 @@
 {
         struct sockaddr_in *sin;
+        struct sockaddr_in me;
         int fd = -1;
 
@@ -127 +128 @@
 
         sock_make_nonblocking(fd);
+        
+        if( global.conf->iface_out )
+        {
+                me.sin_family = AF_INET;
+                me.sin_port = 0;
+                me.sin_addr.s_addr = inet_addr( global.conf->iface_out );
+                
+                if( bind( fd, (struct sockaddr *) &me, sizeof( me ) ) != 0 )
+                        event_debug( "bind( %d, \"%s\" ) failure\n", fd, global.conf->iface_out );
+        }
         
         event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);

protocols/jabber/jabber_util.c

@@ -246 +246 @@
 };
 
-static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_yes( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
@@ -257 +259 @@
 }
 
-static void jabber_buddy_ask_no( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_no( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         

protocols/msn/msn.h

@@ -29 +29 @@
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
 
-#ifdef DEBUG
+#ifdef DEBUG_MSN
 #define debug( text... ) imcb_log( ic, text );
 #else

protocols/msn/msn_util.c

@@ -90 +90 @@
 };
 
-static void msn_buddy_ask_yes( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_yes( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
@@ -102 +104 @@
 }
 
-static void msn_buddy_ask_no( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_no( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
         

protocols/msn/ns.c

@@ -178 +178 @@
                         
                         debug( "Connecting to a new switchboard with key %s", cmd[5] );
-                        sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW );
+
+                        if( ( sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW ) ) == NULL )
+                        {
+                                /* Although this isn't strictly fatal for the NS connection, it's
+                                   definitely something serious (we ran out of file descriptors?). */
+                                imcb_error( ic, "Could not create new switchboard" );
+                                imc_logout( ic, TRUE );
+                                return( 0 );
+                        }
                         
                         if( md->msgq )
@@ -468 +476 @@
                 debug( "Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4] );
                 
-                sb = msn_sb_create( ic, server, port, cmd[4], session );
-                sb->who = g_strdup( cmd[5] );
+                if( ( sb = msn_sb_create( ic, server, port, cmd[4], session ) ) == NULL )
+                {
+                        /* Although this isn't strictly fatal for the NS connection, it's
+                           definitely something serious (we ran out of file descriptors?). */
+                        imcb_error( ic, "Could not create new switchboard" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                else
+                {
+                        sb->who = g_strdup( cmd[5] );
+                }
         }
         else if( strcmp( cmd[0], "ADD" ) == 0 )

protocols/nogaim.c

@@ -343 +343 @@
 /* dialogs.c */
 
-void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont )
+void imcb_ask( struct im_connection *ic, char *msg, void *data,
+               query_callback doit, query_callback dont )
 {
         query_add( ic->irc, ic, msg, doit, dont, data );
@@ -495 +496 @@
 };
 
-void show_got_added_no( gpointer w, struct show_got_added_data *data )
-{
-        g_free( data->handle );
+void show_got_added_no( void *data )
+{
+        g_free( ((struct show_got_added_data*)data)->handle );
         g_free( data );
 }
 
-void show_got_added_yes( gpointer w, struct show_got_added_data *data )
-{
-        data->ic->acc->prpl->add_buddy( data->ic, data->handle, NULL );
-        /* imcb_add_buddy( data->ic, NULL, data->handle, data->handle ); */
-        
-        return show_got_added_no( w, data );
+void show_got_added_yes( void *data )
+{
+        struct show_got_added_data *sga = data;
+        
+        sga->ic->acc->prpl->add_buddy( sga->ic, sga->handle, NULL );
+        /* imcb_add_buddy( sga->ic, NULL, sga->handle, sga->handle ); */
+        
+        return show_got_added_no( data );
 }
 

protocols/nogaim.h

@@ -42 +42 @@
 #include "account.h"
 #include "proxy.h"
+#include "query.h"
 #include "md5.h"
 
@@ -280 +281 @@
  * - 'doit' or 'dont' will be called depending of the answer of the user.
  */
-G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont );
+G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, query_callback doit, query_callback dont );
 G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
 

protocols/oscar/oscar.c

@@ -1084 +1084 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv);
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv);
+void oscar_accept_chat(void *data);
+void oscar_reject_chat(void *data);
         
 static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args) {
@@ -1119 +1119 @@
 }
 
-static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authgrant(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -1134 +1135 @@
 }
 
-static void gaim_icq_authdeny(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authdeny(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, *message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -2588 +2590 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
+void oscar_accept_chat(void *data)
 {
+        struct aim_chat_invitation * inv = data;
+        
         oscar_chat_join(inv->ic, inv->name, NULL, NULL);
         g_free(inv->name);
@@ -2595 +2599 @@
 }
 
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
+void oscar_reject_chat(void *data)
 {
+        struct aim_chat_invitation * inv = data;
+        
         g_free(inv->name);
         g_free(inv);

protocols/yahoo/yahoo.c

@@ -797 +797 @@
 }
 
-static void byahoo_accept_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_accept_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
         imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
@@ -805 +807 @@
 }
 
-static void byahoo_reject_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_reject_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
         imcb_chat_free( inv->c );

query.c

@@ -30 +30 @@
 static query_t *query_default( irc_t *irc );
 
-query_t *query_add( irc_t *irc, struct im_connection *ic, char *question, void *yes, void *no, void *data )
+query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
+                    query_callback yes, query_callback no, void *data )
 {
         query_t *q = g_new0( query_t, 1 );
@@ -144 +145 @@
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                q->yes( NULL, q->data );
+                q->yes( q->data );
         }
         else
@@ -152 +153 @@
                 else
                         irc_usermsg( irc, "Rejected: %s", q->question );
-                q->no( NULL, q->data );
+                q->no( q->data );
         }
         q->data = NULL;

query.h

@@ -27 +27 @@
 #define _QUERY_H
 
+typedef void (*query_callback) ( void *data );
+
 typedef struct query
 {
         struct im_connection *ic;
         char *question;
-        void (* yes) ( gpointer w, void *data );
-        void (* no) ( gpointer w, void *data );
+        query_callback yes, no;
         void *data;
         struct query *next;
 } query_t;
 
-query_t *query_add( irc_t *irc, struct im_connection *ic, char *question, void *yes, void *no, void *data );
+query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
+                    query_callback yes, query_callback no, void *data );
 void query_del( irc_t *irc, query_t *q );
 void query_del_by_conn( irc_t *irc, struct im_connection *ic );

root_commands.c

@@ -204 +204 @@
 }
 
-void cmd_account_del_yes( gpointer w, void *data )
-{
-        account_t *a = data;
-        irc_t *irc = a->irc;
-        
-        if( a->ic )
-        {
-                irc_usermsg( irc, "Account is still logged in, can't delete" );
-        }
-        else
-        {
-                account_del( irc, a );
-                irc_usermsg( irc, "Account deleted" );
-        }
-}
-
-void cmd_account_del_no( gpointer w, void *data )
-{
+struct cmd_account_del_data
+{
+        account_t *a;
+        irc_t *irc;
+};
+
+void cmd_account_del_yes( void *data )
+{
+        struct cmd_account_del_data *cad = data;
+        account_t *a;
+        
+        for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
+        
+        if( a == NULL )
+        {
+                irc_usermsg( cad->irc, "Account already deleted" );
+        }
+        else if( a->ic )
+        {
+                irc_usermsg( cad->irc, "Account is still logged in, can't delete" );
+        }
+        else
+        {
+                account_del( cad->irc, a );
+                irc_usermsg( cad->irc, "Account deleted" );
+        }
+        g_free( data );
+}
+
+void cmd_account_del_no( void *data )
+{
+        g_free( data );
 }
 
@@ -278 +292 @@
                 else
                 {
+                        struct cmd_account_del_data *cad;
                         char *msg;
+                        
+                        cad = g_malloc( sizeof( struct cmd_account_del_data ) );
+                        cad->a = a;
+                        cad->irc = irc;
                         
                         msg = g_strdup_printf( "If you remove this account (%s(%s)), BitlBee will "
@@ -285 +304 @@
                                                "set' command. Are you sure you want to delete this "
                                                "account?", a->prpl->name, a->user );
-                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, a );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }
@@ -404 +423 @@
                         acc_handle = g_strdup( cmd[2] );
                 
+                if( !acc_handle )
+                {
+                        irc_usermsg( irc, "Not enough parameters given (need %d)", 3 );
+                        return;
+                }
+                
                 if( ( tmp = strchr( acc_handle, '/' ) ) )
                 {
@@ -584 +609 @@
                         g_free( irc->mynick );
                         irc->mynick = g_strdup( cmd[2] );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "root_nick", cmd[2] );
                 }
                 else if( u->send_handler == buddy_send_handler )
@@ -592 +620 @@
                 irc_usermsg( irc, "Nick successfully changed" );
         }
+}
+
+char *set_eval_root_nick( set_t *set, char *new_nick )
+{
+        irc_t *irc = set->data;
+        
+        if( strcmp( irc->mynick, new_nick ) != 0 )
+        {
+                char *cmd[] = { "set_rename", irc->mynick, new_nick, NULL };
+                
+                cmd_rename( irc, cmd );
+        }
+        
+        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL;
 }