Cleanup previous patch.

diff --git a/config.def.h b/config.def.h
index cc526a3..a52fe1c 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -15,11 +15,11 @@ static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
        "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
        "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
        p, q, winid, NULL } }
-#define DOWNLOAD(d, u) {                  \
+#define DOWNLOAD(d) {                    \
        .v = (char *[]){ "/bin/sh", "-c", \
        "xterm -e \"wget '$0' \
 --load-cookies ~/.surf/cookies.txt \
---user-agent '$1' ; sleep 5\"", d, u, NULL } }
+--user-agent '$1' ; sleep 5\"", d, useragent, NULL } }
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier                    keyval      function    arg             Focus */

diff --git a/surf.c b/surf.c
index cac329b..baebe5c 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -345,7 +345,7 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        Arg arg;
 
        updatewinid(c);
-       arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), useragent);
+       arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o));
        spawn(c, &arg);
        return FALSE;
 }