Changeset b78c4b9

Timestamp:

2010-08-27T04:22:50Z (14 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:

• doc/user-guide/commands.xml (modified) (5 diffs)
• irc_commands.c (modified) (2 diffs)
• irc_send.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -1464 +1464 @@
         </bitlbee-command>
         
-        <bitlbee-command name="transfers">
+        <bitlbee-command name="transfer">
                 <short-description>Monitor, cancel, or reject file transfers</short-description>
-                <syntax>transfers [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
+                <syntax>transfer [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
                 
                 <description>
                         <para>
-                                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.
+                                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.
                         </para>
 
                         <ircexample>
-                                <ircline nick="ulim">transfers</ircline>
+                                <ircline nick="ulim">transfer</ircline>
                         </ircexample>
                 </description>
@@ -1480 +1480 @@
                 <bitlbee-command name="cancel">
                         <short-description>Cancels the file transfer with the given id</short-description>
-                        <syntax>transfers &lt;cancel&gt; id</syntax>
+                        <syntax>transfer &lt;cancel&gt; id</syntax>
 
                         <description>
@@ -1487 +1487 @@
 
                         <ircexample>
-                                <ircline nick="ulim">transfers cancel 1</ircline>
+                                <ircline nick="ulim">transfer cancel 1</ircline>
                                 <ircline nick="root">Canceling file transfer for test</ircline>
                         </ircexample>
@@ -1494 +1494 @@
                 <bitlbee-command name="reject">
                         <short-description>Rejects all incoming transfers</short-description>
-                        <syntax>transfers &lt;reject&gt;</syntax>
+                        <syntax>transfer &lt;reject&gt;</syntax>
 
                         <description>
@@ -1501 +1501 @@
 
                         <ircexample>
-                                <ircline nick="ulim">transfers reject</ircline>
+                                <ircline nick="ulim">transfer reject</ircline>
                         </ircexample>
                 </bitlbee-command>

irc_commands.c

@@ -302 +302 @@
         char *channel = cmd[1];
         irc_channel_t *ic;
+        irc_user_t *iu;
         
         if( !channel || *channel == '0' || *channel == '*' || !*channel )
@@ -307 +308 @@
         else if( ( ic = irc_channel_by_name( irc, channel ) ) )
                 irc_send_who( irc, ic->users, channel );
+        else if( ( iu = irc_user_by_name( irc, channel ) ) )
+        {
+                /* Tiny hack! */
+                GSList *l = g_slist_append( NULL, iu );
+                irc_send_who( irc, l, channel );
+                g_slist_free( l );
+        }
         else
                 irc_send_num( irc, 403, "%s :No such channel", channel );

irc_send.c

@@ -264 +264 @@
 void irc_send_who( irc_t *irc, GSList *l, const char *channel )
 {
-        gboolean is_channel = strcmp( channel, "**" ) != 0;
+        gboolean is_channel = strchr( CTYPES, channel[0] ) != NULL;
         
         while( l )
@@ -273 +273 @@
                 /* TODO(wilmer): Restore away/channel information here */
                 irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",
-                              channel ? : "*", iu->user, iu->host, irc->root->host,
+                              is_channel ? channel : "*", iu->user, iu->host, irc->root->host,
                               iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H',
                               iu->fullname );

root_commands.c

@@ -1284 +1284 @@
 }
 
+static void cmd_nick( irc_t *irc, char **cmd )
+{
+        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
+}
+
 /* Maybe this should be a stand-alone command as well? */
 static void bitlbee_whatsnew( irc_t *irc )
@@ -1338 +1343 @@
         { "identify",       1, cmd_identify,       0 },
         { "info",           1, cmd_info,           0 },
+        { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
         { "qlist",          0, cmd_qlist,          0 },