diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-10-15 11:34:02 +0200 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-10-15 11:34:02 +0200 |
commit | 93b7bd4373c7c020f37fb96b547b5eda99daf547 (patch) | |
tree | deda2d1081455b832d6f3354d927544fde39e1c8 /root_commands.c | |
parent | 7e83adca0e875710627588bf28ddb60fb61bd43b (diff) | |
parent | e97827bee83d3a0663aa284e72a4f6c84b4b4dfe (diff) |
Merging from devel and storage-xml.
Diffstat (limited to 'root_commands.c')
-rw-r--r-- | root_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/root_commands.c b/root_commands.c index 3097dc81..e0cd15b9 100644 --- a/root_commands.c +++ b/root_commands.c @@ -572,7 +572,7 @@ static void cmd_remove( irc_t *irc, char **cmd ) u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL ); user_del( irc, cmd[1] ); - nick_del( u->gc->acc, u->handle ); + nick_del( u->gc->acc, s ); irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] ); g_free( s ); @@ -655,7 +655,7 @@ static void cmd_allow( irc_t *irc, char **cmd ) format = "%-32.32s %-16.16s"; irc_usermsg( irc, format, "Handle", "Nickname" ); - for( l = a->gc->deny; l; l = l->next ) + for( l = a->gc->permit; l; l = l->next ) { user_t *u = user_findhandle( a->gc, l->data ); irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" ); |