Changeset 93b7bd4 for root_commands.c

Timestamp:

2006-10-15T09:34:02Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ee5c355

Parents:

7e83adca (diff), e97827b (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:

Merging from devel and storage-xml.

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -573 +573 @@
         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] );
@@ -656 +656 @@
                 
                 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 );