diff options
| author | Enno Boland (tox) <tox@s01.de> | 2009-11-02 09:27:32 +0100 |
|---|---|---|
| committer | Enno Boland (tox) <tox@s01.de> | 2009-11-02 09:27:32 +0100 |
| commit | f0f3ddce7673be6d1ee432b1cfe28eace45a622c (patch) | |
| tree | 9817d9b35a4e52b18751ebf5f138b114b0f8257c /surf.c | |
| parent | Added tag 0.3 for changeset 46d516fd2167 (diff) | |
| download | surf-f0f3ddce7673be6d1ee432b1cfe28eace45a622c.tar.gz surf-f0f3ddce7673be6d1ee432b1cfe28eace45a622c.tar.bz2 surf-f0f3ddce7673be6d1ee432b1cfe28eace45a622c.zip | |
adding environment variables for proxy and useragent
Diffstat (limited to 'surf.c')
| -rw-r--r-- | surf.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/surf.c b/surf.c index bb59493..478c07e 100644 --- a/surf.c +++ b/surf.c @@ -457,7 +457,7 @@ newclient(void) { Client *c; WebKitWebSettings *settings; GdkGeometry hints = { 1, 1 }; - char *uri; + char *uri, *ua; if(!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); @@ -532,7 +532,9 @@ newclient(void) { gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c); webkit_web_view_set_full_content_zoom(c->view, TRUE); settings = webkit_web_view_get_settings(c->view); - g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL); + if(!(ua = getenv("SURF_USERAGENT"))) + ua = useragent; + g_object_set(G_OBJECT(settings), "user-agent", ua, NULL); uri = g_strconcat("file://", stylefile, NULL); g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL); g_free(uri); @@ -681,6 +683,8 @@ setatom(Client *c, Atom a, const char *v) { void setup(void) { SoupSession *s; + char *proxy; + SoupURI *puri; /* clean up any zombies immediately */ sigchld(0); @@ -704,6 +708,11 @@ setup(void) { cookies = soup_cookie_jar_new(); soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies)); g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL); + if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) { + puri = soup_uri_new(proxy); + g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL); + soup_uri_free(puri); + } reloadcookies(); } |