Replaced disable_stdin with uzbl -c -

That means, read config from stdin. So stdin is always disabled, except
when you tell uzbl to read from there. The default one in the xdg config
path is still loaded.

Fixes problems when sending uzbl to background.

diff --git a/uzbl.c b/uzbl.c
index 407070e..8500d9e 100644 (file)
--- 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;
     

diff --git a/uzbl.h b/uzbl.h
index 21840f3..2b36edd 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -142,7 +142,6 @@ typedef struct {
     gboolean insert_mode;
     gboolean status_top;
     gboolean reset_command_mode;
-    gboolean disable_stdin;
     gchar*   modkey;
     guint    modmask;
     guint    http_debug;