Changeset b78c4b9


Ignore:
Timestamp:
2010-08-27T04:22:50Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
00374ac
Parents:
ea728e6 (diff), 3f10fad (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 minor mainline changes.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/commands.xml

    rea728e6 rb78c4b9  
    14641464        </bitlbee-command>
    14651465       
    1466         <bitlbee-command name="transfers">
     1466        <bitlbee-command name="transfer">
    14671467                <short-description>Monitor, cancel, or reject file transfers</short-description>
    1468                 <syntax>transfers [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
     1468                <syntax>transfer [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
    14691469               
    14701470                <description>
    14711471                        <para>
    1472                                 Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfers &lt;action&gt;</emphasis> for more information.
     1472                                Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfer &lt;action&gt;</emphasis> for more information.
    14731473                        </para>
    14741474
    14751475                        <ircexample>
    1476                                 <ircline nick="ulim">transfers</ircline>
     1476                                <ircline nick="ulim">transfer</ircline>
    14771477                        </ircexample>
    14781478                </description>
     
    14801480                <bitlbee-command name="cancel">
    14811481                        <short-description>Cancels the file transfer with the given id</short-description>
    1482                         <syntax>transfers &lt;cancel&gt; id</syntax>
     1482                        <syntax>transfer &lt;cancel&gt; id</syntax>
    14831483
    14841484                        <description>
     
    14871487
    14881488                        <ircexample>
    1489                                 <ircline nick="ulim">transfers cancel 1</ircline>
     1489                                <ircline nick="ulim">transfer cancel 1</ircline>
    14901490                                <ircline nick="root">Canceling file transfer for test</ircline>
    14911491                        </ircexample>
     
    14941494                <bitlbee-command name="reject">
    14951495                        <short-description>Rejects all incoming transfers</short-description>
    1496                         <syntax>transfers &lt;reject&gt;</syntax>
     1496                        <syntax>transfer &lt;reject&gt;</syntax>
    14971497
    14981498                        <description>
     
    15011501
    15021502                        <ircexample>
    1503                                 <ircline nick="ulim">transfers reject</ircline>
     1503                                <ircline nick="ulim">transfer reject</ircline>
    15041504                        </ircexample>
    15051505                </bitlbee-command>
  • irc_commands.c

    rea728e6 rb78c4b9  
    302302        char *channel = cmd[1];
    303303        irc_channel_t *ic;
     304        irc_user_t *iu;
    304305       
    305306        if( !channel || *channel == '0' || *channel == '*' || !*channel )
     
    307308        else if( ( ic = irc_channel_by_name( irc, channel ) ) )
    308309                irc_send_who( irc, ic->users, channel );
     310        else if( ( iu = irc_user_by_name( irc, channel ) ) )
     311        {
     312                /* Tiny hack! */
     313                GSList *l = g_slist_append( NULL, iu );
     314                irc_send_who( irc, l, channel );
     315                g_slist_free( l );
     316        }
    309317        else
    310318                irc_send_num( irc, 403, "%s :No such channel", channel );
  • irc_send.c

    rea728e6 rb78c4b9  
    264264void irc_send_who( irc_t *irc, GSList *l, const char *channel )
    265265{
    266         gboolean is_channel = strcmp( channel, "**" ) != 0;
     266        gboolean is_channel = strchr( CTYPES, channel[0] ) != NULL;
    267267       
    268268        while( l )
     
    273273                /* TODO(wilmer): Restore away/channel information here */
    274274                irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",
    275                               channel ? : "*", iu->user, iu->host, irc->root->host,
     275                              is_channel ? channel : "*", iu->user, iu->host, irc->root->host,
    276276                              iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H',
    277277                              iu->fullname );
  • root_commands.c

    rea728e6 rb78c4b9  
    12841284}
    12851285
     1286static void cmd_nick( irc_t *irc, char **cmd )
     1287{
     1288        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
     1289}
     1290
    12861291/* Maybe this should be a stand-alone command as well? */
    12871292static void bitlbee_whatsnew( irc_t *irc )
     
    13381343        { "identify",       1, cmd_identify,       0 },
    13391344        { "info",           1, cmd_info,           0 },
     1345        { "nick",           1, cmd_nick,           0 },
    13401346        { "no",             0, cmd_yesno,          0 },
    13411347        { "qlist",          0, cmd_qlist,          0 },
Note: See TracChangeset for help on using the changeset viewer.