configure.ac: add more optimization flags

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 0495353af7062d09762c925f886af4c7bd8cdc77..6f674c6cd61b9d3736dfd27ebfd87d2ea224813b 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -53,6 +53,7 @@ options_t options = {
        .lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
        .lyrics_autosave = false,
        .lyrics_show_plugin = false,
+       .text_editor_ask = true,
 #endif
        .find_wrap = true,
        .scroll_offset = 0,
@@ -214,9 +215,22 @@ handle_option(int c, const char *arg)
 #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" */
@@ -369,9 +383,6 @@ options_init(void)
        options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
        options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
        options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
-#ifdef ENABLE_LYRICS_SCREEN
-       options.text_editor = g_strdup(DEFAULT_TEXT_EDITOR);
-#endif
 #ifndef NCMPC_MINI
        options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
@@ -398,4 +409,7 @@ options_deinit(void)
 #ifdef ENABLE_LYRICS_SCREEN
        g_free(options.text_editor);
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+       g_free(options.chat_prefix);
+#endif
 }