Better !channel support - window items now have "visual_name" and channels

and queries also have "name". Normally they're identical but with !channels
the visible_name contains the short !channel name, while name contains
full !ABCDEchannel name.

The visible_name should be used whenever displaying the channel name, or as
printtext()'s target. So, this breaks a few scripts in !channels, they need
to be modified to use $channel->{visible_name} instead.

Also /LAYOUT SAVE should finally work properly with !channels.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2797 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-05-16 00:34:37 +00:00 committed by cras
commit d346fbe1a9
44 changed files with 325 additions and 247 deletions

View file

@ -35,24 +35,37 @@ static char *get_join_data(CHANNEL_REC *channel)
return g_strdup(channel->name);
}
void channel_init(CHANNEL_REC *channel, int automatic)
static const char *channel_get_target(WI_ITEM_REC *item)
{
return ((CHANNEL_REC *) item)->name;
}
void channel_init(CHANNEL_REC *channel, SERVER_REC *server, const char *name,
const char *visible_name, int automatic)
{
g_return_if_fail(channel != NULL);
g_return_if_fail(channel->name != NULL);
g_return_if_fail(name != NULL);
g_return_if_fail(server != NULL);
channels = g_slist_append(channels, channel);
if (channel->server != NULL) {
channel->server->channels =
g_slist_append(channel->server->channels, channel);
}
if (visible_name == NULL)
visible_name = name;
MODULE_DATA_INIT(channel);
channel->type = module_get_uniq_id_str("WINDOW ITEM TYPE", "CHANNEL");
channel->destroy = (void (*) (WI_ITEM_REC *)) channel_destroy;
channel->mode = g_strdup("");
channel->createtime = time(NULL);
channel->get_target = channel_get_target;
channel->get_join_data = get_join_data;
channel->chat_type = server->chat_type;
channel->server = server;
channel->name = g_strdup(name);
channel->visible_name = g_strdup(visible_name);
channel->mode = g_strdup("");
channel->createtime = time(NULL);
channels = g_slist_append(channels, channel);
server->channels = g_slist_append(server->channels, channel);
signal_emit("channel created", 2, channel, GINT_TO_POINTER(automatic));
}