summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.asciidoc2
-rw-r--r--src/plugins/irc/irc-command.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 57816e92a..bb86f0b37 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -44,6 +44,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* aspell: fix compilation with Enchant < 1.6.0 (closes #192)
* aspell: fix crash with command "/aspell addword" if no word is given
(closes #164, closes #165)
+* irc: fix type of value stored in hashtable when joining a channel
+ (closes #211)
* irc: fix translation of CTCP PING reply (closes #137)
* guile: fix compilation with Guile < 2.0.4 (closes #198)
* perl: fix detection of Perl >= 5.20 with autotools
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 05885c6ed..93a391cc8 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -2202,7 +2202,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
char *new_args, **channels, **keys, *pos_space, *pos_keys, *pos_channel;
char *channel_name;
int i, num_channels, num_keys, length;
- int time_now;
+ time_t time_now;
struct t_irc_channel *ptr_channel;
if (server->sock < 0)
@@ -2265,7 +2265,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
}
}
new_args[0] = '\0';
- time_now = (int)time (NULL);
+ time_now = time (NULL);
for (i = 0; i < num_channels; i++)
{
if (i > 0)