From ae5bbbe63b2008d142139926bb20198f98c38122 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Wed, 19 Sep 2012 02:03:39 +0200
Subject: [PATCH] settings: remove allow_physical_*_deletion (replaced by
 custom binding)

---
 doc/config       | 10 ----------
 doc/ncmpcpp.1    |  6 ------
 src/actions.cpp  |  2 +-
 src/settings.cpp | 10 ----------
 src/settings.h   |  2 --
 5 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/doc/config b/doc/config
index 16b32f67..ffc10e1c 100644
--- a/doc/config
+++ b/doc/config
@@ -453,16 +453,6 @@
 #
 #search_engine_default_search_mode = "1"
 #
-##
-## Note: Below variables can allow you to physically
-## remove files and directories from your hdd using
-## ncmpcpp's browser screen.
-##
-#
-#allow_physical_files_deletion = "no"
-#
-#allow_physical_directories_deletion = "no"
-#
 #external_editor = ""
 #
 #use_console_editor = "no" (set to yes, if your editor is console app)
diff --git a/doc/ncmpcpp.1 b/doc/ncmpcpp.1
index f48421df..960e8968 100644
--- a/doc/ncmpcpp.1
+++ b/doc/ncmpcpp.1
@@ -315,12 +315,6 @@ If enabled, fields in Search engine above "Reset" button will be blocked after s
 .B mouse_support = yes/no
 Self-descriptive, isn't it?
 .TP 
-.B allow_physical_files_deletion = yes/no
-If enabled, ncmpcpp will be able to delete files using its browser screen.
-.TP 
-.B allow_physical_directories_deletion = yes/no
-If enabled, ncmpcpp will be able to delete directories using its browser screen.
-.TP 
 .B tag_editor_extended_numeration  = yes/no
 If enabled, tag editor will number tracks using format xx/yy (where xx is the current track and yy is total amount of all numbered tracks), not plain xx.
 .TP
diff --git a/src/actions.cpp b/src/actions.cpp
index 2871814b..e6f9c65c 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -810,7 +810,7 @@ bool DeleteBrowserItems::canBeRun() const
 {
 	return myScreen == myBrowser
 	    && !myBrowser->main().empty()
-		&& isMPDMusicDirSet();
+	    && isMPDMusicDirSet();
 }
 
 void DeleteBrowserItems::Run()
diff --git a/src/settings.cpp b/src/settings.cpp
index 64452766..bc61401a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -233,8 +233,6 @@ void Configuration::SetDefaults()
 	block_search_constraints_change = true;
 	use_console_editor = false;
 	use_cyclic_scrolling = false;
-	allow_physical_files_deletion = false;
-	allow_physical_directories_deletion = false;
 	ask_before_clearing_main_playlist = false;
 	mouse_support = true;
 	mouse_list_scroll_whole_page = true;
@@ -753,14 +751,6 @@ void Configuration::Read()
 			{
 				block_search_constraints_change = v == "yes";
 			}
-			else if (name == "allow_physical_files_deletion")
-			{
-				allow_physical_files_deletion = v == "yes";
-			}
-			else if (name == "allow_physical_directories_deletion")
-			{
-				allow_physical_directories_deletion = v == "yes";
-			}
 			else if (name == "ask_before_clearing_main_playlist")
 			{
 				ask_before_clearing_main_playlist = v == "yes";
diff --git a/src/settings.h b/src/settings.h
index 66e00692..5ee7c9f5 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -171,8 +171,6 @@ struct Configuration
 	bool block_search_constraints_change;
 	bool use_console_editor;
 	bool use_cyclic_scrolling;
-	bool allow_physical_files_deletion;
-	bool allow_physical_directories_deletion;
 	bool ask_before_clearing_main_playlist;
 	bool mouse_support;
 	bool mouse_list_scroll_whole_page;