From 441689018a7ca45c83e0549604e5d323b32c6932 Mon Sep 17 00:00:00 2001 From: "Ospald, Julian" Date: Tue, 11 Jul 2017 16:50:07 +0200 Subject: [PATCH] Update --- .gitignore | 1 + .gitmodules | 4 ++++ 3rdparty/libnotify | 1 + Cargo.toml | 4 ++-- src/errors.rs | 1 - 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 3rdparty/libnotify diff --git a/.gitignore b/.gitignore index afc990127..5a10e5db3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ target Cargo.lock *.bk +*~ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..b71415c61 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "3rdparty/libnotify"] + path = 3rdparty/libnotify + url = https://github.com/hasufell/rust-libnotify.git + branch = git-deps diff --git a/3rdparty/libnotify b/3rdparty/libnotify new file mode 160000 index 000000000..5b26d19aa --- /dev/null +++ b/3rdparty/libnotify @@ -0,0 +1 @@ +Subproject commit 5b26d19aa92316a9555b0b22d2d7c3a2721a33dc diff --git a/Cargo.toml b/Cargo.toml index a7a402b23..ba5348ca1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Julian Ospald "] [dependencies] alsa = "^0.1.8" alsa-sys = "^0.1.1" -error-chain = { path = "3rdparty/error-chain" } +error-chain = { git = "https://github.com/hasufell/error-chain.git", branch = "PR-from-error" } ffi = "^0.0.2" flexi_logger = "^0.5.1" gdk-pixbuf = { git = "https://github.com/gtk-rs/gdk-pixbuf.git" } @@ -24,7 +24,7 @@ serde_derive = "^1.0.9" toml = "^0.4.2" which = "*" xdg = "*" -libnotify = { path = "3rdparty/rust-libnotify", optional = true } +libnotify = { path = "3rdparty/libnotify", optional = true } [dependencies.gtk] git = "https://github.com/gtk-rs/gtk.git" diff --git a/src/errors.rs b/src/errors.rs index 3e1784cd1..a10d84c4f 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -11,7 +11,6 @@ error_chain! { Alsa(alsa::Error); IO(std::io::Error); Toml(toml::de::Error); - Glib(glib::BoolError); } }