mirror of
https://github.com/irssi/irssi.git
synced 2026-08-11 04:43:34 +02:00
printtext(): you can now specify server target with tag name instead of
record. This is useful with DCC chats when you know the initial server tag but the server might be already disconnected. So what this means is that you now get ~/irclogs/ircnet/=nick.log instead of ~/irclogs/=nick.log :) git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2388 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
82b0c081e2
commit
cf83236346
8 changed files with 118 additions and 56 deletions
|
|
@ -277,10 +277,18 @@ void format_read_arglist(va_list va, FORMAT_REC *format,
|
|||
void format_create_dest(TEXT_DEST_REC *dest,
|
||||
void *server, const char *target,
|
||||
int level, WINDOW_REC *window)
|
||||
{
|
||||
format_create_dest_tag(dest, server, NULL, target, level, window);
|
||||
}
|
||||
|
||||
void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
|
||||
const char *server_tag, const char *target,
|
||||
int level, WINDOW_REC *window)
|
||||
{
|
||||
memset(dest, 0, sizeof(TEXT_DEST_REC));
|
||||
|
||||
dest->server = server;
|
||||
dest->server_tag = server != NULL ? SERVER(server)->tag : server_tag;
|
||||
dest->target = target;
|
||||
dest->level = level;
|
||||
dest->window = window != NULL ? window :
|
||||
|
|
@ -611,12 +619,9 @@ static char *get_timestamp(THEME_REC *theme, TEXT_DEST_REC *dest, time_t t)
|
|||
|
||||
static char *get_server_tag(THEME_REC *theme, TEXT_DEST_REC *dest)
|
||||
{
|
||||
SERVER_REC *server;
|
||||
int count = 0;
|
||||
|
||||
server = dest->server;
|
||||
|
||||
if (server == NULL || hide_server_tags)
|
||||
if (dest->server_tag == NULL || hide_server_tags)
|
||||
return NULL;
|
||||
|
||||
/* check for flags if we want to override defaults */
|
||||
|
|
@ -625,7 +630,7 @@ static char *get_server_tag(THEME_REC *theme, TEXT_DEST_REC *dest)
|
|||
|
||||
if ((dest->flags & PRINT_FLAG_SET_SERVERTAG) == 0) {
|
||||
if (dest->window->active != NULL &&
|
||||
dest->window->active->server == server)
|
||||
dest->window->active->server == dest->server)
|
||||
return NULL;
|
||||
|
||||
if (servers != NULL) {
|
||||
|
|
@ -644,7 +649,7 @@ static char *get_server_tag(THEME_REC *theme, TEXT_DEST_REC *dest)
|
|||
}
|
||||
|
||||
return format_get_text_theme(theme, MODULE_NAME, dest,
|
||||
TXT_SERVERTAG, server->tag);
|
||||
TXT_SERVERTAG, dest->server_tag);
|
||||
}
|
||||
|
||||
char *format_get_line_start(THEME_REC *theme, TEXT_DEST_REC *dest, time_t t)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue