moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "allow for disabling the filtering mechanism" 

This reverts commit c1ec6d1039.
This commit is contained in:
Berke Viktor 2012-01-20 01:47:01 +01:00
parent c37c719210
commit 3563acdb0d
5 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/cfgfiles.c
View File

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

11
src/common/server.c
View File

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

11
src/common/text.c
View File

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

1
src/common/xchat.h
View File

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

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

@ -407,9 +407,6 @@ static const setting advanced_settings[] =
{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_("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_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0},
@ -428,7 +425,6 @@ 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_("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_("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_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0},