From d8e86cfe0a63e5b2fa00697a6530b58bd87b33ec Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 20 Nov 2017 13:37:23 +0100 Subject: [PATCH] Add to all icon_url places --- dapps/js-glue/src/lib.rs.in | 1 + dapps/src/apps/app.rs | 2 +- dapps/src/apps/fetcher/mod.rs | 1 + dapps/src/apps/fs.rs | 1 + dapps/src/page/builtin.rs | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dapps/js-glue/src/lib.rs.in b/dapps/js-glue/src/lib.rs.in index 99a253013..460c6498b 100644 --- a/dapps/js-glue/src/lib.rs.in +++ b/dapps/js-glue/src/lib.rs.in @@ -38,6 +38,7 @@ pub struct Info { pub author: &'static str, pub description: &'static str, pub icon_url: &'static str, + pub local_url: &'static str, } pub trait WebApp : Default + Send + Sync { diff --git a/dapps/src/apps/app.rs b/dapps/src/apps/app.rs index e22a9e855..9ced2438d 100644 --- a/dapps/src/apps/app.rs +++ b/dapps/src/apps/app.rs @@ -27,7 +27,7 @@ pub struct App { #[serde(rename="iconUrl")] pub icon_url: String, #[serde(rename="localUrl")] - pub local_url: String; + pub local_url: String, } impl App { diff --git a/dapps/src/apps/fetcher/mod.rs b/dapps/src/apps/fetcher/mod.rs index effcc19cd..e66c44eb6 100644 --- a/dapps/src/apps/fetcher/mod.rs +++ b/dapps/src/apps/fetcher/mod.rs @@ -306,6 +306,7 @@ mod tests { version: "".into(), author: "".into(), icon_url: "".into(), + local_url: "".into(), }, Default::default(), None); // when diff --git a/dapps/src/apps/fs.rs b/dapps/src/apps/fs.rs index 8be2dcf58..888e32bbf 100644 --- a/dapps/src/apps/fs.rs +++ b/dapps/src/apps/fs.rs @@ -56,6 +56,7 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo { version: "0.0.0".into(), author: "?".into(), icon_url: "icon.png".into(), + local_url: "".into(), } }) } diff --git a/dapps/src/page/builtin.rs b/dapps/src/page/builtin.rs index f1ea50d42..b8c013cb3 100644 --- a/dapps/src/page/builtin.rs +++ b/dapps/src/page/builtin.rs @@ -132,6 +132,7 @@ impl From for EndpointInfo { description: info.description.into(), author: info.author.into(), icon_url: info.icon_url.into(), + local_url: info.local_url.into(), version: info.version.into(), } }