Revert "Replaced disable_stdin with uzbl -c -"

This reverts commit ed39cbe56f8923407604a1306a179529521ecd26.

1 files changed, 4 insertions, 5 deletions

diff --git a/uzbl.c b/uzbl.c
index 8ed8788..751cf6b 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -99,6 +99,7 @@ const struct {
 /*  --------------------------------------------------------------------------------------- */
     { "uri",                 PTR(uzbl.state.uri,                  STR,  1,   cmd_load_uri)},
     { "verbose",             PTR(uzbl.state.verbose,              INT,  1,   NULL)},
+    { "disable_stdin",       PTR(uzbl.behave.disable_stdin,       INT,  1,   NULL)},
     { "mode",                PTR(uzbl.behave.mode,                INT,  0,   NULL)},
     { "inject_html",         PTR(uzbl.behave.inject_html,         STR,  0,   cmd_inject_html)},
     { "base_url",            PTR(uzbl.behave.base_url,            STR,  1,   NULL)},
@@ -2383,11 +2384,6 @@ settings_init () {
         parse_cmd_line(default_config[i].command, NULL);
     }
 
-    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");
     }
@@ -2674,6 +2670,9 @@ main (int argc, char* argv[]) {
     /* WebInspector */
     set_up_inspector();
     
+    if (!uzbl.behave.disable_stdin)
+        create_stdin();
+
     if (verbose_override > uzbl.state.verbose)
         uzbl.state.verbose = verbose_override;