From 726e105a1269a9202690281471e5fa243223809b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 14 Apr 2011 00:20:20 -0400 Subject: Avoid --name which GTK uses internally Addresses #170. --- src/uzbl-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uzbl-core.c b/src/uzbl-core.c index e498762..e918451 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -47,7 +47,7 @@ GOptionEntry entries[] = { "Uri to load at startup (equivalent to 'uzbl ' or 'set uri = URI' after uzbl has launched)", "URI" }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &uzbl.state.verbose, "Whether to print all messages or just errors.", NULL }, - { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, + { "named", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, "Name of the current instance (defaults to Xorg window id or random for GtkSocket mode)", "NAME" }, { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, "Path to config file or '-' for stdin", "FILE" }, -- cgit v1.2.3 From 05b7422a9fcbb1cadf1beaff5ec0cea8b5b7a828 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 14 Apr 2011 00:22:49 -0400 Subject: Update documentation --- README | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 6709bf5..431694e 100644 --- a/README +++ b/README @@ -104,7 +104,7 @@ There are several interfaces to interact with Uzbl: When `uzbl` forks a new instance (eg "open in new window") it will use the same command line arguments (eg the same `--config `), except `--uri` and -`--name`. If you made changes to the configuration at runtime, these are not +`--named`. If you made changes to the configuration at runtime, these are not passed on to the child. #### Uzbl-browser @@ -258,8 +258,8 @@ The following commands are recognized: * `add_cookie ` - Adds a new cookie to the cookie jar * 'delete_cookie [ ]` - - Deletes a matching cookie from the cookie jar. scheme and expire time - is currently not considered when matching. + - Deletes a matching cookie from the cookie jar. scheme and expire time + is currently not considered when matching. * 'clear_cookies` - Clears all cookies from the cookie jar @@ -793,7 +793,7 @@ where `arguments` and `uri` are both optional. `arguments` can be: * `-u`, `--uri=URI`: URI to load at startup. Equivalent to `uzbl ` or `set uri = URI` after `uzbl` has launched. * `-v`, `--verbose`: Whether to print all messages or just errors. -* `-n`, `--name=NAME`: Name of the current instance (defaults to Xorg window +* `-n`, `--named=NAME`: Name of the current instance (defaults to Xorg window id or random for GtkSocket mode). * `-c`, `--config=FILE`: Path to config file or `-` for stdin. * `-s`, `--socket=SOCKET`: Xembed socket ID. -- cgit v1.2.3