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

backend.session.logind fixes

This commit is contained in:
Victor Berger 2018-04-17 19:08:54 +02:00
parent 3a74a40877
commit cb4b783dc2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ use std::rc::{Rc, Weak};
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use systemd::login; use systemd::login;
use wayland_server::LoopToken; use wayland_server::LoopToken;
use wayland_server::commons::Implementation;
use wayland_server::sources::{FdEvent, FdInterest, Source}; use wayland_server::sources::{FdEvent, FdInterest, Source};
struct LogindSessionImpl { struct LogindSessionImpl {
@ -456,7 +457,7 @@ pub fn logind_session_bind(
notifier.clone(), notifier.clone(),
) )
}) })
.collect::<::std::result::Result<Vec<FdEventSource<Rc<LogindSessionImpl>>>, (IoError, _)>>() .collect::<::std::result::Result<Vec<Source<FdEvent>>, (IoError, _)>>()
.map_err(|(err, _)| { .map_err(|(err, _)| {
( (
err, err,
@ -528,7 +529,7 @@ impl Implementation<(), FdEvent> for LogindSessionNotifier {
let conn = self.internal.conn.borrow(); let conn = self.internal.conn.borrow();
let items = conn.watch_handle(fd, WatchEvent::Error as u32); let items = conn.watch_handle(fd, WatchEvent::Error as u32);
if let Err(err) = self.internal.handle_signals(items) { if let Err(err) = self.internal.handle_signals(items) {
error!(session.logger, "Error handling dbus signals: {}", err); error!(self.internal.logger, "Error handling dbus signals: {}", err);
} }
} }
} }