UI feature

parity/configuration.rs

@@ -561,7 +561,7 @@ impl Configuration {
 	}
 
 	pub fn dapps_enabled(&self) -> bool {
-		!self.args.flag_dapps_off && !self.args.flag_no_dapps && cfg!(not(feature = "no-ui"))
+		!self.args.flag_dapps_off && !self.args.flag_no_dapps && cfg!(feature = "dapps")
 	}
 
 	pub fn signer_enabled(&self) -> bool {

parity/dapps.rs

@@ -21,9 +21,9 @@ use util::panics::PanicHandler;
 use die::*;
 use rpc_apis;
 
-#[cfg(all(feature = "dapps", not(feature = "no-ui")))]
+#[cfg(feature = "dapps")]
 pub use ethcore_dapps::Server as WebappServer;
-#[cfg(any(not(feature = "dapps"), feature = "no-ui"))]
+#[cfg(not(feature = "dapps"))]
 pub struct WebappServer;
 
 pub struct Configuration {
@@ -62,7 +62,7 @@ pub fn new(configuration: Configuration, deps: Dependencies) -> Option<WebappSer
 	Some(setup_dapps_server(deps, configuration.dapps_path, &addr, auth))
 }
 
-#[cfg(any(not(feature = "dapps"), feature = "no-ui"))]
+#[cfg(not(feature = "dapps"))]
 pub fn setup_dapps_server(
 	_deps: Dependencies,
 	_dapps_path: String,
@@ -72,7 +72,7 @@ pub fn setup_dapps_server(
 	die!("Your Parity version has been compiled without WebApps support.")
 }
 
-#[cfg(all(feature = "dapps", not(feature = "no-ui")))]
+#[cfg(feature = "dapps")]
 pub fn setup_dapps_server(
 	deps: Dependencies,
 	dapps_path: String,

parity/main.rs

@@ -51,7 +51,7 @@ extern crate ethcore_rpc;
 extern crate ethcore_signer;
 extern crate ansi_term;
 
-#[cfg(all(feature = "dapps", not(feature = "no-ui")))]
+#[cfg(feature = "dapps")]
 extern crate ethcore_dapps;
 
 #[macro_use]