p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 11 Wiki Activity

degesch: fix some object management

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2015-04-20 23:37:34 +02:00
parent c5695a5f6d
commit 3cfe01e3a7
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
degesch.c
View File

@ -409,6 +409,8 @@ struct app_context
// maybe also broadcast all buffers about the disconnection event // maybe also broadcast all buffers about the disconnection event
// TODO: when getting connected again, rejoin all current channels // TODO: when getting connected again, rejoin all current channels
// FIXME: these should only have weak references, so that we don't have
// to watch all places where they might get unref-ed
struct str_map irc_users; ///< IRC user data struct str_map irc_users; ///< IRC user data
struct str_map irc_channels; ///< IRC channel data struct str_map irc_channels; ///< IRC channel data
struct str_map irc_buffer_map; ///< Maps IRC identifiers to buffers struct str_map irc_buffer_map; ///< Maps IRC identifiers to buffers
@ -1055,6 +1057,19 @@ buffer_remove (struct app_context *ctx, struct buffer *buffer)
} }
#endif // RL_READLINE_VERSION #endif // RL_READLINE_VERSION
// Get rid of the channel, as well as the users,
// if the buffer was the last thing keeping them alive
if (buffer->channel && buffer->channel->ref_count == 2)
str_map_set (&ctx->irc_channels, buffer->channel->name, NULL);
if (buffer->user && buffer->user->ref_count == 2)
str_map_set (&ctx->irc_users, buffer->user->nickname, NULL);
// And make sure to unlink the buffer from "irc_buffer_map"
if (buffer->channel)
str_map_set (&ctx->irc_buffer_map, buffer->channel->name, NULL);
if (buffer->user)
str_map_set (&ctx->irc_buffer_map, buffer->user->nickname, NULL);
str_map_set (&ctx->buffers_by_name, buffer->name, NULL); str_map_set (&ctx->buffers_by_name, buffer->name, NULL);
LIST_UNLINK_WITH_TAIL (ctx->buffers, ctx->buffers_tail, buffer); LIST_UNLINK_WITH_TAIL (ctx->buffers, ctx->buffers_tail, buffer);
buffer_destroy (buffer); buffer_destroy (buffer);
@ -1907,6 +1922,9 @@ irc_handle_nick (struct app_context *ctx, const struct irc_message *msg)
str_map_find (&ctx->irc_buffer_map, user->nickname); str_map_find (&ctx->irc_buffer_map, user->nickname);
if (pm_buffer) if (pm_buffer)
{ {
str_map_set (&ctx->irc_buffer_map, new_nickname, user_ref (user));
str_map_set (&ctx->irc_buffer_map, user->nickname, NULL);
buffer_send (ctx, pm_buffer, BUFFER_LINE_NICK, 0, buffer_send (ctx, pm_buffer, BUFFER_LINE_NICK, 0,
msg->prefix, NULL, "%s", new_nickname); msg->prefix, NULL, "%s", new_nickname);
// TODO: use a full weechat-style buffer name here // TODO: use a full weechat-style buffer name here