aboutsummaryrefslogtreecommitdiffstats
path: root/irc_commands.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2008-08-31 16:00:35 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2008-08-31 16:00:35 +0100
commit3611717156f4c9ebfdf829319840d49e59b827ce (patch)
tree979436212a238fe4dd7cfd88071e669fa029196a /irc_commands.c
parentd995c9b5de1bff5e3eb5de47b7ffbd3e92e2ac3d (diff)
Added auto_join code.
Diffstat (limited to 'irc_commands.c')
-rw-r--r--irc_commands.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/irc_commands.c b/irc_commands.c
index d083f714..8941b0e9 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -192,7 +192,6 @@ static void irc_cmd_join( irc_t *irc, char **cmd )
RFC doesn't have any reply for that though? */
else if( cmd[1] )
{
- struct groupchat *gc;
struct chat *c;
user_t *u;
@@ -204,16 +203,7 @@ static void irc_cmd_join( irc_t *irc, char **cmd )
if( ( c = chat_bychannel( irc, cmd[1] ) ) )
{
- char *nick = set_getstr( &c->set, "nick" );
-
- if( nick == NULL )
- nick = irc->nick;
-
- if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, NULL ) ) )
- {
- g_free( gc->channel );
- gc->channel = g_strdup( c->channel );
- }
+ chat_join( irc, c );
}
else
{