diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-10-20 23:00:54 -0400 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-10-20 23:00:54 -0400 |
commit | 3864c0814cc3e86a8035d27558f6d66af836a5a3 (patch) | |
tree | 096e09b8961ef849f9a82b507012de94f99ea51d /irc_commands.c | |
parent | 6a451817589df092ef5121bbe2c7156d2d01f669 (diff) | |
parent | aea22cd1e0e955848c143a8fc36978391e9a4846 (diff) |
Big merge from pesco, closing some OTR issues: #759, #824, #839, #830.
Diffstat (limited to 'irc_commands.c')
-rw-r--r-- | irc_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/irc_commands.c b/irc_commands.c index a1933fa6..144f6589 100644 --- a/irc_commands.c +++ b/irc_commands.c @@ -91,7 +91,7 @@ static void irc_cmd_nick( irc_t *irc, char **cmd ) irc_setpass( irc, NULL ); irc->status &= ~USTATUS_IDENTIFIED; irc_umode_set( irc, "-R", 1 ); - irc_usermsg( irc, "Changing nicks resets your identify status. " + irc_rootmsg( irc, "Changing nicks resets your identify status. " "Re-identify or register a new account if you want " "your configuration to be saved. See \x02help " "nick_changes\x02." ); @@ -432,7 +432,7 @@ static void irc_cmd_oper_hack( irc_t *irc, char **cmd ) if( strcmp( a->pass, PASSWORD_PENDING ) == 0 ) { set_setstr( &a->set, "password", password ); - irc_usermsg( irc, "Password added to IM account " + irc_rootmsg( irc, "Password added to IM account " "%s(%s)", a->prpl->name, a->user ); /* The IRC client may expect this. 491 suggests the OPER password was wrong, so the client won't expect a +o. |