moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-22 17:22:18 -05:00
Code Issues Releases Wiki Activity

allow for disabling the filtering mechanism

Browse Source
This commit is contained in:
Berke Viktor 2012-01-20 01:31:53 +01:00
parent a9fb6a18ec
commit c1ec6d1039
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/cfgfiles.c
View File

@ -581,6 +581,9 @@ const struct prefs vars[] = {
{"text_indent", P_OFFINT (indent_nicks), TYPE_BOOL}, {"text_indent", P_OFFINT (indent_nicks), TYPE_BOOL},
{"text_max_indent", P_OFFINT (max_auto_indent), TYPE_INT}, {"text_max_indent", P_OFFINT (max_auto_indent), TYPE_INT},
{"text_max_lines", P_OFFINT (max_lines), TYPE_INT}, {"text_max_lines", P_OFFINT (max_lines), TYPE_INT},
#ifdef WIN32
{"text_nonbmp", P_OFFINT (text_nonbmp), TYPE_BOOL},
#endif
{"text_replay", P_OFFINT (text_replay), TYPE_BOOL}, {"text_replay", P_OFFINT (text_replay), TYPE_BOOL},
{"text_show_marker", P_OFFINT (show_marker), TYPE_BOOL}, {"text_show_marker", P_OFFINT (show_marker), TYPE_BOOL},
{"text_show_sep", P_OFFINT (show_separator), TYPE_BOOL}, {"text_show_sep", P_OFFINT (show_separator), TYPE_BOOL},
@ -714,6 +717,7 @@ load_config (void)
prefs.autodccsend = 2; /* browse mode */ prefs.autodccsend = 2; /* browse mode */
#ifdef WIN32 #ifdef WIN32
prefs.identd = 1; prefs.identd = 1;
prefs.text_nonbmp = 1;
#endif #endif
strcpy (prefs.gui_license, ""); strcpy (prefs.gui_license, "");
strcpy (prefs.spell_langs, g_getenv ("LC_ALL") ? g_getenv ("LC_ALL") : "en_US"); strcpy (prefs.spell_langs, g_getenv ("LC_ALL") ? g_getenv ("LC_ALL") : "en_US");

3
src/common/server.c
View File

@ -402,11 +402,14 @@ server_inline (server *serv, char *line, int len)
} }
#ifdef WIN32 #ifdef WIN32
if (prefs.text_nonbmp)
{
cleaned_line = text_replace_non_bmp (line, len, &cleaned_len); cleaned_line = text_replace_non_bmp (line, len, &cleaned_len);
if (cleaned_line != NULL ) { if (cleaned_line != NULL ) {
line = cleaned_line; line = cleaned_line;
len = cleaned_len; len = cleaned_len;
} }
}
#endif #endif
fe_add_rawlog (serv, line, len, FALSE); fe_add_rawlog (serv, line, len, FALSE);

3
src/common/text.c
View File

@ -374,12 +374,15 @@ scrollback_load (session *sess)
if (text) if (text)
{ {
text = strip_color (text + 1, -1, STRIP_COLOR); text = strip_color (text + 1, -1, STRIP_COLOR);
if (prefs.text_nonbmp)
{
cleaned_text = text_replace_non_bmp (text, -1, &cleaned_len); cleaned_text = text_replace_non_bmp (text, -1, &cleaned_len);
if (cleaned_text != NULL) if (cleaned_text != NULL)
{ {
g_free (text); g_free (text);
text = cleaned_text; text = cleaned_text;
} }
}
fe_print_text (sess, text, stamp); fe_print_text (sess, text, stamp);
g_free (text); g_free (text);
} }

1
src/common/xchat.h
View File

@ -307,6 +307,7 @@ struct xchatprefs
unsigned int emoticons; unsigned int emoticons;
unsigned int tab_icons; unsigned int tab_icons;
unsigned int tab_xp; unsigned int tab_xp;
unsigned int text_nonbmp;
#endif #endif
unsigned int ctcp_number_limit; /*flood */ unsigned int ctcp_number_limit; /*flood */

4
src/fe-gtk/setup.c
View File

@ -407,6 +407,9 @@ static const setting advanced_settings[] =
{ST_TOGGLE, N_("Display MODEs in raw form"), P_OFFINTNL(raw_modes), 0, 0, 0}, {ST_TOGGLE, N_("Display MODEs in raw form"), P_OFFINTNL(raw_modes), 0, 0, 0},
{ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0}, {ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0},
{ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(confmode), N_("Hide channel join/part messages by default"), 0, 0}, {ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(confmode), N_("Hide channel join/part messages by default"), 0, 0},
#ifdef WIN32
{ST_TOGGLE, N_("Sanitize exotic characters causing crashes"), P_OFFINTNL(text_nonbmp), 0, 0, 0},
#endif
{ST_ENTRY, N_("License Text:"), P_OFFSETNL(gui_license), 0, 0, sizeof prefs.gui_license}, {ST_ENTRY, N_("License Text:"), P_OFFSETNL(gui_license), 0, 0, sizeof prefs.gui_license},
{ST_HEADER, N_("Auto Open DCC Windows"),0,0,0}, {ST_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0}, {ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0},
@ -425,6 +428,7 @@ static const setting advanced_settings_oneinstance[] =
{ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0}, {ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0},
{ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(confmode), N_("Hide channel join/part messages by default"), 0, 0}, {ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(confmode), N_("Hide channel join/part messages by default"), 0, 0},
{ST_TOGGLE, N_("Allow only one instance of XChat to run"), P_OFFINTNL(gui_one_instance), 0, 0, 0}, {ST_TOGGLE, N_("Allow only one instance of XChat to run"), P_OFFINTNL(gui_one_instance), 0, 0, 0},
{ST_TOGGLE, N_("Sanitize exotic characters causing crashes"), P_OFFINTNL(text_nonbmp), 0, 0, 0},
{ST_ENTRY, N_("License Text:"), P_OFFSETNL(gui_license), 0, 0, sizeof prefs.gui_license}, {ST_ENTRY, N_("License Text:"), P_OFFSETNL(gui_license), 0, 0, sizeof prefs.gui_license},
{ST_HEADER, N_("Auto Open DCC Windows"),0,0,0}, {ST_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0}, {ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0},