Changeset 68b518d6 for root_commands.c


Ignore:
Timestamp:
2006-05-26T09:03:38Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
cdca30b
Parents:
41ca004 (diff), c53911e (diff), 7bfd574 (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 main development tree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • root_commands.c

    r41ca004 r68b518d6  
    5656                                cmd[k++] = s;
    5757                                s --;
     58                        }
     59                        else
     60                        {
     61                                break;
    5862                        }
    5963                }
     
    554558        else
    555559        {
    556                 gc->prpl->rem_permit( gc, cmd[2] );
    557                 gc->prpl->add_deny( gc, cmd[2] );
    558                 irc_usermsg( irc, "Buddy `%s' moved from your permit- to your deny-list", cmd[2] );
     560                bim_rem_allow( gc, cmd[2] );
     561                bim_add_block( gc, cmd[2] );
     562                irc_usermsg( irc, "Buddy `%s' moved from your allow- to your block-list", cmd[2] );
    559563        }
    560564}
     
    613617        else
    614618        {
    615                 gc->prpl->rem_deny( gc, cmd[2] );
    616                 gc->prpl->add_permit( gc, cmd[2] );
    617                
    618                 irc_usermsg( irc, "Buddy `%s' moved from your deny- to your permit-list", cmd[2] );
     619                bim_rem_block( gc, cmd[2] );
     620                bim_add_allow( gc, cmd[2] );
     621               
     622                irc_usermsg( irc, "Buddy `%s' moved from your block- to your allow-list", cmd[2] );
    619623        }
    620624}
Note: See TracChangeset for help on using the changeset viewer.