vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to dbus 0.8, change imports to match.

This commit is contained in:
Christophe Biocca 2019-12-31 12:27:28 -05:00 committed by Victor Berger
parent 0b2e4b42db
commit 834f3d2e65
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -29,7 +29,7 @@ gbm = { version = "^0.5.0", optional = true, default-features = false, features
glium = { version = "0.23.0", optional = true, default-features = false } glium = { version = "0.23.0", optional = true, default-features = false }
input = { version = "0.4.1", optional = true } input = { version = "0.4.1", optional = true }
udev = { version = "0.2.0", optional = true } udev = { version = "0.2.0", optional = true }
dbus = { version = "0.6.1", optional = true } dbus = { version = "0.8", optional = true }
systemd = { version = "0.4.0", optional = true } systemd = { version = "0.4.0", optional = true }
wayland-protocols = { version = "0.23.4", features = ["unstable_protocols", "server"], optional = true } wayland-protocols = { version = "0.23.4", features = ["unstable_protocols", "server"], optional = true }
image = { version = "0.21.0", optional = true } image = { version = "0.21.0", optional = true }

13
src/backend/session/dbus/logind.rs
View File

@ -33,8 +33,10 @@
use crate::backend::session::{AsErrno, Session, SessionNotifier, SessionObserver}; use crate::backend::session::{AsErrno, Session, SessionNotifier, SessionObserver};
use dbus::{ use dbus::{
BusName, BusType, Connection, ConnectionItem, ConnectionItems, Interface, Member, Message, MessageItem, arg::{messageitem::MessageItem, OwnedFd},
OwnedFd, Path as DbusPath, Watch, WatchEvent, ffidisp::{BusType, Connection, ConnectionItem, Watch, WatchEvent},
strings::{BusName, Interface, Member, Path as DbusPath},
Message,
}; };
use nix::{ use nix::{
fcntl::OFlag, fcntl::OFlag,
@ -246,7 +248,10 @@ impl LogindSessionImpl {
} }
} }
fn handle_signals(&self, signals: ConnectionItems<'_>) -> Result<()> { fn handle_signals<I>(&self, signals: I) -> Result<()>
where
I: IntoIterator<Item = ConnectionItem>,
{
for item in signals { for item in signals {
let message = if let ConnectionItem::Signal(ref s) = item { let message = if let ConnectionItem::Signal(ref s) = item {
s s
@ -521,7 +526,7 @@ impl LogindSessionNotifier {
/// Errors related to logind sessions /// Errors related to logind sessions
pub mod errors { pub mod errors {
use dbus::{BusName, Interface, Member, Path as DbusPath}; use dbus::strings::{BusName, Interface, Member, Path as DbusPath};
error_chain! { error_chain! {
errors { errors {