Fix a981959 Move -t stylefile flag to -C stylefile

Forgot to modify usage() and newwindow() too.
This commit is contained in:
Quentin Rameau 2017-04-23 18:11:54 +02:00
parent 4b752834d8
commit 2940d2bd07
1 changed files with 5 additions and 5 deletions

10
surf.c
View File

@ -247,7 +247,7 @@ void
usage(void) usage(void)
{ {
die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] " die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
"[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] " "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
} }
@ -828,6 +828,10 @@ newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = "-c"; cmd[i++] = "-c";
cmd[i++] = cookiefile; cmd[i++] = cookiefile;
} }
if (stylefile && g_strcmp0(stylefile, "")) {
cmd[i++] = "-C";
cmd[i++] = stylefile;
}
cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d"; cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
if (embed && !noembed) { if (embed && !noembed) {
cmd[i++] = "-e"; cmd[i++] = "-e";
@ -846,10 +850,6 @@ newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = scriptfile; cmd[i++] = scriptfile;
} }
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s"; cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
if (stylefile && g_strcmp0(stylefile, "")) {
cmd[i++] = "-t";
cmd[i++] = stylefile;
}
if (fulluseragent && g_strcmp0(fulluseragent, "")) { if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u"; cmd[i++] = "-u";
cmd[i++] = fulluseragent; cmd[i++] = fulluseragent;