Adding small fix by Alex Puterbaugh. Thanks.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 37135d8..448c762 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -254,7 +254,7 @@ void
 download(Client *c, const Arg *arg) {
        char *uri;
        WebKitNetworkRequest *r;
-       WebKitDownload       *dl;
+       WebKitDownload *dl;
 
        if(arg->v)
                uri = (char *)arg->v;
@@ -263,6 +263,7 @@ download(Client *c, const Arg *arg) {
        r = webkit_network_request_new(uri);
        dl = webkit_download_new(r);
        initdownload(c->view, dl, c);
+       webkit_download_start(c->download);
 }
 
 void
@@ -305,7 +306,11 @@ find(Client *c, const Arg *arg) {
 
 const char *
 getcookies(SoupURI *uri) {
-       return NULL;
+       const char *c;
+       SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, TRUE);
+       c = soup_cookie_jar_get_cookies(j, uri, TRUE);
+       g_object_unref(j);
+       return c;
 }
 
 const char *
@@ -352,11 +357,10 @@ gotheaders(SoupMessage *msg, gpointer v) {
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        const char *filename;
-       char *uri, *html;
+       char *uri;
        WebKitWebBackForwardList *h;
        WebKitWebHistoryItem *i;
 
-       stop(c, NULL);
        c->download = o;
        filename = webkit_download_get_suggested_filename(o);
        if(!strcmp("", filename))
@@ -364,20 +368,14 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        uri = g_strconcat("file://", dldir, "/", filename, NULL);
        webkit_download_set_destination_uri(c->download, uri);
        c->progress = 0;
-       g_free(uri);
-       html = g_strdup_printf("Download <b>%s</b>...", filename);
-       webkit_web_view_load_html_string(c->view, html,
-                       webkit_download_get_uri(c->download));
        h = webkit_web_view_get_back_forward_list(c->view);
        i = webkit_web_history_item_new_with_data(webkit_download_get_uri(c->download), filename);
        webkit_web_back_forward_list_add_item(h, i);
        g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
        g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
-       webkit_download_start(c->download);
        
        c->title = copystr(&c->title, filename);
        update(c);
-       g_free(html);
        return TRUE;
 }
 
@@ -424,14 +422,15 @@ void
 loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
        switch(webkit_web_view_get_load_status (c->view)) {
        case WEBKIT_LOAD_COMMITTED:
-               setatom(c, uriprop, geturi(c));
+       if(c->download)
+               stop(c, NULL);
+       setatom(c, uriprop, geturi(c));
                break;
        case WEBKIT_LOAD_FINISHED:
                c->progress = 0;
                update(c);
                break;
-       case WEBKIT_LOAD_PROVISIONAL:
-       case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+       default:
                break;
        }
 }
@@ -589,9 +588,8 @@ newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
 
        soup_message_headers_remove(h, "Cookie");
        uri = soup_message_get_uri(msg);
-       if((c = getcookies(uri))) {
+       if((c = getcookies(uri)))
                soup_message_headers_append(h, "Cookie", c);
-       }
        g_signal_connect_after(G_OBJECT(msg), "got-headers", G_CALLBACK(gotheaders), NULL);
 }
 
@@ -613,7 +611,7 @@ newwindow(Client *c, const Arg *arg) {
        if(!plugin)
                cmd[i++] = "-p";
        if(!loadimage)
-               cmd[i++] = "-l";
+               cmd[i++] = "-i";
        if(showxid)
                cmd[i++] = "-x";
        cmd[i++] = "--";
@@ -704,7 +702,15 @@ scroll(Client *c, const Arg *arg) {
 
 void
 setcookie(SoupCookie *c) {
-
+       SoupDate *e;
+       SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
+       c = soup_cookie_copy(c);
+       if(c->expires == NULL) {
+               e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+               soup_cookie_set_expires(c, e);
+       }
+       soup_cookie_jar_add_cookie(j, c);
+       g_object_unref(j);
 }
 
 void
@@ -746,7 +752,6 @@ setup(void) {
        soup_session_remove_feature_by_type(s, soup_cookie_jar_get_type());
        g_signal_connect_after(G_OBJECT(s), "request-started", G_CALLBACK(newrequest), NULL);
 
-
        /* proxy */
        if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
                new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
@@ -827,6 +832,8 @@ updatedownload(WebKitDownload *o, GParamSpec *pspec, Client *c) {
        if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
                c->progress = (gint)(webkit_download_get_progress(c->download)*100);
        }
+       else
+               stop(c, NULL);
        update(c);
 }
 
@@ -839,7 +846,7 @@ updatewinid(Client *c) {
 void
 usage(void) {
        fputs("surf - simple browser\n", stderr);
-       die("usage: surf [-e Window] [-x] [-i] [-p] [-s] [uri]\n");
+       die("usage: surf [-e xid] [-i] [-p] [-s] [-v] [-x] [uri]\n");
 }
 
 void
@@ -882,9 +889,6 @@ main(int argc, char *argv[]) {
                        break;
                }
                switch(argv[i][1]) {
-               case 'x':
-                       showxid = TRUE;
-                       break;
                case 'e':
                        if(++i < argc)
                                embed = atoi(argv[i]);
@@ -900,8 +904,13 @@ main(int argc, char *argv[]) {
                case 's':
                        script = 0;
                        break;
+               case 'x':
+                       showxid = TRUE;
+                       break;
                case 'v':
                        die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
+               default:
+                       usage();
                }
        }
        if(i < argc)