Changes in / [3864c08:6a45181]

Files:

• ipc.c (modified) (3 diffs)
• irc.c (modified) (4 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (3 diffs)
• irc_send.c (modified) (2 diffs)
• nick.c (modified) (2 diffs)
• otr.c (modified) (75 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/purple/purple.c (modified) (1 diff)
• query.c (modified) (3 diffs)
• root_commands.c (modified) (86 diffs)
• storage_xml.c (modified) (5 diffs)

ipc.c

@@ -356 +356 @@
                         irc_switch_fd( irc, ipc_child_recv_fd );
                         irc_sync( irc );
-                        irc_rootmsg( irc, "You've successfully taken over your old session" );
+                        irc_usermsg( irc, "You've successfully taken over your old session" );
                         ipc_child_recv_fd = -1;
                         
@@ -374 +374 @@
         {
                 /* Master->New connection */
-                irc_rootmsg( irc, "Could not take over old session" );
+                irc_usermsg( irc, "Could not take over old session" );
         }
 }
@@ -412 +412 @@
         /* Drop credentials, we'll shut down soon and shouldn't overwrite
            any settings. */
-        irc_rootmsg( irc, "Trying to take over existing session" );
+        irc_usermsg( irc, "Trying to take over existing session" );
         
         irc_desync( irc );

irc.c

@@ -363 +363 @@
                                         if( irc->status & USTATUS_LOGGED_IN )
                                         {
-                                                irc_rootmsg( irc, "Error: Charset mismatch detected. The charset "
+                                                irc_usermsg( irc, "Error: Charset mismatch detected. The charset "
                                                                   "setting is currently set to %s, so please make "
                                                                   "sure your IRC client will send and accept text in "
@@ -767 +767 @@
                         irc->root->last_channel = irc->default_channel;
                         
-                        irc_rootmsg( irc,
+                        irc_usermsg( irc,
                                      "Welcome to the BitlBee gateway!\n\n"
                                      "If you've never used BitlBee before, please do read the help "
@@ -910 +910 @@
                 g_free( test );
                 g_iconv_close( oc );
-                irc_rootmsg( irc, "Unsupported character set: The IRC protocol "
+                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
                                   "only supports 8-bit character sets." );
                 return NULL;
@@ -941 +941 @@
         GSList *l;
         
-        irc_rootmsg( irc, "Setting `%s' is obsolete, use the `show_users' "
+        irc_usermsg( irc, "Setting `%s' is obsolete, use the `show_users' "
                      "channel setting instead.", set->key );
         

irc.h

@@ -317 +317 @@
 void irc_send_login( irc_t *irc );
 void irc_send_motd( irc_t *irc );
-const char *irc_user_msgdest( irc_user_t *iu );
-void irc_rootmsg( irc_t *irc, char *format, ... );
-void irc_usermsg( irc_user_t *iu, char *format, ... );
-void irc_usernotice( irc_user_t *iu, char *format, ... );
+void irc_usermsg( irc_t *irc, char *format, ... );
 void irc_send_join( irc_channel_t *ic, irc_user_t *iu );
 void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );

irc_commands.c

@@ -92 +92 @@
                         irc->status &= ~USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "-R", 1 );
-                        irc_rootmsg( irc, "Changing nicks resets your identify status. "
+                        irc_usermsg( irc, "Changing nicks resets your identify status. "
                                      "Re-identify or register a new account if you want "
                                      "your configuration to be saved. See \x02help "
@@ -433 +433 @@
                         {
                                 set_setstr( &a->set, "password", password );
-                                irc_rootmsg( irc, "Password added to IM account "
+                                irc_usermsg( irc, "Password added to IM account "
                                              "%s(%s)", a->prpl->name, a->user );
                                 /* The IRC client may expect this. 491 suggests the OPER

irc_im.c

@@ -197 +197 @@
         irc_t *irc = bee->ui_data;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        const char *dst;
-        char *prefix = NULL;
+        char *dst, *prefix = NULL;
         char *wrapped, *ts = NULL;
+        irc_channel_t *ic = NULL;
         char *msg = g_strdup( msg_ );
         GSList *l;
@@ -206 +206 @@
                 ts = irc_format_timestamp( irc, sent_at );
         
-        dst = irc_user_msgdest( iu );
-        if( dst != irc->user->nick )
-        {
-                /* if not messaging directly, call user by name */
+        /* Too similar to irc_usermsg()... */
+        if( iu->last_channel )
+        {
+                if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
+                        ic = iu->last_channel;
+                else
+                        ic = irc_channel_with_user( irc, iu );
+        }
+        
+        if( ic )
+        {
+                dst = ic->name;
                 prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
         }
         else
         {
+                dst = irc->user->nick;
                 prefix = ts;
-                ts = NULL;      /* don't double-free */
+                ts = NULL;
         }
         
@@ -984 +993 @@
         else if( !acc->prpl->chat_join )
         {
-                irc_rootmsg( ic->irc, "Named chatrooms not supported on that account." );
+                irc_usermsg( ic->irc, "Named chatrooms not supported on that account." );
                 return SET_INVALID;
         }

irc_send.c

@@ -110 +110 @@
 }
 
-/* Used by some funcs that generate PRIVMSGs to figure out if we're talking to
-   this person in /query or in a control channel. WARNING: callers rely on
-   this returning a pointer at irc->user_nick, not a copy of it. */
-const char *irc_user_msgdest( irc_user_t *iu )
-{
-        irc_t *irc = iu->irc;
+void irc_usermsg( irc_t *irc, char *format, ... )
+{
         irc_channel_t *ic = NULL;
-
+        irc_user_t *iu = irc->root;
+        char text[2048];
+        va_list params;
+        char *dst;
+        
+        va_start( params, format );
+        g_vsnprintf( text, sizeof( text ), format, params );
+        va_end( params );
+        
+        /* Too similar to bee_irc_user_msg()... */
         if( iu->last_channel )
         {
@@ -123 +128 @@
                         ic = iu->last_channel;
                 else
-                        ic = irc_channel_with_user( irc, iu );
+                        ic = irc_channel_with_user( irc, irc->root );
         }
         
         if( ic )
-                return ic->name;
+                dst = ic->name;
         else
-                return irc->user->nick;
-}
-
-/* cmd = "PRIVMSG" or "NOTICE" */
-static void irc_usermsg_( const char *cmd, irc_user_t *iu, const char *format, va_list params )
-{
-        char text[2048];
-        const char *dst;
-        
-        g_vsnprintf( text, sizeof( text ), format, params );
-        
-        dst = irc_user_msgdest( iu );
-        irc_send_msg( iu, cmd, dst, text, NULL );
-}
-
-void irc_usermsg(irc_user_t *iu, char *format, ... )
-{
-        va_list params;
-        va_start( params, format );
-        irc_usermsg_( "PRIVMSG", iu, format, params );
-        va_end( params );
-}
-
-void irc_usernotice(irc_user_t *iu, char *format, ... )
-{
-        va_list params;
-        va_start( params, format );
-        irc_usermsg_( "NOTICE", iu, format, params );
-        va_end( params );
-}
-
-void irc_rootmsg( irc_t *irc, char *format, ... )
-{
-        va_list params;
-        va_start( params, format );
-        irc_usermsg_( "PRIVMSG", irc->root, format, params );
-        va_end( params );
+                dst = irc->user->nick;
+        
+        irc_send_msg( irc->root, "PRIVMSG", dst, text, NULL );
 }
 

nick.c

@@ -243 +243 @@
                         int i;
                         
-                        irc_rootmsg( irc, "Warning: Almost had an infinite loop in nick_get()! "
+                        irc_usermsg( irc, "Warning: Almost had an infinite loop in nick_get()! "
                                           "This used to be a fatal BitlBee bug, but we tried to fix it. "
                                           "This message should *never* appear anymore. "
@@ -249 +249 @@
                                           "Please send all the following lines in your report:" );
                         
-                        irc_rootmsg( irc, "Trying to get a sane nick for handle %s", bu->handle );
+                        irc_usermsg( irc, "Trying to get a sane nick for handle %s", bu->handle );
                         for( i = 0; i < MAX_NICK_LENGTH; i ++ )
-                                irc_rootmsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
-                        
-                        irc_rootmsg( irc, "FAILED. Returning an insane nick now. Things might break. "
+                                irc_usermsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
+                        
+                        irc_usermsg( irc, "FAILED. Returning an insane nick now. Things might break. "
                                           "Good luck, and please don't forget to paste the lines up here "
                                           "in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );

otr.c

@@ -278 +278 @@
         e = otrl_privkey_read(irc->otr->us, s);
         if(e && e!=enoent) {
-                irc_rootmsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
+                irc_usermsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
         }
         g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->user->nick);
         e = otrl_privkey_read_fingerprints(irc->otr->us, s, NULL, NULL);
         if(e && e!=enoent) {
-                irc_rootmsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
+                irc_usermsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
         }
         
@@ -291 +291 @@
         }
         if(kg) {
-                irc_rootmsg(irc, "Notice: "
+                irc_usermsg(irc, "Notice: "
                         "The accounts above do not have OTR encryption keys associated with them, yet. "
                         "These keys are now being generated in the background. "
@@ -309 +309 @@
         e = otrl_privkey_write_fingerprints(irc->otr->us, s);
         if(e) {
-                irc_rootmsg(irc, "otr save: %s: %s", s, gcry_strerror(e));
+                irc_usermsg(irc, "otr save: %s: %s", s, gcry_strerror(e));
         }
         chmod(s, 0600);
@@ -348 +348 @@
         k = otrl_privkey_find(irc->otr->us, a->user, a->prpl->name);
         if(k) {
-                irc_rootmsg(irc, "otr: %s/%s ready", a->user, a->prpl->name);
+                irc_usermsg(irc, "otr: %s/%s ready", a->user, a->prpl->name);
                 return 0;
         } if(keygen_in_progress(irc, a->user, a->prpl->name)) {
-                irc_rootmsg(irc, "otr: keygen for %s/%s already in progress", a->user, a->prpl->name);
+                irc_usermsg(irc, "otr: keygen for %s/%s already in progress", a->user, a->prpl->name);
                 return 0;
         } else {
-                irc_rootmsg(irc, "otr: starting background keygen for %s/%s", a->user, a->prpl->name);
+                irc_usermsg(irc, "otr: starting background keygen for %s/%s", a->user, a->prpl->name);
                 otr_keygen(irc, a->user, a->prpl->name);
                 return 1;
@@ -365 +365 @@
         char *newmsg = NULL;
         OtrlTLV *tlvs = NULL;
+        char *colormsg;
         irc_t *irc = iu->irc;
         struct im_connection *ic = iu->bu->ic;
@@ -384 +385 @@
         } else if(!newmsg) {
                 /* this was a non-OTR message */
-                return msg;
+                return g_strdup(msg);
         } else {
                 /* OTR has processed this message */
                 ConnContext *context = otrl_context_find(irc->otr->us, iu->bu->handle,
                         ic->acc->user, ic->acc->prpl->name, 0, NULL, NULL, NULL);
-
-                /* we're done with the original msg, which will be caller-freed. */
-                /* NB: must not change the newmsg pointer, since we free it. */
-                msg = newmsg;
 
                 if(context && context->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
@@ -400 +397 @@
                            !(ic->flags & OPT_DOES_HTML) &&
                            set_getbool(&ic->bee->set, "strip_html")) {
-                                strip_html(msg);
+                                strip_html(newmsg);
                         }
 
                         /* coloring */
                         if(set_getbool(&ic->bee->set, "otr_color_encrypted")) {
-                                int color;                /* color according to f'print trust */
-                                char *pre="", *sep="";    /* optional parts */
+                                /* color according to f'print trust */
+                                int color;
                                 const char *trust = context->active_fingerprint->trust;
-
                                 if(trust && trust[0] != '\0')
                                         color=3;   /* green */
@@ -414 +410 @@
                                         color=5;   /* red */
 
-                                /* in a query window, keep "/me " uncolored at the beginning */
-                                if(g_strncasecmp(msg, "/me ", 4) == 0
-                                   && irc_user_msgdest(iu) == irc->user->nick) {
-                                        msg += 4;  /* skip */
-                                        pre = "/me ";
+                                if(newmsg[0] == ',') {
+                                        /* could be a problem with the color code */
+                                        /* insert a space between color spec and message */
+                                        colormsg = g_strdup_printf("\x03%.2d %s\x0F", color, newmsg);
+                                } else {
+                                        colormsg = g_strdup_printf("\x03%.2d%s\x0F", color, newmsg);
                                 }
-
-                                /* comma in first place could mess with the color code */
-                                if(msg[0] == ',') {
-                                    /* insert a space between color spec and message */
-                                    sep = " ";
-                                }
-
-                                msg = g_strdup_printf("%s\x03%.2d%s%s\x0F", pre,
-                                        color, sep, msg);
                         }
-                }
-
-                if(msg == newmsg) {
-                        msg = g_strdup(newmsg);
-                }
+                } else {
+                        colormsg = g_strdup(newmsg);
+                }
+
                 otrl_message_free(newmsg);
-                return msg;
+                return colormsg;
         }
 }
@@ -444 +431 @@
         int st;
         char *otrmsg = NULL;
-        char *emsg = msg;           /* the message as we hand it to libotr */
         ConnContext *ctx = NULL;
         irc_t *irc = iu->irc;
@@ -454 +440 @@
         }
 
+        /* HTML encoding */
+        /* consider OTR plaintext to be HTML if otr_does_html is set */
+        if(set_getbool(&ic->bee->set, "otr_does_html") &&
+           (g_strncasecmp(msg, "<html>", 6) != 0)) {
+                msg = escape_html(msg);
+        }
+        
+        st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
+                ic->acc->user, ic->acc->prpl->name, iu->bu->handle,
+                msg, NULL, &otrmsg, NULL, NULL);
+        if(st) {
+                return NULL;
+        }
+
         ctx = otrl_context_find(irc->otr->us,
                         iu->bu->handle, ic->acc->user, ic->acc->prpl->name,
                         1, NULL, NULL, NULL);
-
-        /* HTML encoding */
-        /* consider OTR plaintext to be HTML if otr_does_html is set */
-        if(ctx && ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED &&
-           set_getbool(&ic->bee->set, "otr_does_html") &&
-           (g_strncasecmp(msg, "<html>", 6) != 0)) {
-                emsg = escape_html(msg);
-        }
-        
-        st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
-                ic->acc->user, ic->acc->prpl->name, iu->bu->handle,
-                emsg, NULL, &otrmsg, NULL, NULL);
-        if(emsg != msg) {
-                g_free(emsg);   /* we're done with this one */
-        }
-        if(st) {
-                return NULL;
-        }
 
         if(otrmsg) {
@@ -522 +504 @@
         
         if(!cmd->command) {
-                irc_rootmsg(irc, "%s: unknown subcommand \"%s\", see \x02help otr\x02",
+                irc_usermsg(irc, "%s: unknown subcommand \"%s\", see \x02help otr\x02",
                         args[0], args[1]);
                 return;
@@ -528 +510 @@
         
         if(!args[cmd->required_parameters+1]) {
-                irc_rootmsg(irc, "%s %s: not enough arguments (%d req.)",
+                irc_usermsg(irc, "%s %s: not enough arguments (%d req.)",
                         args[0], args[1], cmd->required_parameters);
                 return;
@@ -600 +582 @@
         if (strcmp(accountname, recipient) == 0) {
                 /* huh? injecting messages to myself? */
-                irc_rootmsg(irc, "note to self: %s", message);
+                irc_usermsg(irc, "note to self: %s", message);
         } else {
                 /* need to drop some consts here :-( */
@@ -615 +597 @@
         char *msg = g_strdup(message);
         irc_t *irc = ic->bee->ui_data;
-        irc_user_t *u = peeruser(irc, username, protocol);
 
         strip_html(msg);
-        if(u) {
-                /* display as a notice from this particular user */
-                irc_usernotice(u, "%s", msg);
-        } else {
-                irc_rootmsg(irc, "[otr] %s", msg);
-        }
+        irc_usermsg(irc, "otr: %s", msg);
 
         g_free(msg);
@@ -635 +611 @@
         struct im_connection *ic = check_imc(opdata, accountname, protocol);
         irc_t *irc = ic->bee->ui_data;
-        irc_user_t *u = peeruser(irc, username, protocol);
         char hunam[45];         /* anybody looking? ;-) */
         
         otrl_privkey_hash_to_human(hunam, fingerprint);
-        if(u) {
-                irc_usernotice(u, "new fingerprint: %s", hunam);
-        } else {
-                /* this case shouldn't normally happen */
-                irc_rootmsg(irc, "new fingerprint for %s/%s: %s",
-                        username, protocol, hunam);
-        }
+        irc_usermsg(irc, "new fingerprint for %s: %s",
+                peernick(irc, username, protocol), hunam);
 }
 
@@ -674 +644 @@
         if(!otr_update_modeflags(irc, u)) {
                 char *trust = u->flags & IRC_USER_OTR_TRUSTED ? "trusted" : "untrusted!";
-                irc_usernotice(u, "conversation is now off the record (%s)", trust);
+                irc_usermsg(irc, "conversation with %s is now off the record (%s)", u->nick, trust);
         }
 }
@@ -694 +664 @@
         otr_update_uflags(context, u);
         if(!otr_update_modeflags(irc, u))
-                irc_usernotice(u, "conversation is now in cleartext");
+                irc_usermsg(irc, "conversation with %s is now in the clear", u->nick);
 }
 
@@ -715 +685 @@
         if(!otr_update_modeflags(irc, u)) {
                 char *trust = u->flags & IRC_USER_OTR_TRUSTED ? "trusted" : "untrusted!";
-                irc_usernotice(u, "otr connection has been refreshed (%s)", trust);
+                irc_usermsg(irc, "otr connection with %s has been refreshed (%s)", u->nick, trust);
         }
 }
@@ -759 +729 @@
         u = irc_user_by_name(irc, args[1]);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_rootmsg(irc, "%s: unknown user", args[1]);
+                irc_usermsg(irc, "%s: unknown user", args[1]);
                 return;
         }
@@ -784 +754 @@
         u = irc_user_by_name(irc, args[1]);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_rootmsg(irc, "%s: unknown user", args[1]);
+                irc_usermsg(irc, "%s: unknown user", args[1]);
                 return;
         }
         if(!(u->bu->flags & BEE_USER_ONLINE)) {
-                irc_rootmsg(irc, "%s is offline", args[1]);
+                irc_usermsg(irc, "%s is offline", args[1]);
                 return;
         }
@@ -815 +785 @@
         u = irc_user_by_name(irc, args[1]);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_rootmsg(irc, "%s: unknown user", args[1]);
+                irc_usermsg(irc, "%s: unknown user", args[1]);
                 return;
         }
@@ -822 +792 @@
                 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
         if(!ctx) {
-                irc_rootmsg(irc, "%s: no otr context with user", args[1]);
+                irc_usermsg(irc, "%s: no otr context with user", args[1]);
                 return;
         }
@@ -834 +804 @@
                         
                         if(!*p || !*q) {
-                                irc_rootmsg(irc, "failed: truncated fingerprint block %d", i+1);
+                                irc_usermsg(irc, "failed: truncated fingerprint block %d", i+1);
                                 return;
                         }
@@ -841 +811 @@
                         y = hexval(*q);
                         if(x<0) {
-                                irc_rootmsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+1, i+1);
+                                irc_usermsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+1, i+1);
                                 return;
                         }
                         if(y<0) {
-                                irc_rootmsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+2, i+1);
+                                irc_usermsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+2, i+1);
                                 return;
                         }
@@ -854 +824 @@
         fp = otrl_context_find_fingerprint(ctx, raw, 0, NULL);
         if(!fp) {
-                irc_rootmsg(irc, "failed: no such fingerprint for %s", args[1]);
+                irc_usermsg(irc, "failed: no such fingerprint for %s", args[1]);
         } else {
                 char *trust = args[7] ? args[7] : "affirmed";
                 otrl_context_set_trust(fp, trust);
-                irc_rootmsg(irc, "fingerprint match, trust set to \"%s\"", trust);
+                irc_usermsg(irc, "fingerprint match, trust set to \"%s\"", trust);
                 if(u->flags & IRC_USER_OTR_ENCRYPTED)
                         u->flags |= IRC_USER_OTR_TRUSTED;
@@ -886 +856 @@
                         ctx = otrl_context_find(irc->otr->us, handle, myhandle, protocol, 0, NULL, NULL, NULL);
                         if(!ctx) {
-                                irc_rootmsg(irc, "no such context");
+                                irc_usermsg(irc, "no such context");
                                 g_free(arg);
                                 return;
@@ -893 +863 @@
                         irc_user_t *u = irc_user_by_name(irc, args[1]);
                         if(!u || !u->bu || !u->bu->ic) {
-                                irc_rootmsg(irc, "%s: unknown user", args[1]);
+                                irc_usermsg(irc, "%s: unknown user", args[1]);
                                 g_free(arg);
                                 return;
@@ -900 +870 @@
                                 u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
                         if(!ctx) {
-                                irc_rootmsg(irc, "no otr context with %s", args[1]);
+                                irc_usermsg(irc, "no otr context with %s", args[1]);
                                 g_free(arg);
                                 return;
@@ -908 +878 @@
                 /* show how we resolved the (nick) argument, if we did */
                 if(handle!=arg) {
-                        irc_rootmsg(irc, "%s is %s/%s; we are %s/%s to them", args[1],
+                        irc_usermsg(irc, "%s is %s/%s; we are %s/%s to them", args[1],
                                 ctx->username, ctx->protocol, ctx->accountname, ctx->protocol);
                 }
@@ -923 +893 @@
         n = atoi(args[1]);
         if(n<0 || (!n && strcmp(args[1], "0"))) {
-                irc_rootmsg(irc, "%s: invalid account number", args[1]);
+                irc_usermsg(irc, "%s: invalid account number", args[1]);
                 return;
         }
@@ -930 +900 @@
         for(i=0; i<n && a; i++, a=a->next);
         if(!a) {
-                irc_rootmsg(irc, "%s: no such account", args[1]);
+                irc_usermsg(irc, "%s: no such account", args[1]);
                 return;
         }
         
         if(keygen_in_progress(irc, a->user, a->prpl->name)) {
-                irc_rootmsg(irc, "keygen for account %d already in progress", n);
+                irc_usermsg(irc, "keygen for account %d already in progress", n);
                 return;
         }
@@ -957 +927 @@
         
         if(fp == fp->context->active_fingerprint) {
-                irc_rootmsg(irc, "that fingerprint is active, terminate otr connection first");
+                irc_usermsg(irc, "that fingerprint is active, terminate otr connection first");
                 return;
         }
@@ -973 +943 @@
         
         if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
-                irc_rootmsg(irc, "active otr connection with %s, terminate it first",
+                irc_usermsg(irc, "active otr connection with %s, terminate it first",
                         peernick(irc, ctx->username, ctx->protocol));
                 return;
@@ -1005 +975 @@
                 
                 if(!args[3]) {
-                        irc_rootmsg(irc, "otr %s %s: not enough arguments (2 req.)", args[0], args[1]);
+                        irc_usermsg(irc, "otr %s %s: not enough arguments (2 req.)", args[0], args[1]);
                         return;
                 }
@@ -1012 +982 @@
                 u = irc_user_by_name(irc, args[2]);
                 if(!u || !u->bu || !u->bu->ic) {
-                        irc_rootmsg(irc, "%s: unknown user", args[2]);
+                        irc_usermsg(irc, "%s: unknown user", args[2]);
                         return;
                 }
@@ -1019 +989 @@
                         u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
                 if(!ctx) {
-                        irc_rootmsg(irc, "no otr context with %s", args[2]);
+                        irc_usermsg(irc, "no otr context with %s", args[2]);
                         return;
                 }
@@ -1030 +1000 @@
                 
                 if(fp == ctx->active_fingerprint) {
-                        irc_rootmsg(irc, "that fingerprint is active, terminate otr connection first");
+                        irc_usermsg(irc, "that fingerprint is active, terminate otr connection first");
                         return;
                 }
@@ -1055 +1025 @@
                 u = irc_user_by_name(irc, args[2]);
                 if(!u || !u->bu || !u->bu->ic) {
-                        irc_rootmsg(irc, "%s: unknown user", args[2]);
+                        irc_usermsg(irc, "%s: unknown user", args[2]);
                         return;
                 }
@@ -1062 +1032 @@
                         u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
                 if(!ctx) {
-                        irc_rootmsg(irc, "no otr context with %s", args[2]);
+                        irc_usermsg(irc, "no otr context with %s", args[2]);
                         return;
                 }
                 
                 if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
-                        irc_rootmsg(irc, "active otr connection with %s, terminate it first", args[2]);
+                        irc_usermsg(irc, "active otr connection with %s, terminate it first", args[2]);
                         return;
                 }
@@ -1100 +1070 @@
         else
         {
-                irc_rootmsg(irc, "otr %s: unknown subcommand \"%s\", see \x02help otr forget\x02",
+                irc_usermsg(irc, "otr %s: unknown subcommand \"%s\", see \x02help otr forget\x02",
                         args[0], args[1]);
         }
@@ -1126 +1096 @@
         if(!context) {
                 /* huh? out of memory or what? */
-                irc_rootmsg(irc, "smp: failed to get otr context for %s", u->nick);
+                irc_usermsg(irc, "smp: failed to get otr context for %s", u->nick);
                 otrl_message_abort_smp(us, ops, u->bu->ic, context);
                 otrl_sm_state_free(context->smstate);
@@ -1134 +1104 @@
 
         if (context->smstate->sm_prog_state == OTRL_SMP_PROG_CHEATED) {
-                irc_rootmsg(irc, "smp %s: opponent violated protocol, aborting",
+                irc_usermsg(irc, "smp %s: opponent violated protocol, aborting",
                         u->nick);
                 otrl_message_abort_smp(us, ops, u->bu->ic, context);
@@ -1144 +1114 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT1) {
-                        irc_rootmsg(irc, "smp %s: spurious SMP1Q received, aborting", u->nick);
+                        irc_usermsg(irc, "smp %s: spurious SMP1Q received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
                 } else {
                         char *question = g_strndup((char *)tlv->data, tlv->len);
-                        irc_rootmsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
+                        irc_usermsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
                                 question);
-                        irc_rootmsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
+                        irc_usermsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
                                 u->nick);
                         g_free(question);
@@ -1160 +1130 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT1) {
-                        irc_rootmsg(irc, "smp %s: spurious SMP1 received, aborting", u->nick);
+                        irc_usermsg(irc, "smp %s: spurious SMP1 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
                 } else {
-                        irc_rootmsg(irc, "smp: initiated by %s"
+                        irc_usermsg(irc, "smp: initiated by %s"
                                 " - respond with \x02otr smp %s <secret>\x02",
                                 u->nick, u->nick);
@@ -1173 +1143 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT2) {
-                        irc_rootmsg(irc, "smp %s: spurious SMP2 received, aborting", u->nick);
+                        irc_usermsg(irc, "smp %s: spurious SMP2 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
@@ -1184 +1154 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT3) {
-                        irc_rootmsg(irc, "smp %s: spurious SMP3 received, aborting", u->nick);
+                        irc_usermsg(irc, "smp %s: spurious SMP3 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
@@ -1191 +1161 @@
                         if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
                                 if(context->smstate->received_question) {
-                                        irc_rootmsg(irc, "smp %s: correct answer, you are trusted",
+                                        irc_usermsg(irc, "smp %s: correct answer, you are trusted",
                                                 u->nick);
                                 } else {
-                                        irc_rootmsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                        irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                                 u->nick);
                                 }
                         } else {
                                 if(context->smstate->received_question) {
-                                        irc_rootmsg(irc, "smp %s: wrong answer, you are not trusted",
+                                        irc_usermsg(irc, "smp %s: wrong answer, you are not trusted",
                                                 u->nick);
                                 } else {
-                                        irc_rootmsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                                        irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                                 u->nick);
                                 }
@@ -1213 +1183 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT4) {
-                        irc_rootmsg(irc, "smp %s: spurious SMP4 received, aborting", u->nick);
+                        irc_usermsg(irc, "smp %s: spurious SMP4 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
@@ -1219 +1189 @@
                         /* SMP4 received, otrl_message_receiving will have set fp trust */
                         if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
-                                irc_rootmsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                         u->nick);
                         } else {
-                                irc_rootmsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                         u->nick);
                         }
@@ -1231 +1201 @@
         tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP_ABORT);
         if (tlv) {
-                irc_rootmsg(irc, "smp: received abort from %s", u->nick);
+                irc_usermsg(irc, "smp: received abort from %s", u->nick);
                 otrl_sm_state_free(context->smstate);
                 /* smp is in back in EXPECT1 */
@@ -1246 +1216 @@
         u = irc_user_by_name(irc, nick);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_rootmsg(irc, "%s: unknown user", nick);
+                irc_usermsg(irc, "%s: unknown user", nick);
                 return;
         }
         if(!(u->bu->flags & BEE_USER_ONLINE)) {
-                irc_rootmsg(irc, "%s is offline", nick);
+                irc_usermsg(irc, "%s is offline", nick);
                 return;
         }
@@ -1257 +1227 @@
                 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
         if(!ctx || ctx->msgstate != OTRL_MSGSTATE_ENCRYPTED) {
-                irc_rootmsg(irc, "smp: otr inactive with %s, try \x02otr connect"
+                irc_usermsg(irc, "smp: otr inactive with %s, try \x02otr connect"
                                 " %s\x02", nick, nick);
                 return;
@@ -1272 +1242 @@
         if(question) {
                 /* this was 'otr smpq', just initiate */
-                irc_rootmsg(irc, "smp: initiating with %s...", u->nick);
+                irc_usermsg(irc, "smp: initiating with %s...", u->nick);
                 otrl_message_initiate_smp_q(irc->otr->us, &otr_ops, u->bu->ic, ctx,
                         question, (unsigned char *)secret, strlen(secret));
@@ -1281 +1251 @@
                    is completed or aborted! */ 
                 if(ctx->smstate->secret == NULL) {
-                        irc_rootmsg(irc, "smp: initiating with %s...", u->nick);
+                        irc_usermsg(irc, "smp: initiating with %s...", u->nick);
                         otrl_message_initiate_smp(irc->otr->us, &otr_ops,
                                 u->bu->ic, ctx, (unsigned char *)secret, strlen(secret));
@@ -1288 +1258 @@
                         /* if we're still in EXPECT1 but smstate is initialized, we must have
                            received the SMP1, so let's issue a response */
-                        irc_rootmsg(irc, "smp: responding to %s...", u->nick);
+                        irc_usermsg(irc, "smp: responding to %s...", u->nick);
                         otrl_message_respond_smp(irc->otr->us, &otr_ops,
                                 u->bu->ic, ctx, (unsigned char *)secret, strlen(secret));
@@ -1403 +1373 @@
                 }
                 if(fp == ctx->active_fingerprint) {
-                        irc_rootmsg(irc, "    \x02%s (%s)\x02", human, trust);
+                        irc_usermsg(irc, "    \x02%s (%s)\x02", human, trust);
                 } else {
-                        irc_rootmsg(irc, "    %s (%s)", human, trust);
+                        irc_usermsg(irc, "    %s (%s)", human, trust);
                 }
         }
         if(count==0)
-                irc_rootmsg(irc, "    (none)");
+                irc_usermsg(irc, "    (none)");
 }
 
@@ -1428 +1398 @@
                         
                         if(n>=40) {
-                                irc_rootmsg(irc, "too many fingerprint digits given, expected at most 40");
+                                irc_usermsg(irc, "too many fingerprint digits given, expected at most 40");
                                 return NULL;
                         }
@@ -1435 +1405 @@
                                 *(p++) = c;
                         } else {
-                                irc_rootmsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
+                                irc_usermsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
                                 return NULL;
                         }
@@ -1456 +1426 @@
         }
         if(!fp) {
-                irc_rootmsg(irc, "%s: no match", prefix);
+                irc_usermsg(irc, "%s: no match", prefix);
                 return NULL;
         }
@@ -1469 +1439 @@
         }
         if(fp2) {
-                irc_rootmsg(irc, "%s: multiple matches", prefix);
+                irc_usermsg(irc, "%s: multiple matches", prefix);
                 return NULL;
         }
@@ -1492 +1462 @@
                         
                         if(n>=40) {
-                                irc_rootmsg(irc, "too many fingerprint digits given, expected at most 40");
+                                irc_usermsg(irc, "too many fingerprint digits given, expected at most 40");
                                 return NULL;
                         }
@@ -1499 +1469 @@
                                 *(p++) = c;
                         } else {
-                                irc_rootmsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
+                                irc_usermsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
                                 return NULL;
                         }
@@ -1520 +1490 @@
         }
         if(!k) {
-                irc_rootmsg(irc, "%s: no match", prefix);
+                irc_usermsg(irc, "%s: no match", prefix);
                 return NULL;
         }
@@ -1533 +1503 @@
         }
         if(k2) {
-                irc_rootmsg(irc, "%s: multiple matches", prefix);
+                irc_usermsg(irc, "%s: multiple matches", prefix);
                 return NULL;
         }
@@ -1548 +1518 @@
 
         /* list all privkeys (including ones being generated) */
-        irc_rootmsg(irc, "\x1fprivate keys:\x1f");
+        irc_usermsg(irc, "\x1fprivate keys:\x1f");
         for(key=irc->otr->us->privkey_root; key; key=key->next) {
                 const char *hash;
@@ -1554 +1524 @@
                 switch(key->pubkey_type) {
                 case OTRL_PUBKEY_TYPE_DSA:
-                        irc_rootmsg(irc, "  %s/%s - DSA", key->accountname, key->protocol);
+                        irc_usermsg(irc, "  %s/%s - DSA", key->accountname, key->protocol);
                         break;
                 default:
-                        irc_rootmsg(irc, "  %s/%s - type %d", key->accountname, key->protocol,
+                        irc_usermsg(irc, "  %s/%s - type %d", key->accountname, key->protocol,
                                 key->pubkey_type);
                 }
@@ -1566 +1536 @@
                 hash = otrl_privkey_fingerprint(irc->otr->us, human, key->accountname, key->protocol);
                 if(hash) /* should always succeed */
-                        irc_rootmsg(irc, "    %s", human);
+                        irc_usermsg(irc, "    %s", human);
         }
         if(irc->otr->sent_accountname) {
-                irc_rootmsg(irc, "  %s/%s - DSA", irc->otr->sent_accountname,
+                irc_usermsg(irc, "  %s/%s - DSA", irc->otr->sent_accountname,
                         irc->otr->sent_protocol);
-                irc_rootmsg(irc, "    (being generated)");
+                irc_usermsg(irc, "    (being generated)");
         }
         for(kg=irc->otr->todo; kg; kg=kg->next) {
-                irc_rootmsg(irc, "  %s/%s - DSA", kg->accountname, kg->protocol);
-                irc_rootmsg(irc, "    (queued)");
+                irc_usermsg(irc, "  %s/%s - DSA", kg->accountname, kg->protocol);
+                irc_usermsg(irc, "    (queued)");
         }
         if(key == irc->otr->us->privkey_root &&
            !irc->otr->sent_accountname &&
            kg == irc->otr->todo)
-                irc_rootmsg(irc, "  (none)");
+                irc_usermsg(irc, "  (none)");
 
         /* list all contexts */
-        irc_rootmsg(irc, "%s", "");
-        irc_rootmsg(irc, "\x1f" "connection contexts:\x1f (bold=currently encrypted)");
+        irc_usermsg(irc, "%s", "");
+        irc_usermsg(irc, "\x1f" "connection contexts:\x1f (bold=currently encrypted)");
         for(ctx=irc->otr->us->context_root; ctx; ctx=ctx->next) {\
                 irc_user_t *u;
@@ -1598 +1568 @@
                 
                 if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
-                        irc_rootmsg(irc, "  \x02%s\x02", userstring);
+                        irc_usermsg(irc, "  \x02%s\x02", userstring);
                 } else {
-                        irc_rootmsg(irc, "  %s", userstring);
+                        irc_usermsg(irc, "  %s", userstring);
                 }
                 
@@ -1606 +1576 @@
         }
         if(ctx == irc->otr->us->context_root)
-                irc_rootmsg(irc, "  (none)");
+                irc_usermsg(irc, "  (none)");
 }
 
@@ -1613 +1583 @@
         switch(ctx->otr_offer) {
         case OFFER_NOT:
-                irc_rootmsg(irc, "  otr offer status: none sent");
+                irc_usermsg(irc, "  otr offer status: none sent");
                 break;
         case OFFER_SENT:
-                irc_rootmsg(irc, "  otr offer status: awaiting reply");
+                irc_usermsg(irc, "  otr offer status: awaiting reply");
                 break;
         case OFFER_ACCEPTED:
-                irc_rootmsg(irc, "  otr offer status: accepted our offer");
+                irc_usermsg(irc, "  otr offer status: accepted our offer");
                 break;
         case OFFER_REJECTED:
-                irc_rootmsg(irc, "  otr offer status: ignored our offer");
+                irc_usermsg(irc, "  otr offer status: ignored our offer");
                 break;
         default:
-                irc_rootmsg(irc, "  otr offer status: %d", ctx->otr_offer);
+                irc_usermsg(irc, "  otr offer status: %d", ctx->otr_offer);
         }
 
         switch(ctx->msgstate) {
         case OTRL_MSGSTATE_PLAINTEXT:
-                irc_rootmsg(irc, "  connection state: cleartext");
+                irc_usermsg(irc, "  connection state: cleartext");
                 break;
         case OTRL_MSGSTATE_ENCRYPTED:
-                irc_rootmsg(irc, "  connection state: encrypted (v%d)", ctx->protocol_version);
+                irc_usermsg(irc, "  connection state: encrypted (v%d)", ctx->protocol_version);
                 break;
         case OTRL_MSGSTATE_FINISHED:
-                irc_rootmsg(irc, "  connection state: shut down");
+                irc_usermsg(irc, "  connection state: shut down");
                 break;
         default:
-                irc_rootmsg(irc, "  connection state: %d", ctx->msgstate);
-        }
-
-        irc_rootmsg(irc, "  fingerprints: (bold=active)");      
+                irc_usermsg(irc, "  connection state: %d", ctx->msgstate);
+        }
+
+        irc_usermsg(irc, "  fingerprints: (bold=active)");      
         show_fingerprints(irc, ctx);
 }
@@ -1682 +1652 @@
                 
                 if(pipe(to) < 0 || pipe(from) < 0) {
-                        irc_rootmsg(irc, "otr keygen: couldn't create pipe: %s", strerror(errno));
+                        irc_usermsg(irc, "otr keygen: couldn't create pipe: %s", strerror(errno));
                         return;
                 }
@@ -1689 +1659 @@
                 fromf = fdopen(from[0], "r");
                 if(!tof || !fromf) {
-                        irc_rootmsg(irc, "otr keygen: couldn't streamify pipe: %s", strerror(errno));
+                        irc_usermsg(irc, "otr keygen: couldn't streamify pipe: %s", strerror(errno));
                         return;
                 }
@@ -1695 +1665 @@
                 p = fork();
                 if(p<0) {
-                        irc_rootmsg(irc, "otr keygen: couldn't fork: %s", strerror(errno));
+                        irc_usermsg(irc, "otr keygen: couldn't fork: %s", strerror(errno));
                         return;
                 }
@@ -1775 +1745 @@
         myfgets(msg, 512, irc->otr->from);
         
-        irc_rootmsg(irc, "%s", msg);
+        irc_usermsg(irc, "%s", msg);
         if(filename[0]) {
                 char *kf = g_strdup_printf("%s%s.otr_keys", global.conf->configdir, irc->user->nick);
@@ -1849 +1819 @@
         
         if(keygen_in_progress(irc, acc->user, acc->prpl->name)) {
-                irc_rootmsg(irc, "keygen for %s/%s already in progress",
+                irc_usermsg(irc, "keygen for %s/%s already in progress",
                         acc->user, acc->prpl->name);
         } else {
-                irc_rootmsg(irc, "starting background keygen for %s/%s",
+                irc_usermsg(irc, "starting background keygen for %s/%s",
                         acc->user, acc->prpl->name);
-                irc_rootmsg(irc, "you will be notified when it completes");
+                irc_usermsg(irc, "you will be notified when it completes");
                 otr_keygen(irc, acc->user, acc->prpl->name);
         }
 }
-
-/* vim: set noet ts=4 sw=4: */

protocols/nogaim.c

@@ -216 +216 @@
         if( a )
                 /* FIXME(wilmer): ui_log callback or so */
-                irc_rootmsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
         else
-                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
+                irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
         
         g_free( text );

protocols/purple/purple.c

@@ -181 +181 @@
                         /** No way to talk to the user right now, invent one when
                         this becomes important.
-                        irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
+                        irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
                                      name, purple_account_option_get_type( o ) );
                         */

query.c

@@ -150 +150 @@
                         imcb_log( q->ic, "Accepted: %s", q->question );
                 else
-                        irc_rootmsg( irc, "Accepted: %s", q->question );
+                        irc_usermsg( irc, "Accepted: %s", q->question );
                 if( q->yes )
                         q->yes( q->data );
@@ -159 +159 @@
                         imcb_log( q->ic, "Rejected: %s", q->question );
                 else
-                        irc_rootmsg( irc, "Rejected: %s", q->question );
+                        irc_usermsg( irc, "Rejected: %s", q->question );
                 if( q->no )
                         q->no( q->data );
@@ -179 +179 @@
         else
         {
-                irc_rootmsg( irc, "New request: %s\nYou can use the \2yes\2/\2no\2 commands to accept/reject this request.", q->question );
+                irc_usermsg( irc, "New request: %s\nYou can use the \2yes\2/\2no\2 commands to accept/reject this request.", q->question );
         }
 }

root_commands.c

@@ -42 +42 @@
                         if( cmd[blaat] == NULL )                               \
                         {                                                      \
-                                irc_rootmsg( irc, "Not enough parameters given (need %d).", x ); \
+                                irc_usermsg( irc, "Not enough parameters given (need %d).", x ); \
                                 return y;                                      \
                         }                                                      \
@@ -69 +69 @@
                 }
         
-        irc_rootmsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
 }
 
@@ -90 +90 @@
         if( s )
         {
-                irc_rootmsg( irc, "%s", s );
+                irc_usermsg( irc, "%s", s );
                 g_free( s );
         }
         else
         {
-                irc_rootmsg( irc, "Error opening helpfile." );
+                irc_usermsg( irc, "Error opening helpfile." );
         }
 }
@@ -110 +110 @@
         if( irc->status & USTATUS_IDENTIFIED )
         {
-                irc_rootmsg( irc, "You're already logged in." );
+                irc_usermsg( irc, "You're already logged in." );
                 return;
         }
@@ -128 +128 @@
         else if( irc->b->accounts != NULL )
         {
-                irc_rootmsg( irc,
+                irc_usermsg( irc,
                              "You're trying to identify yourself, but already have "
                              "at least one IM account set up. "
@@ -138 +138 @@
         if( password == NULL )
         {
-                irc_rootmsg( irc, "About to identify, use /OPER to enter the password" );
+                irc_usermsg( irc, "About to identify, use /OPER to enter the password" );
                 irc->status |= OPER_HACK_IDENTIFY;
                 return;
@@ -150 +150 @@
         switch (status) {
         case STORAGE_INVALID_PASSWORD:
-                irc_rootmsg( irc, "Incorrect password" );
+                irc_usermsg( irc, "Incorrect password" );
                 break;
         case STORAGE_NO_SUCH_USER:
-                irc_rootmsg( irc, "The nick is (probably) not registered" );
+                irc_usermsg( irc, "The nick is (probably) not registered" );
                 break;
         case STORAGE_OK:
-                irc_rootmsg( irc, "Password accepted%s",
+                irc_usermsg( irc, "Password accepted%s",
                              load ? ", settings and accounts loaded" : "" );
                 irc_setpass( irc, password );
@@ -192 +192 @@
         case STORAGE_OTHER_ERROR:
         default:
-                irc_rootmsg( irc, "Unknown error while loading configuration" );
+                irc_usermsg( irc, "Unknown error while loading configuration" );
                 break;
         }
@@ -215 +215 @@
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
-                irc_rootmsg( irc, "This server does not allow registering new accounts" );
+                irc_usermsg( irc, "This server does not allow registering new accounts" );
                 return;
         }
@@ -221 +221 @@
         if( cmd[1] == NULL )
         {
-                irc_rootmsg( irc, "About to register, use /OPER to enter the password" );
+                irc_usermsg( irc, "About to register, use /OPER to enter the password" );
                 irc->status |= OPER_HACK_REGISTER;
                 return;
@@ -228 +228 @@
         switch( storage_save( irc, cmd[1], FALSE ) ) {
                 case STORAGE_ALREADY_EXISTS:
-                        irc_rootmsg( irc, "Nick is already registered" );
+                        irc_usermsg( irc, "Nick is already registered" );
                         break;
                         
                 case STORAGE_OK:
-                        irc_rootmsg( irc, "Account successfully created" );
+                        irc_usermsg( irc, "Account successfully created" );
                         irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
@@ -245 +245 @@
 
                 default:
-                        irc_rootmsg( irc, "Error registering" );
+                        irc_usermsg( irc, "Error registering" );
                         break;
         }
@@ -257 +257 @@
         switch (status) {
         case STORAGE_NO_SUCH_USER:
-                irc_rootmsg( irc, "That account does not exist" );
+                irc_usermsg( irc, "That account does not exist" );
                 break;
         case STORAGE_INVALID_PASSWORD:
-                irc_rootmsg( irc, "Password invalid" );
+                irc_usermsg( irc, "Password invalid" );
                 break;
         case STORAGE_OK:
@@ -266 +266 @@
                 irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
-                irc_rootmsg( irc, "Account `%s' removed", irc->user->nick );
+                irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
                 break;
         default:
-                irc_rootmsg( irc, "Error: `%d'", status );
+                irc_usermsg( irc, "Error: `%d'", status );
                 break;
         }
@@ -277 +277 @@
 {
         if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_rootmsg( irc, "Please create an account first" );
+                irc_usermsg( irc, "Please create an account first" );
         else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
-                irc_rootmsg( irc, "Configuration saved" );
-        else
-                irc_rootmsg( irc, "Configuration could not be saved!" );
+                irc_usermsg( irc, "Configuration saved" );
+        else
+                irc_usermsg( irc, "Configuration could not be saved!" );
 }
 
@@ -290 +290 @@
         
         if( ( val = set_getstr( head, key ) ) )
-                irc_rootmsg( irc, "%s = `%s'", key, val );
+                irc_usermsg( irc, "%s = `%s'", key, val );
         else if( !( set = set_find( head, key ) ) )
         {
-                irc_rootmsg( irc, "Setting `%s' does not exist.", key );
+                irc_usermsg( irc, "Setting `%s' does not exist.", key );
                 if( *head == irc->b->set )
-                        irc_rootmsg( irc, "It might be an account or channel setting. "
+                        irc_usermsg( irc, "It might be an account or channel setting. "
                                      "See \x02help account set\x02 and \x02help channel set\x02." );
         }
         else if( set->flags & SET_PASSWORD )
-                irc_rootmsg( irc, "%s = `********' (hidden)", key );
-        else
-                irc_rootmsg( irc, "%s is empty", key );
+                irc_usermsg( irc, "%s = `********' (hidden)", key );
+        else
+                irc_usermsg( irc, "%s is empty", key );
 }
 
@@ -344 +344 @@
                            feedback. */
                         if( st )
-                                irc_rootmsg( irc, "Setting changed successfully" );
+                                irc_usermsg( irc, "Setting changed successfully" );
                         else
-                                irc_rootmsg( irc, "Failed to change setting" );
+                                irc_usermsg( irc, "Failed to change setting" );
                 }
                 else
@@ -377 +377 @@
         if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
         {
-                irc_rootmsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
                 return 0;
         }
         else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
         {
-                irc_rootmsg( irc, "This setting can only be changed when the account is %s-line", "on" );
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
                 return 0;
         }
@@ -396 +396 @@
         if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
         {
-                irc_rootmsg( irc, "This server only accepts registered users" );
+                irc_usermsg( irc, "This server only accepts registered users" );
                 return;
         }
@@ -413 +413 @@
                                 if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
                                 {
-                                        irc_rootmsg( irc, "Enter password for account %s(%s) "
+                                        irc_usermsg( irc, "Enter password for account %s(%s) "
                                                      "first (use /OPER)", a->prpl->name, a->user );
                                         return;
@@ -425 +425 @@
                 if( prpl == NULL )
                 {
-                        irc_rootmsg( irc, "Unknown protocol" );
+                        irc_usermsg( irc, "Unknown protocol" );
                         return;
                 }
@@ -431 +431 @@
                 for( a = irc->b->accounts; a; a = a->next )
                         if( a->prpl == prpl && prpl->handle_cmp( a->user, cmd[3] ) == 0 )
-                                irc_rootmsg( irc, "Warning: You already have an account with "
+                                irc_usermsg( irc, "Warning: You already have an account with "
                                              "protocol `%s' and username `%s'. Are you accidentally "
                                              "trying to add it twice?", prpl->name, cmd[3] );
@@ -438 +438 @@
                 if( cmd[5] )
                 {
-                        irc_rootmsg( irc, "Warning: Passing a servername/other flags to `account add' "
+                        irc_usermsg( irc, "Warning: Passing a servername/other flags to `account add' "
                                           "is now deprecated. Use `account set' instead." );
                         set_setstr( &a->set, "server", cmd[5] );
                 }
                 
-                irc_rootmsg( irc, "Account successfully added%s", cmd[4] ? "" :
+                irc_usermsg( irc, "Account successfully added%s", cmd[4] ? "" :
                              ", now use /OPER to enter the password" );
                 
@@ -453 +453 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_rootmsg( irc, "Account list:" );
+                        irc_usermsg( irc, "Account list:" );
                 
                 for( a = irc->b->accounts; a; a = a->next )
@@ -468 +468 @@
                                 con = "";
                         
-                        irc_rootmsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
+                        irc_usermsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
                         
                         i ++;
                 }
-                irc_rootmsg( irc, "End of account list" );
+                irc_usermsg( irc, "End of account list" );
                 
                 return;
@@ -484 +484 @@
                 if ( irc->b->accounts )
                 {
-                        irc_rootmsg( irc, "Trying to get all accounts connected..." );
+                        irc_usermsg( irc, "Trying to get all accounts connected..." );
                 
                         for( a = irc->b->accounts; a; a = a->next )
@@ -490 +490 @@
                                 {
                                         if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                                                irc_rootmsg( irc, "Enter password for account %s(%s) "
+                                                irc_usermsg( irc, "Enter password for account %s(%s) "
                                                              "first (use /OPER)", a->prpl->name, a->user );
                                         else
@@ -498 +498 @@
                 else
                 {
-                        irc_rootmsg( irc, "No accounts known. Use `account add' to add one." );
+                        irc_usermsg( irc, "No accounts known. Use `account add' to add one." );
                 }
                 
@@ -505 +505 @@
         else if( len >= 2 && g_strncasecmp( cmd[1], "off", len ) == 0 )
         {
-                irc_rootmsg( irc, "Deactivating all active (re)connections..." );
+                irc_usermsg( irc, "Deactivating all active (re)connections..." );
                 
                 for( a = irc->b->accounts; a; a = a->next )
@@ -530 +530 @@
             ( a = account_get( irc->b, cmd[1] ) ) == NULL )
         {
-                irc_rootmsg( irc, "Could not find account `%s'. Note that the syntax "
+                irc_usermsg( irc, "Could not find account `%s'. Note that the syntax "
                              "of the account command changed, see \x02help account\x02.", cmd[1] );
                 
@@ -540 +540 @@
                 if( a->ic )
                 {
-                        irc_rootmsg( irc, "Account is still logged in, can't delete" );
+                        irc_usermsg( irc, "Account is still logged in, can't delete" );
                 }
                 else
                 {
                         account_del( irc->b, a );
-                        irc_rootmsg( irc, "Account deleted" );
+                        irc_usermsg( irc, "Account deleted" );
                 }
         }
@@ -551 +551 @@
         {
                 if( a->ic )
-                        irc_rootmsg( irc, "Account already online" );
+                        irc_usermsg( irc, "Account already online" );
                 else if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                        irc_rootmsg( irc, "Enter password for account %s(%s) "
+                        irc_usermsg( irc, "Enter password for account %s(%s) "
                                      "first (use /OPER)", a->prpl->name, a->user );
                 else
@@ -567 +567 @@
                 {
                         cancel_auto_reconnect( a );
-                        irc_rootmsg( irc, "Reconnect cancelled" );
-                }
-                else
-                {
-                        irc_rootmsg( irc, "Account already offline" );
+                        irc_usermsg( irc, "Reconnect cancelled" );
+                }
+                else
+                {
+                        irc_usermsg( irc, "Account already offline" );
                 }
         }
@@ -580 +580 @@
         else
         {
-                irc_rootmsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[2] );
+                irc_usermsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[2] );
         }
 }
@@ -597 +597 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_rootmsg( irc, "Channel list:" );
+                        irc_usermsg( irc, "Channel list:" );
                 
                 for( l = irc->channels; l; l = l->next )
@@ -603 +603 @@
                         irc_channel_t *ic = l->data;
                         
-                        irc_rootmsg( irc, "%2d. %s, %s channel%s", i, ic->name,
+                        irc_usermsg( irc, "%2d. %s, %s channel%s", i, ic->name,
                                      set_getstr( &ic->set, "type" ),
                                      ic->flags & IRC_CHANNEL_JOINED ? " (joined)" : "" );
@@ -609 +609 @@
                         i ++;
                 }
-                irc_rootmsg( irc, "End of channel list" );
+                irc_usermsg( irc, "End of channel list" );
                 
                 return;
@@ -623 +623 @@
                         cmd_set_real( irc, cmd + 1, &ic->set, NULL );
                 else
-                        irc_rootmsg( irc, "Could not find channel `%s'", cmd[1] );
+                        irc_usermsg( irc, "Could not find channel `%s'", cmd[1] );
                 
                 return;
@@ -640 +640 @@
                     ic != ic->irc->default_channel )
                 {
-                        irc_rootmsg( irc, "Channel %s deleted.", ic->name );
+                        irc_usermsg( irc, "Channel %s deleted.", ic->name );
                         irc_channel_free( ic );
                 }
                 else
-                        irc_rootmsg( irc, "Couldn't remove channel (main channel %s or "
+                        irc_usermsg( irc, "Couldn't remove channel (main channel %s or "
                                           "channels you're still in cannot be deleted).",
                                           irc->default_channel->name );
@@ -650 +650 @@
         else
         {
-                irc_rootmsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
+                irc_usermsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
         }
 }
@@ -668 +668 @@
         if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -681 +681 @@
                 if( !nick_ok( cmd[3] ) )
                 {
-                        irc_rootmsg( irc, "The requested nick `%s' is invalid", cmd[3] );
+                        irc_usermsg( irc, "The requested nick `%s' is invalid", cmd[3] );
                         return;
                 }
                 else if( irc_user_by_name( irc, cmd[3] ) )
                 {
-                        irc_rootmsg( irc, "The requested nick `%s' already exists", cmd[3] );
+                        irc_usermsg( irc, "The requested nick `%s' already exists", cmd[3] );
                         return;
                 }
@@ -704 +704 @@
                     strcmp( s, "group" ) == 0 &&
                     ( group = set_getstr( &ic->set, "group" ) ) )
-                        irc_rootmsg( irc, "Adding `%s' to contact list (group %s)",
+                        irc_usermsg( irc, "Adding `%s' to contact list (group %s)",
                                      cmd[2], group );
                 else
-                        irc_rootmsg( irc, "Adding `%s' to contact list", cmd[2] );
+                        irc_usermsg( irc, "Adding `%s' to contact list", cmd[2] );
                 
                 a->prpl->add_buddy( a->ic, cmd[2], group );
@@ -720 +720 @@
                 if( ( bu = bee_user_new( irc->b, a->ic, cmd[2], BEE_USER_LOCAL ) ) &&
                     ( iu = bu->ui_data ) )
-                        irc_rootmsg( irc, "Temporarily assigned nickname `%s' "
+                        irc_usermsg( irc, "Temporarily assigned nickname `%s' "
                                      "to contact `%s'", iu->nick, cmd[2] );
         }
@@ -734 +734 @@
         if( !( iu = irc_user_by_name( irc, cmd[1] ) ) || !( bu = iu->bu ) )
         {
-                irc_rootmsg( irc, "Buddy `%s' not found", cmd[1] );
+                irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
                 return;
         }
@@ -744 +744 @@
                 bee_user_free( irc->b, bu );
         
-        irc_rootmsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
+        irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
         g_free( s );
         
@@ -760 +760 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -768 +768 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -779 +779 @@
         if( !ic->acc->prpl->get_info )
         {
-                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -796 +796 @@
         if( iu == NULL )
         {
-                irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
         }
         else if( del )
@@ -802 +802 @@
                 if( iu->bu )
                         bee_irc_user_nick_reset( iu );
-                irc_rootmsg( irc, "Nickname reset to `%s'", iu->nick );
+                irc_usermsg( irc, "Nickname reset to `%s'", iu->nick );
         }
         else if( iu == irc->user )
         {
-                irc_rootmsg( irc, "Use /nick to change your own nickname" );
+                irc_usermsg( irc, "Use /nick to change your own nickname" );
         }
         else if( !nick_ok( cmd[2] ) )
         {
-                irc_rootmsg( irc, "Nick `%s' is invalid", cmd[2] );
+                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
         else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
-                irc_rootmsg( irc, "Nick `%s' already exists", cmd[2] );
+                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
         }
         else
@@ -820 +820 @@
                 if( !irc_user_set_nick( iu, cmd[2] ) )
                 {
-                        irc_rootmsg( irc, "Error while changing nick" );
+                        irc_usermsg( irc, "Error while changing nick" );
                         return;
                 }
@@ -836 +836 @@
                 }
                 
-                irc_rootmsg( irc, "Nick successfully changed" );
+                irc_usermsg( irc, "Nick successfully changed" );
         }
 }
@@ -869 +869 @@
                         format = "%-32.32s  %-16.16s";
                 
-                irc_rootmsg( irc, format, "Handle", "Nickname" );
+                irc_usermsg( irc, format, "Handle", "Nickname" );
                 for( l = a->ic->deny; l; l = l->next )
                 {
                         bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
                         irc_user_t *iu = bu ? bu->ui_data : NULL;
-                        irc_rootmsg( irc, format, l->data, iu ? iu->nick : "(none)" );
-                }
-                irc_rootmsg( irc, "End of list." );
+                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
                 
                 return;
@@ -885 +885 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -893 +893 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -904 +904 @@
         if( !ic->acc->prpl->add_deny || !ic->acc->prpl->rem_permit )
         {
-                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -910 +910 @@
                 imc_rem_allow( ic, cmd[2] );
                 imc_add_block( ic, cmd[2] );
-                irc_rootmsg( irc, "Buddy `%s' moved from allow- to block-list", cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from allow- to block-list", cmd[2] );
         }
 }
@@ -929 +929 @@
                         format = "%-32.32s  %-16.16s";
                 
-                irc_rootmsg( irc, format, "Handle", "Nickname" );
+                irc_usermsg( irc, format, "Handle", "Nickname" );
                 for( l = a->ic->permit; l; l = l->next )
                 {
                         bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
                         irc_user_t *iu = bu ? bu->ui_data : NULL;
-                        irc_rootmsg( irc, format, l->data, iu ? iu->nick : "(none)" );
-                }
-                irc_rootmsg( irc, "End of list." );
+                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
                 
                 return;
@@ -945 +945 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -953 +953 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -964 +964 @@
         if( !ic->acc->prpl->rem_deny || !ic->acc->prpl->add_permit )
         {
-                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -971 +971 @@
                 imc_add_allow( ic, cmd[2] );
                 
-                irc_rootmsg( irc, "Buddy `%s' moved from block- to allow-list", cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from block- to allow-list", cmd[2] );
         }
 }
@@ -998 +998 @@
                         if( ( ++times >= 3 ) )
                         {
-                                irc_rootmsg( irc, "%s", msg[rand()%(sizeof(msg)/sizeof(char*))] );
+                                irc_usermsg( irc, "%s", msg[rand()%(sizeof(msg)/sizeof(char*))] );
                                 last_irc = NULL;
                                 times = 0;
@@ -1011 +1011 @@
                 }
                 
-                irc_rootmsg( irc, "Did I ask you something?" );
+                irc_usermsg( irc, "Did I ask you something?" );
                 return;
         }
@@ -1021 +1021 @@
                 if( sscanf( cmd[1], "%d", &numq ) != 1 )
                 {
-                        irc_rootmsg( irc, "Invalid query number" );
+                        irc_usermsg( irc, "Invalid query number" );
                         return;
                 }
@@ -1031 +1031 @@
                 if( !q )
                 {
-                        irc_rootmsg( irc, "Uhm, I never asked you something like that..." );
+                        irc_usermsg( irc, "Uhm, I never asked you something like that..." );
                         return;
                 }
@@ -1071 +1071 @@
                 format = "%-16.16s  %-40.40s  %s";
         
-        irc_rootmsg( irc, format, "Nick", "Handle/Account", "Status" );
+        irc_usermsg( irc, format, "Nick", "Handle/Account", "Status" );
         
         if( irc->root->last_channel &&
@@ -1094 +1094 @@
                         
                         g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_rootmsg( irc, format, iu->nick, s, st );
+                        irc_usermsg( irc, format, iu->nick, s, st );
                 }
                 
@@ -1112 +1112 @@
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_rootmsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
+                        irc_usermsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
                 }
                 n_away ++;
@@ -1129 +1129 @@
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_rootmsg( irc, format, iu->nick, s, "Offline" );
+                        irc_usermsg( irc, format, iu->nick, s, "Offline" );
                 }
                 n_offline ++;
         }
         
-        irc_rootmsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
+        irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
 }
 
@@ -1144 +1144 @@
         if( !q )
         {
-                irc_rootmsg( irc, "There are no pending questions." );
-                return;
-        }
-        
-        irc_rootmsg( irc, "Pending queries:" );
+                irc_usermsg( irc, "There are no pending questions." );
+                return;
+        }
+        
+        irc_usermsg( irc, "Pending queries:" );
         
         for( num = 0; q; q = q->next, num ++ )
                 if( q->ic ) /* Not necessary yet, but it might come later */
-                        irc_rootmsg( irc, "%d, %s(%s): %s", num, q->ic->acc->prpl->name, q->ic->acc->user, q->question );
-                else
-                        irc_rootmsg( irc, "%d, BitlBee: %s", num, q->question );
+                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->ic->acc->prpl->name, q->ic->acc->user, q->question );
+                else
+                        irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
 }
 
@@ -1170 +1170 @@
                 if( !( acc = account_get( irc->b, cmd[2] ) ) )
                 {
-                        irc_rootmsg( irc, "Invalid account" );
+                        irc_usermsg( irc, "Invalid account" );
                         return;
                 }
                 else if( !acc->prpl->chat_join )
                 {
-                        irc_rootmsg( irc, "Named chatrooms not supported on that account." );
+                        irc_usermsg( irc, "Named chatrooms not supported on that account." );
                         return;
                 }
@@ -1205 +1205 @@
                     set_setstr( &ic->set, "room", cmd[3] ) )
                 {
-                        irc_rootmsg( irc, "Chatroom successfully added." );
+                        irc_usermsg( irc, "Chatroom successfully added." );
                 }
                 else
@@ -1212 +1212 @@
                                 irc_channel_free( ic );
                         
-                        irc_rootmsg( irc, "Could not add chatroom." );
+                        irc_usermsg( irc, "Could not add chatroom." );
                 }
                 g_free( channel );
@@ -1227 +1227 @@
                         if( !iu->bu->ic->acc->prpl->chat_with( iu->bu->ic, iu->bu->handle ) )
                         {
-                                irc_rootmsg( irc, "(Possible) failure while trying to open "
+                                irc_usermsg( irc, "(Possible) failure while trying to open "
                                                   "a groupchat with %s.", iu->nick );
                         }
@@ -1233 +1233 @@
                 else
                 {
-                        irc_rootmsg( irc, "Can't open a groupchat with %s.", cmd[2] );
+                        irc_usermsg( irc, "Can't open a groupchat with %s.", cmd[2] );
                 }
         }
@@ -1240 +1240 @@
                  g_strcasecmp( cmd[1], "del" ) == 0 )
         {
-                irc_rootmsg( irc, "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command." );
+                irc_usermsg( irc, "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command." );
                 cmd_channel( irc, cmd );
         }
         else
         {
-                irc_rootmsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
+                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
         }
 }
@@ -1260 +1260 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_rootmsg( irc, "Group list:" );
+                        irc_usermsg( irc, "Group list:" );
                 
                 for( l = irc->b->groups; l; l = l->next )
                 {
                         bee_group_t *bg = l->data;
-                        irc_rootmsg( irc, "%d. %s", n ++, bg->name );
-                }
-                irc_rootmsg( irc, "End of group list" );
-        }
-        else
-        {
-                irc_rootmsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "group", cmd[1] );
+                        irc_usermsg( irc, "%d. %s", n ++, bg->name );
+                }
+                irc_usermsg( irc, "End of group list" );
+        }
+        else
+        {
+                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "group", cmd[1] );
         }
 }
@@ -1284 +1284 @@
         if( !files )
         {
-                irc_rootmsg( irc, "No pending transfers" );
+                irc_usermsg( irc, "No pending transfers" );
                 return;
         }
@@ -1305 +1305 @@
                 case LIST:
                         if ( file->status == FT_STATUS_LISTENING )
-                                irc_rootmsg( irc, 
+                                irc_usermsg( irc, 
                                         "Pending file(id %d): %s (Listening...)", file->local_id, file->file_name);
                         else 
@@ -1314 +1314 @@
                                         kb_per_s = file->bytes_transferred / 1024 / diff;
                                         
-                                irc_rootmsg( irc, 
+                                irc_usermsg( irc, 
                                         "Pending file(id %d): %s (%10zd/%zd kb, %d kb/s)", file->local_id, file->file_name, 
                                         file->bytes_transferred/1024, file->file_size/1024, kb_per_s);
@@ -1322 +1322 @@
                         if( file->status == FT_STATUS_LISTENING )
                         {
-                                irc_rootmsg( irc, "Rejecting file transfer for %s", file->file_name );
+                                irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
                                 imcb_file_canceled( file->ic, file, "Denied by user" );
                         }
@@ -1329 +1329 @@
                         if( file->local_id == fid )
                         {
-                                irc_rootmsg( irc, "Canceling file transfer for %s", file->file_name );
+                                irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
                                 imcb_file_canceled( file->ic, file, "Canceled by user" );
                         }
@@ -1339 +1339 @@
 static void cmd_nick( irc_t *irc, char **cmd )
 {
-        irc_rootmsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
+        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
 }
 
@@ -1354 +1354 @@
         
         if( msg )
-                irc_rootmsg( irc, "%s: This seems to be your first time using this "
+                irc_usermsg( irc, "%s: This seems to be your first time using this "
                                   "this version of BitlBee. Here's a list of new "
                                   "features you may like to know about:\n\n%s\n",

storage_xml.c

@@ -269 +269 @@
         {
                 xd->unknown_tag ++;
-                irc_rootmsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
+                irc_usermsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
                                   "This may happen when downgrading BitlBee versions. "
                                   "This tag will be skipped and the information will be lost "
@@ -397 +397 @@
                         {
                                 if( gerr && irc )
-                                        irc_rootmsg( irc, "Error from XML-parser: %s", gerr->message );
+                                        irc_usermsg( irc, "Error from XML-parser: %s", gerr->message );
                                 
                                 g_clear_error( &gerr );
@@ -473 +473 @@
         if( ( fd = mkstemp( path ) ) < 0 )
         {
-                irc_rootmsg( irc, "Error while opening configuration file." );
+                irc_usermsg( irc, "Error while opening configuration file." );
                 return STORAGE_OTHER_ERROR;
         }
@@ -570 +570 @@
         if( rename( path, path2 ) != 0 )
         {
-                irc_rootmsg( irc, "Error while renaming temporary configuration file." );
+                irc_usermsg( irc, "Error while renaming temporary configuration file." );
                 
                 g_free( path2 );
@@ -585 +585 @@
         g_free( pass_buf );
         
-        irc_rootmsg( irc, "Write error. Disk full?" );
+        irc_usermsg( irc, "Write error. Disk full?" );
         close( fd );