From 4d44f11288132a225258a6d2d94e984624aae557 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Wed, 9 Nov 2011 21:15:49 +0100
Subject: TLS is not optional any more

---
 src/main.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 668bdbf..d4bf6fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -338,23 +338,15 @@ int main (int argc, char **argv) {
 
 	/* init some things */
 	ao_initialize ();
-#ifdef ENABLE_TLS
 	gnutls_global_init ();
-#endif
 	PianoInit (&app.ph);
 
 	BarSettingsInit (&app.settings);
 	BarSettingsRead (&app.settings);
 
-#ifdef ENABLE_TLS
 	WaitressInit (&app.waith, app.settings.tlsCaPath);
-#else
-	WaitressInit (&app.waith, NULL);
-#endif
 	app.waith.url.host = strdup (PIANO_RPC_HOST);
-#ifdef ENABLE_TLS
-	app.waith.url.tls = app.settings.tls;
-#endif
+	app.waith.url.tls = true;
 
 	BarUiMsg (&app.settings, MSG_NONE,
 			"Welcome to " PACKAGE " (" VERSION ")! ");
@@ -394,9 +386,7 @@ int main (int argc, char **argv) {
 	PianoDestroyPlaylist (app.playlist);
 	WaitressFree (&app.waith);
 	ao_shutdown();
-#ifdef ENABLE_TLS
 	gnutls_global_deinit ();
-#endif
 	BarSettingsDestroy (&app.settings);
 
 	/* restore terminal attributes, zsh doesn't need this, bash does... */
-- 
cgit v1.2.3