From 29076da4b753c1a67c0b1053620f0543c9b61b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Wed, 13 Jul 2016 11:10:43 +0200
Subject: [PATCH] UI feature

---
 Cargo.toml                      | 5 ++---
 parity/configuration.rs         | 2 +-
 parity/dapps.rs                 | 8 ++++----
 parity/main.rs                  | 2 +-
 signer/Cargo.toml               | 5 +++--
 signer/src/lib.rs               | 2 +-
 signer/src/ws_server/session.rs | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 667335e39..281ea6243 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,13 +29,13 @@ ethsync = { path = "sync" }
 ethcore-devtools = { path = "devtools" }
 ethcore-rpc = { path = "rpc" }
 ethcore-signer = { path = "signer" }
-ethcore-dapps = { path = "dapps", optional = true }
 semver = "0.2"
 ethcore-ipc-nano = { path = "ipc/nano" }
 ethcore-ipc = { path = "ipc/rpc" }
 ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
 ansi_term = "0.7"
+ethcore-dapps = { path = "dapps", optional = true }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
@@ -48,8 +48,7 @@ version = "0.8"
 default-features = false
 
 [features]
-default = ["dapps"]
-no-ui = ["ethcore-signer/no-ui"]
+default = ["dapps", "ethcore-signer/ui"]
 dapps = ["ethcore-dapps"]
 dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev",
 "ethcore-dapps/dev", "ethcore-signer/dev"]
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 6644e3437..f41784bc1 100644
--- a/parity/configuration.rs
+++ b/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 {
diff --git a/parity/dapps.rs b/parity/dapps.rs
index 67b6ce280..917c59fc6 100644
--- a/parity/dapps.rs
+++ b/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,
diff --git a/parity/main.rs b/parity/main.rs
index 5a76cbbb0..f1f018cc2 100644
--- a/parity/main.rs
+++ b/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]
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
index 3d4da2fdd..265219d95 100644
--- a/signer/Cargo.toml
+++ b/signer/Cargo.toml
@@ -18,10 +18,11 @@ env_logger = "0.3"
 ws = { git = "https://github.com/ethcore/ws-rs.git", branch = "stable" }
 ethcore-util = { path = "../util" }
 ethcore-rpc = { path = "../rpc" }
-parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.2.0" }
+parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.2.0", optional = true}
 
 clippy = { version = "0.0.79", optional = true}
 
 [features]
+default = ["ui"]
 dev = ["clippy"]
-no-ui = []
+ui = ["parity-dapps-signer"]
diff --git a/signer/src/lib.rs b/signer/src/lib.rs
index fb8a61b54..246020874 100644
--- a/signer/src/lib.rs
+++ b/signer/src/lib.rs
@@ -51,7 +51,7 @@ extern crate ethcore_util as util;
 extern crate ethcore_rpc as rpc;
 extern crate jsonrpc_core;
 extern crate ws;
-#[cfg(not(feature = "no-ui"))]
+#[cfg(feature = "ui")]
 extern crate parity_dapps_signer as signer;
 
 mod authcode_store;
diff --git a/signer/src/ws_server/session.rs b/signer/src/ws_server/session.rs
index 64b8c4f8d..dd54baf30 100644
--- a/signer/src/ws_server/session.rs
+++ b/signer/src/ws_server/session.rs
@@ -24,7 +24,7 @@ use std::str::FromStr;
 use jsonrpc_core::IoHandler;
 use util::H256;
 
-#[cfg(not(feature = "no-ui"))]
+#[cfg(feature = "ui")]
 mod signer {
 	use signer;
 
@@ -32,7 +32,7 @@ mod signer {
 		signer::handle(req)
 	}
 }
-#[cfg(feature = "no-ui")]
+#[cfg(not(feature = "ui"))]
 mod signer {
 	pub struct File {
 		pub content: String,