Removed no_fifo and no_socket variables.

diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig
index 61ab373..3fddc89 100644 (file)
--- a/examples/configs/sampleconfig
+++ b/examples/configs/sampleconfig
@@ -19,8 +19,6 @@ always_insert_mode = 0
 modkey = Mod1
 show_status = 1
 status_top = 0
-no_fifo = 0
-no_socket = 0
 
 [bindings]
 # scroll down/up/left/right

diff --git a/examples/configs/sampleconfig-dev b/examples/configs/sampleconfig-dev
index c339c07..b151e92 100644 (file)
--- a/examples/configs/sampleconfig-dev
+++ b/examples/configs/sampleconfig-dev
@@ -19,8 +19,6 @@ always_insert_mode = 0
 modkey = Mod1
 show_status = 1
 status_top = 0
-no_fifo = 0
-no_socket = 0
 
 [bindings]
 ## scroll down/up/left/right

diff --git a/uzbl.c b/uzbl.c
index debef04..1730377 100644 (file)
--- a/uzbl.c
+++ b/uzbl.c
@@ -90,8 +90,6 @@ static gboolean status_top         = FALSE;
 static gchar*   modkey             = NULL;
 static guint    modmask            = 0;
 static guint    http_debug         = 0;
-static gboolean no_fifo            = FALSE;
-static gboolean no_socket          = FALSE;
 
 /* settings from config: group bindings, key -> action */
 static GHashTable* bindings;
@@ -873,20 +871,16 @@ settings_init () {
         if (! socket_dir)
             socket_dir     = g_key_file_get_value   (config, "behavior", "socket_dir",         NULL);
         keys               = g_key_file_get_keys    (config, "bindings", NULL,                 NULL);
-        no_fifo            = g_key_file_get_boolean (config, "behavior", "no_fifo",            NULL);
-        no_socket          = g_key_file_get_boolean (config, "behavior", "no_socket",          NULL);
     }
 
     printf ("History handler: %s\n",    (history_handler    ? history_handler  : "disabled"));
     printf ("Download manager: %s\n",   (download_handler   ? download_handler : "disabled"));
-    printf ("Fifo directory: %s\n",     (fifo_dir           ? fifo_dir         : "/tmp"));
-    printf ("Socket directory: %s\n",   (socket_dir         ? socket_dir       : "/tmp"));
+    printf ("Fifo directory: %s\n",     (fifo_dir           ? fifo_dir         : "disabled"));
+    printf ("Socket directory: %s\n",   (socket_dir         ? socket_dir       : "disabled"));
     printf ("Always insert mode: %s\n", (always_insert_mode ? "TRUE"           : "FALSE"));
     printf ("Show status: %s\n",        (show_status        ? "TRUE"           : "FALSE"));
     printf ("Status top: %s\n",         (status_top         ? "TRUE"           : "FALSE"));
     printf ("Modkey: %s\n",             (modkey             ? modkey           : "disabled"));
-    printf ("FIFO: %s\n",               (no_fifo            ? "disabled"       : "enabled"));
-    printf ("Socket: %s\n",             (no_socket          ? "disabled"       : "enabled"));
 
     if (! modkey)
         modkey = "";
@@ -1019,18 +1013,18 @@ main (int argc, char* argv[]) {
     if (!show_status)
         gtk_widget_hide(mainbar);
 
-    if (!no_fifo)
+    if (fifo_dir)
         create_fifo ();
-    if (!no_socket)
+    if (socket_dir)
         create_socket();
 
     gtk_main ();
 
     g_string_free(keycmd, TRUE);
 
-    if (!no_fifo)
+    if (fifo_dir)
         unlink (fifo_path);
-    if (!no_socket)
+    if (socket_dir)
         unlink (socket_path);
 
     g_hash_table_destroy(bindings);