zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-09-16 03:36:58 +02:00
Code Activity

Merge branch 'master' into feat/networkmanager-multi-icon

Browse source
This commit is contained in:
Reinout Meliesie 2024-06-30 18:05:15 +02:00
commit f32f98b430
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
13 changed files with 287 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/clients/swaync/mod.rs
View file

@ -14,7 +14,7 @@ pub struct Event {
pub count: u32,
pub dnd: bool,
pub cc_open: bool,
pub inhibited: bool,
// pub inhibited: bool,
}
type GetSubscribeData = (bool, bool, u32, bool);
@ -22,12 +22,12 @@ type GetSubscribeData = (bool, bool, u32, bool);
/// Converts the data returned from
/// `get_subscribe_data` into an event for convenience.
impl From<GetSubscribeData> for Event {
fn from((dnd, cc_open, count, inhibited): (bool, bool, u32, bool)) -> Self {
fn from((dnd, cc_open, count, _inhibited): (bool, bool, u32, bool)) -> Self {
Self {
count,
dnd,
cc_open,
inhibited,
// inhibited,
}
}
}

5
src/clients/wayland/mod.rs
View file

@ -2,8 +2,9 @@ mod macros;
mod wl_output;
mod wl_seat;
use crate::error::ERR_CHANNEL_RECV;
use crate::error::{ExitCode, ERR_CHANNEL_RECV};
use crate::{arc_mut, lock, register_client, send, spawn, spawn_blocking};
use std::process::exit;
use std::sync::{Arc, Mutex};
use calloop_channel::Event::Msg;
@ -305,6 +306,8 @@ impl Environment {
"{:?}",
Report::new(err).wrap_err("Failed to dispatch pending wayland events")
);
exit(ExitCode::WaylandDispatchError as i32)
}
}
}