From 07c9fd69268388a7777f4cf13b2de3ba94636303 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Fri, 28 Nov 2008 21:58:55 +0100
Subject: [PATCH] remove mpd_password variable, it should be defined within
 mpd_host

---
 doc/config       | 2 --
 src/ncmpcpp.cpp  | 2 --
 src/settings.cpp | 6 ------
 src/settings.h   | 1 -
 4 files changed, 11 deletions(-)

diff --git a/doc/config b/doc/config
index 5e5bb92c..9f249667 100644
--- a/doc/config
+++ b/doc/config
@@ -9,8 +9,6 @@
 #
 #mpd_host = "localhost"
 #
-#mpd_password = ""
-#
 #mpd_port = "6600"
 #
 #mpd_music_dir = ""
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index d8a122d1..8f594c43 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -187,8 +187,6 @@ int main(int argc, char *argv[])
 		Mpd->SetHostname(Config.mpd_host);
 	if (Config.mpd_port != 6600)
 		Mpd->SetPort(Config.mpd_port);
-	if (!Config.mpd_password.empty())
-		Mpd->SetPassword(Config.mpd_password);
 	
 	Mpd->SetTimeout(Config.mpd_connection_timeout);
 	
diff --git a/src/settings.cpp b/src/settings.cpp
index 2ef11ca5..2bc6e2cd 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -218,7 +218,6 @@ void DefaultKeys(ncmpcpp_keys &keys)
 void DefaultConfiguration(ncmpcpp_config &conf)
 {
 	conf.mpd_host = "localhost";
-	conf.mpd_password = "";
 	conf.song_list_format = "{%a - }{%t}|{[.white]%f[/white]}%r{[.green](%l)[/green]}";
 	conf.song_columns_list_format = "(8)[green]{l} (25)[cyan]{a} (40){t} (30)[red]{b}";
 	conf.song_status_format = "{(%l) }{%a - }{%t}|{%f}";
@@ -502,11 +501,6 @@ void ReadConfiguration(ncmpcpp_config &conf)
 				if (!v.empty())
 					conf.mpd_host = v;
 			}
-			else if (it->find("mpd_password") != string::npos)
-			{
-				if (!v.empty())
-					conf.mpd_password = v;
-			}
 			else if (it->find("mpd_music_dir") != string::npos)
 			{
 				if (!v.empty())
diff --git a/src/settings.h b/src/settings.h
index 3fff8e5b..1b8a5752 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -95,7 +95,6 @@ struct ncmpcpp_keys
 struct ncmpcpp_config
 {
 	string mpd_host;
-	string mpd_password;
 	string mpd_music_dir;
 	string song_list_format;
 	string song_columns_list_format;