summaryrefslogtreecommitdiff
path: root/src/settings.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-11-09 21:15:49 +0100
committerLars-Dominik Braun <lars@6xq.net>2011-11-09 21:15:49 +0100
commit4d44f11288132a225258a6d2d94e984624aae557 (patch)
tree0b2a0b1e9de218f94756b791596511536cd708cd /src/settings.c
parent937fdfb4ed8e55795902e8567e8624da06ea4f8a (diff)
downloadpianobar-windows-4d44f11288132a225258a6d2d94e984624aae557.tar.gz
pianobar-windows-4d44f11288132a225258a6d2d94e984624aae557.tar.bz2
pianobar-windows-4d44f11288132a225258a6d2d94e984624aae557.zip
TLS is not optional any more
Diffstat (limited to 'src/settings.c')
-rw-r--r--src/settings.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/settings.c b/src/settings.c
index 04bfff0..f29fcfa 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -93,9 +93,7 @@ void BarSettingsDestroy (BarSettings_t *settings) {
free (settings->npStationFormat);
free (settings->listSongFormat);
free (settings->fifo);
-#ifdef ENABLE_TLS
free (settings->tlsCaPath);
-#endif
for (size_t i = 0; i < MSG_COUNT; i++) {
free (settings->msgFormat[i].prefix);
free (settings->msgFormat[i].postfix);
@@ -134,10 +132,7 @@ void BarSettingsRead (BarSettings_t *settings) {
settings->listSongFormat = strdup ("%i) %a - %t%r");
settings->fifo = malloc (PATH_MAX * sizeof (*settings->fifo));
BarGetXdgConfigDir (PACKAGE "/ctl", settings->fifo, PATH_MAX);
-#ifdef ENABLE_TLS
- settings->tls = true;
settings->tlsCaPath = strdup ("/etc/ssl/certs/ca-certificates.crt");
-#endif
settings->msgFormat[MSG_NONE].prefix = NULL;
settings->msgFormat[MSG_NONE].postfix = NULL;
@@ -246,17 +241,9 @@ void BarSettingsRead (BarSettings_t *settings) {
} else if (streq ("fifo", key)) {
free (settings->fifo);
settings->fifo = strdup (val);
-#ifdef ENABLE_TLS
- } else if (streq ("tls", key)) {
- if (streq ("1", val)) {
- settings->tls = true;
- } else {
- settings->tls = false;
- }
} else if (streq ("tls_ca_path", key)) {
free (settings->tlsCaPath);
settings->tlsCaPath = strdup (val);
-#endif
} else if (strncmp (formatMsgPrefix, key,
strlen (formatMsgPrefix)) == 0) {
static const char *mapping[] = {"none", "info", "nowplaying",