pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
buildfile: don't forget to free temporary string bpath
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
3f33e54
..
d36053e
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-273,6
+273,7
@@
buildfile(const char *path)
g_free(dname);
fpath = g_build_filename(bpath, bname, NULL);
g_free(dname);
fpath = g_build_filename(bpath, bname, NULL);
+ g_free(bpath);
g_free(bname);
if (!(f = fopen(fpath, "a")))
g_free(bname);
if (!(f = fopen(fpath, "a")))
@@
-695,10
+696,12
@@
initdownload(WebKitWebView *view, WebKitDownload *o, Client *c)
void
inspector(Client *c, const Arg *arg)
{
void
inspector(Client *c, const Arg *arg)
{
- if (c->isinspecting)
- webkit_web_inspector_close(c->inspector);
- else
- webkit_web_inspector_show(c->inspector);
+ if (enableinspector) {
+ if (c->isinspecting)
+ webkit_web_inspector_close(c->inspector);
+ else
+ webkit_web_inspector_show(c->inspector);
+ }
}
WebKitWebView *
}
WebKitWebView *
@@
-801,7
+804,7
@@
loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
}
setatom(c, AtomUri, uri);
}
setatom(c, AtomUri, uri);
- if (enablestyle
s
)
+ if (enablestyle)
setstyle(c, getstyle(uri));
break;
case WEBKIT_LOAD_FINISHED:
setstyle(c, getstyle(uri));
break;
case WEBKIT_LOAD_FINISHED:
@@
-1019,7
+1022,7
@@
newclient(void)
"default-font-size", defaultfontsize, NULL);
g_object_set(G_OBJECT(settings),
"resizable-text-areas", 1, NULL);
"default-font-size", defaultfontsize, NULL);
g_object_set(G_OBJECT(settings),
"resizable-text-areas", 1, NULL);
- if (enablestyle
s
)
+ if (enablestyle)
setstyle(c, getstyle("about:blank"));
/*
setstyle(c, getstyle("about:blank"));
/*
@@
-1053,10
+1056,8
@@
newclient(void)
c->isinspecting = false;
}
c->isinspecting = false;
}
- if (runinfullscreen) {
- c->fullscreen = 0;
+ if (runinfullscreen)
fullscreen(c, NULL);
fullscreen(c, NULL);
- }
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
@@
-1534,8
+1535,8
@@
togglescrollbars(Client *c, const Arg *arg)
void
togglestyle(Client *c, const Arg *arg)
{
void
togglestyle(Client *c, const Arg *arg)
{
- enablestyle
s = !enablestyles
;
- setstyle(c, enablestyle
s
? getstyle(geturi(c)) : "");
+ enablestyle
= !enablestyle
;
+ setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
updatetitle(c);
}
updatetitle(c);
}
@@
-1566,7
+1567,7
@@
gettogglestat(Client *c)
g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
togglestat[p++] = value? 'V': 'v';
g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
togglestat[p++] = value? 'V': 'v';
- togglestat[p++] = enablestyle
s
? 'M': 'm';
+ togglestat[p++] = enablestyle ? 'M': 'm';
togglestat[p] = '\0';
}
togglestat[p] = '\0';
}
@@
-1624,7
+1625,7
@@
updatewinid(Client *c)
void
usage(void)
{
void
usage(void)
{
- die("usage: %s [-bB
fFgGiIkK
nNpPsSvx] [-a cookiepolicies ] "
+ die("usage: %s [-bB
dDfFgGiIkKmM
nNpPsSvx] [-a cookiepolicies ] "
"[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
"[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
@@
-1685,10
+1686,10
@@
main(int argc, char *argv[])
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'f':
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'f':
- runinfullscreen =
1
;
+ runinfullscreen =
0
;
break;
case 'F':
break;
case 'F':
- runinfullscreen =
0
;
+ runinfullscreen =
1
;
break;
case 'g':
allowgeolocation = 0;
break;
case 'g':
allowgeolocation = 0;
@@
-1709,10
+1710,10
@@
main(int argc, char *argv[])
kioskmode = 1;
break;
case 'm':
kioskmode = 1;
break;
case 'm':
- enablestyle
s
= 0;
+ enablestyle = 0;
break;
case 'M':
break;
case 'M':
- enablestyle
s
= 1;
+ enablestyle = 1;
break;
case 'n':
enableinspector = 0;
break;
case 'n':
enableinspector = 0;