diff --git a/src/options.c b/src/options.c
index f7044ccbe24ddd9645b77a2e8f66f61c75291b03..6f674c6cd61b9d3736dfd27ebfd87d2ea224813b 100644 (file)
--- a/src/options.c
+++ b/src/options.c
.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
.lyrics_autosave = false,
.lyrics_show_plugin = false,
+ .text_editor_ask = true,
#endif
.find_wrap = true,
.scroll_offset = 0,
.audible_bell = true,
.bell_on_wrap = true,
.status_message_time = 3,
+ .timeout_ms = DEFAULT_MPD_TIMEOUT,
#ifndef NCMPC_MINI
.scroll = DEFAULT_SCROLL,
.welcome_screen_list = true,
#ifdef ENABLE_OUTPUTS_SCREEN
" outputs-screen"
#endif
+#ifdef ENABLE_CHAT_SCREEN
+ " chat-screen"
+#endif
"\n");
#ifndef NCMPC_MINI
+ {
+ char *user_conf = build_user_conf_filename();
+ char *system_conf = build_system_conf_filename();
+
+ printf("configuration files:\n %s\n %s\n\n",
+ user_conf, system_conf);
+
+ g_free(user_conf);
+ g_free(system_conf);
+ }
if (strcmp("translator-credits", _("translator-credits")) != 0)
/* To translators: these credits are shown
when ncmpc is started with "--version" */
#ifndef NCMPC_MINI
options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
#endif
+ if (getenv("MPD_TIMEOUT") != NULL)
+ /* let libmpdclient parse the environment variable */
+ options.timeout_ms = 0;
}
void
g_free(options.xterm_title_format);
g_free(options.scroll_sep);
#endif
+#ifdef ENABLE_LYRICS_SCREEN
+ g_free(options.text_editor);
+#endif
+#ifdef ENABLE_CHAT_SCREEN
+ g_free(options.chat_prefix);
+#endif
}