screen_find: strip prompt from search string

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 9cf0fa99fc37b6951a594a84ed39ad5dd11ef84b..db72e3b549f64d510a755d9be78528f703cb6bb4 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
 
  * This program is free software; you can redistribute it and/or modify
@@ -65,6 +65,7 @@ options_t options = {
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
        .jump_prefix_only = true,
+       .second_column = true,
 #endif
 };
 
@@ -367,21 +368,10 @@ options_parse(int argc, const char *argv[])
 void
 options_init(void)
 {
-       /* XXX
-       if ((tmp = g_strstr_len(options.host, strlen(options.host), "@"))) {
-               char *oldhost = options.host;
-               *tmp  = '\0';
-               options.password = locale_to_utf8(oldhost);
-               options.host = g_strdup(tmp+1);
-               g_free(oldhost);
-       }
-       */
-
        /* default option values */
        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);
-       options.timedisplay_type = g_strdup(DEFAULT_TIMEDISPLAY_TYPE);
 #ifndef NCMPC_MINI
        options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
@@ -402,5 +392,4 @@ options_deinit(void)
        g_free(options.xterm_title_format);
        g_free(options.scroll_sep);
 #endif
-       g_free(options.timedisplay_type);
 }