Author: MarkieB Date: Thu Apr 30 04:52:33 2009 New Revision: 7375 URL: http://source.netsurf-browser.org?rev=7375&view=rev Log: complete integration of r7370 Modified: branches/MarkieB/favs/gtk/dialogs/gtk_options.c Modified: branches/MarkieB/favs/gtk/dialogs/gtk_options.c URL: http://source.netsurf-browser.org/branches/MarkieB/favs/gtk/dialogs/gtk_o... ============================================================================== --- branches/MarkieB/favs/gtk/dialogs/gtk_options.c (original) +++ branches/MarkieB/favs/gtk/dialogs/gtk_options.c Thu Apr 30 04:52:33 2009 @@ -344,16 +344,20 @@ SET_COMBO(comboProxyType, proxytype); SET_ENTRY(entryProxyHost, option_http_proxy_host ? option_http_proxy_host : ""); - gtk_widget_set_sensitive (entryProxyHost, proxytype != 0); - snprintf(b, 20, "%d", option_http_proxy_port); - SET_ENTRY(entryProxyPort, b); - gtk_widget_set_sensitive (entryProxyPort, proxytype != 0); + gtk_widget_set_sensitive(entryProxyHost, proxytype != 0); + + snprintf(buf, sizeof(buf), "%d", option_http_proxy_port); + + SET_ENTRY(entryProxyPort, buf); + gtk_widget_set_sensitive(entryProxyPort, proxytype != 0); + SET_ENTRY(entryProxyUser, option_http_proxy_auth_user ? option_http_proxy_auth_user : ""); - gtk_widget_set_sensitive (entryProxyUser, proxytype != 0); + gtk_widget_set_sensitive(entryProxyUser, proxytype != 0); + SET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass ? option_http_proxy_auth_pass : ""); - gtk_widget_set_sensitive (entryProxyPassword, proxytype != 0); + gtk_widget_set_sensitive(entryProxyPassword, proxytype != 0); SET_SPIN(spinMaxFetchers, option_max_fetchers); SET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host);