X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1728c0128e97cd2b529e1af3fc4ba730018991dd..b7a189f38294c745ae4ea6efb55891c8196e275b:/settings.c diff --git a/settings.c b/settings.c index 47524db6..ce21d2c2 100644 --- a/settings.c +++ b/settings.c @@ -150,6 +150,8 @@ void save_settings(char *section, int do_host, Config * cfg) /* proxy settings */ write_setting_s(sesskey, "ProxyExcludeList", cfg->proxy_exclude_list); + write_setting_i(sesskey, "ProxyDNS", cfg->proxy_dns); + write_setting_i(sesskey, "ProxyLocalhost", cfg->even_proxy_localhost); write_setting_i(sesskey, "ProxyType", cfg->proxy_type); write_setting_s(sesskey, "ProxyHost", cfg->proxy_host); write_setting_i(sesskey, "ProxyPort", cfg->proxy_port); @@ -383,6 +385,8 @@ void load_settings(char *section, int do_host, Config * cfg) /* proxy settings */ gpps(sesskey, "ProxyExcludeList", "", cfg->proxy_exclude_list, sizeof(cfg->proxy_exclude_list)); + gppi(sesskey, "ProxyDNS", PROXYDNS_AUTO, &i); cfg->proxy_dns = i; + gppi(sesskey, "ProxyLocalhost", 0, &cfg->even_proxy_localhost); gppi(sesskey, "ProxyType", PROXY_NONE, &i); cfg->proxy_type = i; gpps(sesskey, "ProxyHost", "proxy", cfg->proxy_host, sizeof(cfg->proxy_host)); @@ -484,6 +488,8 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "TermHeight", 24, &cfg->height); #ifdef _WINDOWS gpps(sesskey, "Font", "Courier New", cfg->font, sizeof(cfg->font)); +#elif defined(macintosh) + gpps(sesskey, "Font", "Monaco", cfg->font, sizeof(cfg->font)); #else gpps(sesskey, "Font", "fixed", cfg->font, sizeof(cfg->font)); #endif @@ -491,7 +497,11 @@ void load_settings(char *section, int do_host, Config * cfg) #ifdef _WINDOWS gppi(sesskey, "FontCharSet", ANSI_CHARSET, &cfg->fontcharset); #endif +#ifdef macintosh + gppi(sesskey, "FontHeight", 9, &cfg->fontheight); +#else gppi(sesskey, "FontHeight", 10, &cfg->fontheight); +#endif #ifdef _WINDOWS if (cfg->fontheight < 0) { int oldh, newh;