diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2020-05-10 23:31:44 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2020-05-10 23:31:44 +0300 |
| commit | d9b1513ec7c66dbbdbabf469c4eaf6156018a257 (patch) | |
| tree | a3bb4e23bdb80351ccaf1a224d61559c56d2f4fa /plugins/www | |
| parent | 288dd990142c1fde4f758bfa08bf205a6f5d1912 (diff) | |
| parent | 9c1e904d567a52efaf9aea09c9a8cf827374d807 (diff) | |
Fixing merge conflicts from master
Diffstat (limited to 'plugins/www')
| -rw-r--r-- | plugins/www/www_plugin.c | 17 | ||||
| -rw-r--r-- | plugins/www/www_utils.c | 2 | ||||
| -rw-r--r-- | plugins/www/www_utils.h | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/plugins/www/www_plugin.c b/plugins/www/www_plugin.c index b5a3a1182..4bf6b38ff 100644 --- a/plugins/www/www_plugin.c +++ b/plugins/www/www_plugin.c @@ -466,6 +466,15 @@ static void remmina_plugin_www_init(RemminaProtocolWidget *gp) webkit_settings_set_enable_write_console_messages_to_stdout(gpdata->settings, TRUE); #endif + /* allow-file-access-from-file-urls */ + webkit_settings_set_allow_file_access_from_file_urls(gpdata->settings, TRUE); + /* allow-modal-dialogs */ + webkit_settings_set_allow_modal_dialogs(gpdata->settings, TRUE); + /* enable-caret-browsing */ + webkit_settings_set_enable_caret_browsing(gpdata->settings, TRUE); + /* enable-html5-database */ + webkit_settings_set_enable_html5_database(gpdata->settings, TRUE); + /* user-agent. */ if (remmina_plugin_service->file_get_string(remminafile, "user-agent")) { gchar *useragent = g_strdup(remmina_plugin_service->file_get_string(remminafile, "user-agent")); @@ -509,6 +518,13 @@ static void remmina_plugin_www_init(RemminaProtocolWidget *gp) webkit_web_context_set_tls_errors_policy(gpdata->context, WEBKIT_TLS_ERRORS_POLICY_IGNORE); g_info("Ignore TLS errors"); } + if (remmina_plugin_service->file_get_string(remminafile, "proxy-url")) { + gchar *proxyurl = g_strdup(remmina_plugin_service->file_get_string(remminafile, "proxy-url")); + WebKitNetworkProxySettings *proxy_settings = webkit_network_proxy_settings_new (proxyurl, NULL); + webkit_web_context_set_network_proxy_settings(gpdata->context, WEBKIT_NETWORK_PROXY_MODE_CUSTOM, proxy_settings); + webkit_network_proxy_settings_free(proxy_settings); + g_free(proxyurl); + } webkit_web_context_set_automation_allowed(gpdata->context, TRUE); webkit_settings_set_javascript_can_open_windows_automatically(gpdata->settings, TRUE); @@ -876,6 +892,7 @@ static const RemminaProtocolSetting remmina_plugin_www_basic_settings[] = static const RemminaProtocolSetting remmina_plugin_www_advanced_settings[] = { { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "user-agent", N_("User agent"), FALSE, NULL, NULL }, + { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "proxy-url", N_("Proxy URL"), FALSE, NULL, N_("Ex. https://myproxy.com, socks://mysocks:1080") }, { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-java", N_("Turn on Java support"), TRUE, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-smooth-scrolling", N_("Turn on smooth scrolling"), TRUE, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "enable-spatial-navigation", N_("Turn on spatial navigation"), TRUE, NULL, NULL }, diff --git a/plugins/www/www_utils.c b/plugins/www/www_utils.c index b80712756..42a491141 100644 --- a/plugins/www/www_utils.c +++ b/plugins/www/www_utils.c @@ -33,7 +33,7 @@ */ /* Some utils taken form remmina_utils -* TODO: use directhly remmina_utils */ +* TODO: use directly remmina_utils */ #include <stdlib.h> #include <unistd.h> diff --git a/plugins/www/www_utils.h b/plugins/www/www_utils.h index 94fc98272..40407dce0 100644 --- a/plugins/www/www_utils.h +++ b/plugins/www/www_utils.h @@ -33,7 +33,7 @@ */ /* Some utils taken form remmina_utils -* TODO: use directhly remmina_utils */ +* TODO: use directly remmina_utils */ #pragma once |