aboutsummaryrefslogtreecommitdiffhomepage
path: root/uzbl.c
diff options
context:
space:
mode:
authorGravatar Dequis <dx@dxzone.com.ar>2009-06-22 17:23:55 -0300
committerGravatar Dequis <dx@dxzone.com.ar>2009-06-22 17:23:55 -0300
commitb8f768793de5f7adb38312bc464ad00356cbd631 (patch)
tree76802c1dc93a1d43ec77cc920aaaea8aeda90aaf /uzbl.c
parent12af838675fa5eae32a8b97cf8fe81c2c812639f (diff)
Read stdin only if --config is "-"
uzbl -c - works, uzbl -c- doesn't, blame the glib option parser
Diffstat (limited to 'uzbl.c')
-rw-r--r--uzbl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/uzbl.c b/uzbl.c
index e6e9551..31e9f0a 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -2277,6 +2277,11 @@ settings_init () {
for (i = 0; default_config[i].command != NULL; i++) {
parse_cmd_line(default_config[i].command);
}
+
+ if (g_strcmp0(s->config_file, "-") == 0) {
+ s->config_file = NULL;
+ create_stdin();
+ }
if (!s->config_file) {
s->config_file = find_xdg_file (0, "/uzbl/config");
@@ -2564,8 +2569,6 @@ main (int argc, char* argv[]) {
/* WebInspector */
set_up_inspector();
- create_stdin();
-
if (verbose_override > uzbl.state.verbose)
uzbl.state.verbose = verbose_override;