diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 57e44487..b76627bf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3213,6 +3213,8 @@ _action_view_encoding_activate (GtkAction* action, encoding = "BIG5"; else if (!strcmp (name, "EncodingJapanese")) encoding = "SHIFT_JIS"; + else if (!strcmp (name, "EncodingKorean")) + encoding = "EUC-KR"; else if (!strcmp (name, "EncodingRussian")) encoding = "KOI8-R"; else if (!strcmp (name, "EncodingUnicode")) @@ -4817,6 +4819,9 @@ static const GtkRadioActionEntry encoding_entries[] = { /* i18n: A double underscore "__" is used to prevent an unwanted mnemonic */ N_("Japanese (SHIFT__JIS)"), "", NULL, 1 }, + { "EncodingKorean", NULL, + N_("Korean (EUC-KR)"), "", + NULL, 1 }, { "EncodingRussian", NULL, N_("Russian (KOI8-R)"), "", NULL, 1 }, @@ -4983,6 +4988,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" diff --git a/midori/midori-view.c b/midori/midori-view.c index 9899e435..e05b8bc0 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1975,6 +1975,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, { "EncodingAutomatic" }, { "EncodingChinese" }, { "EncodingJapanese" }, + { "EncodingKorean" }, { "EncodingRussian" }, { "EncodingUnicode" }, { "EncodingWestern" }, diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 5e473b2c..8a7cfcca 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -211,6 +211,7 @@ midori_preferred_encoding_get_type (void) static const GEnumValue values[] = { { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") }, { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") }, + { MIDORI_ENCODING_KOREAN, "MIDORI_ENCODING_KOREAN", N_("Korean (EUC-KR)") }, { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") }, { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") }, @@ -1011,6 +1012,8 @@ notify_default_encoding_cb (GObject* object, web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE; else if (!strcmp (encoding, "SHIFT_JIS")) web_settings->preferred_encoding = MIDORI_ENCODING_JAPANESE; + else if (!strcmp (encoding, "EUC-KR")) + web_settings->preferred_encoding = MIDORI_ENCODING_KOREAN; else if (!strcmp (encoding, "KOI8-R")) web_settings->preferred_encoding = MIDORI_ENCODING_RUSSIAN; else if (!strcmp (encoding, "UTF-8")) @@ -1266,6 +1269,9 @@ midori_web_settings_set_property (GObject* object, case MIDORI_ENCODING_JAPANESE: g_object_set (object, "default-encoding", "SHIFT_JIS", NULL); break; + case MIDORI_ENCODING_KOREAN: + g_object_set (object, "default-encoding", "EUC-KR", NULL); + break; case MIDORI_ENCODING_RUSSIAN: g_object_set (object, "default-encoding", "KOI8-R", NULL); break; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 82c79390..b219c5f9 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -76,6 +76,7 @@ typedef enum { MIDORI_ENCODING_CHINESE, MIDORI_ENCODING_JAPANESE, + MIDORI_ENCODING_KOREAN, MIDORI_ENCODING_RUSSIAN, MIDORI_ENCODING_UNICODE, MIDORI_ENCODING_WESTERN,