diff --git a/config_dev b/config_dev index 8e8acbf0..7aea3a46 100644 --- a/config_dev +++ b/config_dev @@ -319,7 +319,6 @@ settings = { theme = "default.theme"; nick_column_enabled = "yes"; nick_column_width = "10"; - debug_nick_column = "yes"; }; "fe-text" = { lag_min_show = "1s"; diff --git a/src/fe-common/core/fe-expandos.c b/src/fe-common/core/fe-expandos.c index 3131d649..c5776db1 100644 --- a/src/fe-common/core/fe-expandos.c +++ b/src/fe-common/core/fe-expandos.c @@ -100,12 +100,7 @@ static char *expando_nickalign(SERVER_REC *server, void *item, int *free_ret) padding = width - total_chars; } - /* Debug output */ - if (settings_get_bool("debug_nick_column")) { - printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, - "DEBUG nickalign: nick='%s', mode='%s', width=%d, mode_chars=%d, nick_chars=%d, total_chars=%d, padding=%d", - current_nick, mode, width, mode_chars, nick_chars, total_chars, padding); - } + *free_ret = TRUE; return g_strnfill(padding, ' '); @@ -118,14 +113,7 @@ static char *expando_nicktrunc(SERVER_REC *server, void *item, int *free_ret) const char *mode; char *result; - /* Debug entry */ - if (settings_get_bool("debug_nick_column")) { - printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, - "DEBUG nicktrunc CALLED: enabled=%s, valid=%s, nick='%s'", - settings_get_bool("nick_column_enabled") ? "yes" : "no", - nick_context_valid ? "yes" : "no", - current_nick ? current_nick : "NULL"); - } + /* Gdy wyłączone - zwróć oryginalny nick */ if (!settings_get_bool("nick_column_enabled")) { @@ -151,29 +139,18 @@ static char *expando_nicktrunc(SERVER_REC *server, void *item, int *free_ret) /* Przytnij nick i dodaj >> */ result = g_strdup_printf("%.*s>>", available_for_nick, current_nick); - if (settings_get_bool("debug_nick_column")) { - printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, - "DEBUG nicktrunc TRUNCATED: original='%s', truncated='%s', available_for_nick=%d", - current_nick, result, available_for_nick); - } + } else { /* Mode sam za długi */ result = g_strdup(">>"); - if (settings_get_bool("debug_nick_column")) { - printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, - "DEBUG nicktrunc MODE_TOO_LONG: result='%s'", result); - } + } *free_ret = TRUE; return result; } else { /* Nick się zmieści - zwróć oryginalny */ - if (settings_get_bool("debug_nick_column")) { - printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, - "DEBUG nicktrunc NO_TRUNCATION: nick='%s', total_chars=%d <= width=%d", - current_nick, total_chars, width); - } + return current_nick; } } diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index 95de3bcd..750ab0a4 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -819,7 +819,6 @@ void fe_messages_init(void) /* Nick column feature settings */ settings_add_bool("lookandfeel", "nick_column_enabled", FALSE); settings_add_int("lookandfeel", "nick_column_width", 12); - settings_add_bool("lookandfeel", "debug_nick_column", FALSE); signal_add_last("message public", (SIGNAL_FUNC) sig_message_public); signal_add_last("message private", (SIGNAL_FUNC) sig_message_private); diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 1bb68595..fa458222 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -922,14 +922,7 @@ char *format_get_text_theme_charargs(THEME_REC *theme, const char *module, text = modified_text; nick_formatting_depth--; - /* Debug output - send to current window, not status */ - if (settings_get_bool("debug_nick_column")) { - WINDOW_REC *window = dest && dest->window ? dest->window : active_win; - printtext_window(window, MSGLEVEL_CLIENTCRAP, - "DEBUG format_auto: formatnum=%d, original='%s'", formatnum, module_theme->expanded_formats[formatnum]); - printtext_window(window, MSGLEVEL_CLIENTCRAP, - "DEBUG format_auto: modified='%s'", text); - } + } result = format_get_text_args(dest, text, args);