mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Disable tinyfiledialogs on non-OS X and Linux platforms.
This commit is contained in:
parent
7bd2381518
commit
d09a497aa5
3 changed files with 11 additions and 3 deletions
|
@ -32,9 +32,6 @@ git = "https://github.com/servo/ipc-channel"
|
|||
[dependencies.webrender_traits]
|
||||
git = "https://github.com/servo/webrender_traits"
|
||||
|
||||
[dependencies.tinyfiledialogs]
|
||||
git = "https://github.com/jdm/tinyfiledialogs"
|
||||
|
||||
[dependencies]
|
||||
cookie = "0.2"
|
||||
flate2 = "0.2.0"
|
||||
|
@ -51,3 +48,6 @@ unicase = "1.4.0"
|
|||
url = {version = "0.5.7", features = ["heap_size"]}
|
||||
uuid = { version = "0.2", features = ["v4"] }
|
||||
websocket = "0.16.1"
|
||||
|
||||
[target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
|
||||
tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}
|
||||
|
|
|
@ -41,6 +41,7 @@ use std::sync::mpsc::Sender;
|
|||
use std::sync::{Arc, RwLock};
|
||||
use time;
|
||||
use time::Tm;
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
use tinyfiledialogs;
|
||||
use url::Url;
|
||||
use util::resource_files::resources_dir_path;
|
||||
|
@ -702,10 +703,16 @@ pub trait UIProvider {
|
|||
}
|
||||
|
||||
impl UIProvider for TFDProvider {
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
fn input_username_and_password(&self) -> (Option<String>, Option<String>) {
|
||||
(tinyfiledialogs::input_box("Enter username", "Username:", ""),
|
||||
tinyfiledialogs::input_box("Enter password", "Password:", ""))
|
||||
}
|
||||
|
||||
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
|
||||
fn input_username_and_password(&self) -> (Option<String>, Option<String>) {
|
||||
(None, None)
|
||||
}
|
||||
}
|
||||
|
||||
struct TFDProvider;
|
||||
|
|
|
@ -29,6 +29,7 @@ extern crate openssl;
|
|||
extern crate rustc_serialize;
|
||||
extern crate threadpool;
|
||||
extern crate time;
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
extern crate tinyfiledialogs;
|
||||
extern crate unicase;
|
||||
extern crate url;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue