mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 12:23:37 +02:00
Fixed memleak in recode.c, fixed typo in special_vars.txt, fixed bug 105, fixed bug 106
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3295 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
55bcc420a7
commit
8ea717b676
26 changed files with 662 additions and 202 deletions
|
|
@ -64,7 +64,6 @@ irssi_SOURCES = \
|
|||
textbuffer-commands.c \
|
||||
textbuffer-reformat.c \
|
||||
textbuffer-view.c \
|
||||
utf8.c \
|
||||
irssi.c \
|
||||
module-formats.c
|
||||
|
||||
|
|
@ -81,7 +80,6 @@ noinst_HEADERS = \
|
|||
textbuffer.h \
|
||||
textbuffer-view.h \
|
||||
textbuffer-reformat.h \
|
||||
utf8.h \
|
||||
module.h \
|
||||
module-formats.h
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include "module.h"
|
||||
#include "signals.h"
|
||||
#include "expandos.h"
|
||||
#include "recode.h"
|
||||
#include "special-vars.h"
|
||||
|
||||
#include "themes.h"
|
||||
|
|
@ -687,8 +686,6 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
|
|||
SERVER_REC *server;
|
||||
WI_ITEM_REC *wiitem;
|
||||
char *tmpstr, *tmpstr2;
|
||||
const char *target;
|
||||
char *recoded;
|
||||
int len;
|
||||
|
||||
if (str == NULL)
|
||||
|
|
@ -727,11 +724,7 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
|
|||
tmpstr2 = reverse_controls(tmpstr);
|
||||
g_free(tmpstr);
|
||||
|
||||
target = wiitem ? window_item_get_target(wiitem) : NULL;
|
||||
recoded = recode_in(tmpstr2, target);
|
||||
g_free(tmpstr2);
|
||||
|
||||
tmpstr = recoded;
|
||||
tmpstr = tmpstr2;
|
||||
if (get_size_only) {
|
||||
item->min_size = item->max_size = format_get_length(tmpstr);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -152,7 +152,6 @@ void term_common_init(void)
|
|||
settings_add_bool("lookandfeel", "term_force_colors", FALSE);
|
||||
settings_add_bool("lookandfeel", "term_auto_detach", FALSE);
|
||||
settings_add_bool("lookandfeel", "mirc_blink_fix", FALSE);
|
||||
settings_add_str("lookandfeel", "term_charset", "ISO8859-1");
|
||||
|
||||
force_colors = FALSE;
|
||||
term_use_colors = term_has_colors() && settings_get_bool("colors");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue