mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk) extremely minor manpage copyediting

This commit is contained in:
Charles Kerr 2010-12-12 16:36:46 +00:00
parent 607de96979
commit 465a2e7c90
8 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/main.c
View File

@ -538,6 +538,19 @@ applyDesktopProxySettings( CURL * easy, GConfClient * client, const char * host_
{
int port;
GConfValue * value;
static gboolean env_set;
static gboolean env_checked = FALSE;
/* Both libcurl and GNOME have hooks for proxy support.
* If someone has set the http_proxy environment variable,
* don't apply the GNOME settings here. That way libcurl can override GNOME. */
if( !env_checked ) {
const char * str = g_getenv( "http_proxy" );
env_set = str && *str;
env_checked = TRUE;
}
if( env_set )
return;
if(( value = gconf_client_get( client, host_key, NULL )))
{