X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=02656eccd408deda542defbb98bd07a16bc621bf;hb=3c2acda0b745ffd887a99f8f32b64064665fa553;hp=c5da19109535f43acfece0022c72f7fbd5e2c2f3;hpb=29c2ab207afe24c48aaadaf3d2b60390eed4ce6a;p=surf.git

diff --git a/surf.c b/surf.c
index c5da191..02656ec 100644
--- a/surf.c
+++ b/surf.c
@@ -300,7 +300,6 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) {
 
 	g_object_get(result, "context", &context, NULL);
 	g_object_get(result, "link-uri", &arg.v, NULL);
-	printf("%d %d\n", context, e->button);
 	for(i = 0; i < LENGTH(buttons); i++) {
 		if(context & buttons[i].click && e->button == buttons[i].button &&
 		CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) && buttons[i].func) {
@@ -1271,8 +1270,12 @@ setup(void) {
 
 	/* proxy */
 	if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
-		new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
-			g_strdup_printf("http://%s", proxy);
+		new_proxy = g_strrstr(proxy, "http://")
+            || g_strrstr(proxy, "socks://")
+            || g_strrstr(proxy, "socks4://")
+            || g_strrstr(proxy, "socks5://")
+            ? g_strdup(proxy)
+            : g_strdup_printf("http://%s", proxy);
 		puri = soup_uri_new(new_proxy);
 		g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
 		soup_uri_free(puri);