projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged Irssi SVN (upcoming irssi 0.8.11).
[silc.git]
/
apps
/
irssi
/
src
/
core
/
channels.c
diff --git
a/apps/irssi/src/core/channels.c
b/apps/irssi/src/core/channels.c
index 9a92b896caac2bc2dd6692aae625c2b8ef704474..79d8f0e7c826fc81da9960fc993ec15beecfb39e 100644
(file)
--- a/
apps/irssi/src/core/channels.c
+++ b/
apps/irssi/src/core/channels.c
@@
-89,6
+89,7
@@
void channel_destroy(CHANNEL_REC *channel)
g_free_not_null(channel->key);
g_free(channel->mode);
g_free(channel->name);
g_free_not_null(channel->key);
g_free(channel->mode);
g_free(channel->name);
+ g_free(channel->visible_name);
channel->type = 0;
g_free(channel);
channel->type = 0;
g_free(channel);
@@
-219,7
+220,7
@@
static void event_connected(SERVER_REC *server)
static int match_nick_flags(SERVER_REC *server, NICK_REC *nick, char flag)
{
static int match_nick_flags(SERVER_REC *server, NICK_REC *nick, char flag)
{
- const char *flags = server->get_nick_flags();
+ const char *flags = server->get_nick_flags(
server
);
return strchr(flags, flag) == NULL ||
(flag == flags[0] && nick->op) ||
return strchr(flags, flag) == NULL ||
(flag == flags[0] && nick->op) ||
@@
-259,7
+260,7
@@
void channel_send_autocommands(CHANNEL_REC *channel)
continue;
nick = nicklist_find_mask(channel,
continue;
nick = nicklist_find_mask(channel,
- channel->server->isnickflag(*botnick) ?
+ channel->server->isnickflag(
channel->server,
*botnick) ?
botnick+1 : botnick);
if (nick != NULL &&
match_nick_flags(channel->server, nick, *botnick)) {
botnick+1 : botnick);
if (nick != NULL &&
match_nick_flags(channel->server, nick, *botnick)) {