Changeset 6e9ae72 for irc_commands.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

File:

• irc_commands.c (modified) (2 diffs)

irc_commands.c

@@ -92 +92 @@
                         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 "
@@ -433 +433 @@
                         {
                                 set_setstr( &a->set, "password", password );
-                                irc_usermsg( irc, "Password added to IM account "
-                                             "%s(%s)", a->prpl->name, a->user );
+                                irc_rootmsg( irc, "Password added to IM account "
+                                             "%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 );
                         }
         }