[hackers] [surf] merge || Enno Boland (tox)

changeset: 198:0e09e6a88399
tag: tip
parent: 197:21259f9b0be2
parent: 193:69eb0025cb01
user: Enno Boland (tox) <tox_AT_s01.de>
date: Sun May 09 22:41:11 2010 +0200
files: config.mk surf.c
description:
merge

diff -r 21259f9b0be2 -r 0e09e6a88399 config.def.h
--- a/config.def.h Sun May 09 19:37:46 2010 +0200
+++ b/config.def.h Sun May 09 22:41:11 2010 +0200
@@ -6,7 +6,8 @@
 static char *scriptfile = ".surf/script.js";
 static char *cookiefile = ".surf/cookies.txt";
 static char *dldir = ".surf/dl/";
-static time_t sessiontime = 3600;
+static time_t sessiontime = 0;
+#define NOBACKGROUND 0
 
 #define SETPROP(p) { .v = (char *[]){ "/bin/sh", "-c", \
         "prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
diff -r 21259f9b0be2 -r 0e09e6a88399 config.mk
--- a/config.mk Sun May 09 19:37:46 2010 +0200
+++ b/config.mk Sun May 09 22:41:11 2010 +0200
@@ -7,8 +7,8 @@
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
-GTKINC=$(shell pkg-config --static --cflags gtk+-2.0 webkit-1.0)
-GTKLIB=$(shell pkg-config --static --libs gtk+-2.0 webkit-1.0)
+GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0)
+GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0)
 
 
 # includes and libs
diff -r 21259f9b0be2 -r 0e09e6a88399 surf.c
--- a/surf.c Sun May 09 19:37:46 2010 +0200
+++ b/surf.c Sun May 09 22:41:11 2010 +0200
@@ -268,7 +268,7 @@
 download(Client *c, const Arg *arg) {
         char *uri;
         WebKitNetworkRequest *r;
- WebKitDownload *dl;
+ WebKitDownload *dl;
 
         if(arg->v)
                 uri = (char *)arg->v;
@@ -434,11 +434,11 @@
 
 void
 loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+ switch(webkit_web_view_get_load_status (c->view)) {
+ case WEBKIT_LOAD_COMMITTED:
         if(c->download)
                 stop(c, NULL);
- switch(webkit_web_view_get_load_status (c->view)) {
- case WEBKIT_LOAD_COMMITTED:
- setatom(c, uriprop, geturi(c));
+ setatom(c, uriprop, geturi(c));
                 break;
         case WEBKIT_LOAD_FINISHED:
                 c->progress = 0;
@@ -584,6 +584,8 @@
         g_free(uri);
         setatom(c, findprop, "");
         setatom(c, uriprop, "");
+ if(!NOBACKGROUND)
+ webkit_web_view_set_transparent(c->view, TRUE);
 
         c->download = NULL;
         c->title = NULL;
@@ -605,9 +607,8 @@
 
         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);
 }
 
@@ -727,7 +728,7 @@
         SoupDate *e;
         SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
         c = soup_cookie_copy(c);
- if(c->expires == NULL) {
+ if(c->expires == NULL && sessiontime) {
                 e = soup_date_new_from_time_t(time(NULL) + sessiontime);
                 soup_cookie_set_expires(c, e);
         }
@@ -776,7 +777,6 @@
         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) :
Received on Sun May 09 2010 - 20:40:21 UTC