diff --git a/src/conf.c b/src/conf.c
index 6c93e1e3a8692c53b0e17c7d13d4f7a5d816d81b..9d1f8828d8d28d59dab74bbc71cf8bed4fe54801 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
/* ncmpc (Ncurses MPD Client)
* (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
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
#include "conf.h"
#include "config.h"
#define CONF_JUMP_PREFIX_ONLY "jump-prefix-only"
#define CONF_LYRICS_AUTOSAVE "lyrics-autosave"
#define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
+#define CONF_TEXT_EDITOR "text-editor"
#define CONF_SECOND_COLUMN "second-column"
static bool
bool match_found;
/* get the name part */
- while (i < len && line[i] != '=' &&
- !g_ascii_isspace(line[i])) {
+ while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
name[j++] = line[i++];
- }
name[j] = '\0';
options.lyrics_show_plugin = str2bool(value);
#else
{}
+#endif
+ else if (!strcasecmp(name, CONF_TEXT_EDITOR))
+#ifdef ENABLE_LYRICS_SCREEN
+ {
+ g_free(options.text_editor);
+ options.text_editor = get_format(value);
+ }
+#else
+ {}
#endif
else if (!strcasecmp(CONF_SECOND_COLUMN, name))
#ifdef NCMPC_MINI
match_found = false;
if (!match_found)
- print_error(_("Unknown configuration parameter"),
- name);
+ print_error(_("Unknown configuration parameter"), name);
return match_found;
}
return 0;
}
+#ifndef WIN32
retval = mkdir(directory, 0755);
+#else
+ retval = mkdir(directory);
+#endif
g_free(directory);
return retval;
}