Changeset f5c0d8e for irc_send.c

Timestamp:

2010-08-31T20:06:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c85c08

Parents:

8358691 (diff), 31dbb90a (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:

Merge mainline stuff.

File:

• irc_send.c (modified) (3 diffs)

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 );
@@ -398 +398 @@
                 irc_write( ic->irc, ":%s MODE %s %s", from, ic->name, changes );
 }
+
+void irc_send_invite( irc_user_t *iu, irc_channel_t *ic )
+{
+        irc_t *irc = iu->irc;
+        
+        irc_write( iu->irc, ":%s!%s@%s INVITE %s :%s",
+                   iu->nick, iu->user, iu->host, irc->user->nick, ic->name );
+}