X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=uzbl.c;h=8500d9ead2e6ad3d322ea4524c399364e9f72fde;hb=ed39cbe56f8923407604a1306a179529521ecd26;hp=407070e85643bc88d6cbead20faa321c88a6f91b;hpb=7aba700fc160aadae7e26a2c4f0920b3fb500647;p=uzbl-mobile

diff --git a/uzbl.c b/uzbl.c
index 407070e..8500d9e 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -98,7 +98,6 @@ 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)},
@@ -2286,6 +2285,11 @@ 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");
     }
@@ -2572,9 +2576,6 @@ 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;