pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a981959 Move -t stylefile flag to -C stylefile
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
e08bfe5
..
4d13b0e
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-247,7
+247,7
@@
void
usage(void)
{
die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
usage(void)
{
die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
- "[-c cookiefile] [-
e xid] [-r scriptfile] [-t style
file] "
+ "[-c cookiefile] [-
C stylefile] [-e xid] [-r script
file] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
@@
-817,7
+817,7
@@
newwindow(Client *c, const Arg *a, int noembed)
{
int i = 0;
char tmp[64];
{
int i = 0;
char tmp[64];
- const char *cmd[2
6
], *uri;
+ const char *cmd[2
7
], *uri;
const Arg arg = { .v = cmd };
cmd[i++] = argv0;
const Arg arg = { .v = cmd };
cmd[i++] = argv0;
@@
-828,6
+828,10
@@
newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = "-c";
cmd[i++] = cookiefile;
}
cmd[i++] = "-c";
cmd[i++] = cookiefile;
}
+ if (stylefile && g_strcmp0(stylefile, "")) {
+ cmd[i++] = "-C";
+ cmd[i++] = stylefile;
+ }
cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
if (embed && !noembed) {
cmd[i++] = "-e";
cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
if (embed && !noembed) {
cmd[i++] = "-e";
@@
-846,10
+850,6
@@
newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = scriptfile;
}
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
cmd[i++] = scriptfile;
}
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
- if (stylefile && g_strcmp0(stylefile, "")) {
- cmd[i++] = "-t";
- cmd[i++] = stylefile;
- }
if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u";
cmd[i++] = fulluseragent;
if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u";
cmd[i++] = fulluseragent;
@@
-1747,7
+1747,7
@@
main(int argc, char *argv[])
fulluseragent = EARGF(usage());
break;
case 'v':
fulluseragent = EARGF(usage());
break;
case 'v':
- die("surf-"VERSION", ©2009-201
5
surf engineers, "
+ die("surf-"VERSION", ©2009-201
7
surf engineers, "
"see LICENSE for details\n");
case 'x':
showxid = 1;
"see LICENSE for details\n");
case 'x':
showxid = 1;