Skip to content

Commit

Permalink
chore: cargo fix
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Brue <ryanbrue@gmail.com>
  • Loading branch information
ryanabx committed Aug 14, 2024
1 parent 4d3fc09 commit 35ff439
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 17 deletions.
3 changes: 1 addition & 2 deletions src/app_tray/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ use freedesktop_desktop_entry::DesktopEntry;
use iced::{widget::button, Background, Border, Color, Length, Radius, Theme};

use crate::{
compositor::{WaylandOutgoing, WindowHandle, WindowInfo},
AppTrayRequest, Message, WindowOperationMessage,
compositor::{WaylandOutgoing, WindowHandle, WindowInfo}, Message,
};

pub mod desktop_entry;
Expand Down
16 changes: 6 additions & 10 deletions src/compositor/cosmic_comp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ use iced::{
};
use once_cell::sync::Lazy;

use crate::{
app_tray,
compositor::{WindowHandle, WindowInfo},
};
use crate::compositor::{WindowHandle, WindowInfo};

use super::WaylandOutgoing;

Expand Down Expand Up @@ -301,12 +298,11 @@ fn wayland_handler(tx: UnboundedSender<CosmicIncoming>, rx: Channel<WaylandReque
.map(|fd| unsafe { UnixStream::from_raw_fd(fd) })
});

// let conn = if let Some(socket) = socket {
// Connection::from_socket(socket).unwrap()
// } else {
// Connection::connect_to_env().unwrap()
// };
let conn = Connection::connect_to_env().unwrap();
let conn = if let Some(socket) = socket {
Connection::from_socket(socket).unwrap()
} else {
Connection::connect_to_env().unwrap()
};

let (globals, event_queue) = registry_queue_init(&conn).unwrap();

Expand Down
2 changes: 1 addition & 1 deletion src/compositor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use cctk::toplevel_info::ToplevelInfo;
use cosmic_comp::CosmicCompBackend;
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1;

use crate::{app_tray::AppTray, Panel};
use crate::app_tray::AppTray;

pub mod cosmic_comp;
pub mod wlr;
Expand Down
3 changes: 0 additions & 3 deletions src/config.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use freedesktop_desktop_entry::DesktopEntry;
use iced::{widget::button, Background, Border, Color, Length, Radius, Theme};

use crate::app_tray::desktop_entry::DesktopEntryCache;

#[derive(Debug, Clone)]
pub struct PanelConfig {
Expand Down
1 change: 0 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::borrow::Borrow;

use app_tray::{AppTray, ApplicationGroup};
use cctk::wayland_client::protocol::wl_seat::WlSeat;
Expand Down

0 comments on commit 35ff439

Please sign in to comment.