From e67e513a16f3e545fd71eb176aac83d41a1dc271 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Oct 2011 16:56:58 +0200 Subject: rename irc_usermsg to irc_rootmsg. add new irc_usermsg, irc_usernotice. deliver user-specific messages from libotr as notices to that user. --- irc_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'irc_commands.c') 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. -- cgit v1.2.3 From 17f057d70b1513710e3d765969205625f0fc7b76 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 13 Dec 2011 00:34:07 +0000 Subject: As I intended for a while already, use account tags everywhere instead of "protocol(handle)". It's guaranteed to be unique and also shorter. It may suck for people who have multiple accounts and didn't change their tags, but that'll hopefully remind them to change them. --- irc_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'irc_commands.c') diff --git a/irc_commands.c b/irc_commands.c index 144f6589..52cf31d0 100644 --- a/irc_commands.c +++ b/irc_commands.c @@ -433,12 +433,12 @@ static void irc_cmd_oper_hack( irc_t *irc, char **cmd ) { set_setstr( &a->set, "password", password ); irc_rootmsg( irc, "Password added to IM account " - "%s(%s)", a->prpl->name, a->user ); + "%s", a->tag ); /* The IRC client may expect this. 491 suggests the OPER password was wrong, so the client won't expect a +o. It may however repeat the password prompt. We'll see. */ irc_send_num( irc, 491, ":Password added to IM account " - "%s(%s)", a->prpl->name, a->user ); + "%s", a->tag ); } } else if( irc->status & OPER_HACK_IDENTIFY ) -- cgit v1.2.3