diff options
| author | Arnavion <arnavion@gmail.com> | 2015-01-18 02:10:05 -0800 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2015-01-18 02:10:05 -0800 |
| commit | d1897c1602bf4ac632ef299583ceedf48066079e (patch) | |
| tree | bd6de5ec90dda1ca6c8ce7f09bb9134eb6e71f55 | |
| parent | 6f8a6e66ccf013e7afe46bd19580d9300047a9ea (diff) | |
Remove "System default" encoding. The default for new servers is UTF-8.
| -rw-r--r-- | src/common/servlist.c | 3 | ||||
| -rw-r--r-- | src/fe-gtk/servlistgui.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/common/servlist.c b/src/common/servlist.c index 2ce64d13..9b509ee3 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -1342,8 +1342,7 @@ servlist_save (void) fprintf (fp, "P=%s\n", net->pass); if (net->logintype) fprintf (fp, "L=%d\n", net->logintype); - if (net->encoding && g_ascii_strcasecmp (net->encoding, "System") && - g_ascii_strcasecmp (net->encoding, "System default")) + if (net->encoding) { fprintf (fp, "E=%s\n", net->encoding); if (!servlist_check_encoding (net->encoding)) diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index f6a1a3c6..f7909f72 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1592,7 +1592,6 @@ servlist_create_charsetcombo (void) int i; cb = gtk_combo_box_text_new_with_entry (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (cb), "System default"); i = 0; while (pages[i]) { @@ -1600,7 +1599,7 @@ servlist_create_charsetcombo (void) 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_CALLBACK (servlist_combo_cb), NULL); |