From 8f9c1fbc0aa1cf4f848c859573b71390b058f5af Mon Sep 17 00:00:00 2001 From: Barrucadu Date: Sun, 3 May 2009 12:28:02 +0100 Subject: Removed no_fifo and no_socket variables. --- uzbl.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index debef04..1730377 100644 --- 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); -- cgit v1.2.3