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

Remove "System default" encoding. The default for new servers is UTF-8.

This commit is contained in:
Arnavion 2015-01-18 02:10:05 -08:00
parent 6f8a6e66cc
commit d1897c1602
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/servlist.c
View File

@ -1342,8 +1342,7 @@ servlist_save (void)
fprintf (fp, "P=%s\n", net->pass); fprintf (fp, "P=%s\n", net->pass);
if (net->logintype) if (net->logintype)
fprintf (fp, "L=%d\n", net->logintype); fprintf (fp, "L=%d\n", net->logintype);
if (net->encoding && g_ascii_strcasecmp (net->encoding, "System") && if (net->encoding)
g_ascii_strcasecmp (net->encoding, "System default"))
{ {
fprintf (fp, "E=%s\n", net->encoding); fprintf (fp, "E=%s\n", net->encoding);
if (!servlist_check_encoding (net->encoding)) if (!servlist_check_encoding (net->encoding))

3
src/fe-gtk/servlistgui.c
View File

@ -1592,7 +1592,6 @@ servlist_create_charsetcombo (void)
int i; int i;
cb = gtk_combo_box_text_new_with_entry (); cb = gtk_combo_box_text_new_with_entry ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (cb), "System default");
i = 0; i = 0;
while (pages[i]) while (pages[i])
{ {
@ -1600,7 +1599,7 @@ servlist_create_charsetcombo (void)
i++; i++;
} }
gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN(cb))), selected_net->encoding ? selected_net->encoding : "System default"); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN(cb))), selected_net->encoding ? selected_net->encoding : pages[0]);
g_signal_connect (G_OBJECT (gtk_bin_get_child (GTK_BIN (cb))), "changed", g_signal_connect (G_OBJECT (gtk_bin_get_child (GTK_BIN (cb))), "changed",
G_CALLBACK (servlist_combo_cb), NULL); G_CALLBACK (servlist_combo_cb), NULL);