strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #272 from JakeStanger/build/stray

Browse Source 
build: replace `stray` with `system-tray` fork
This commit is contained in:
Jake Stanger
2023-08-13 15:25:30 +01:00
committed by GitHub
parent baeb4eae74 b6e4ed6608
commit 9e2ac0f43d
4 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/clients/system_tray.rs
View File

@@ -5,10 +5,10 @@ use color_eyre::Report;
use lazy_static::lazy_static;
use std::collections::BTreeMap;
use std::sync::{Arc, Mutex};
use stray::message::menu::TrayMenu;
use stray::message::tray::StatusNotifierItem;
use stray::message::{NotifierItemCommand, NotifierItemMessage};
use stray::StatusNotifierWatcher;
use system_tray::message::menu::TrayMenu;
use system_tray::message::tray::StatusNotifierItem;
use system_tray::message::{NotifierItemCommand, NotifierItemMessage};
use system_tray::StatusNotifierWatcher;
use tokio::spawn;
use tokio::sync::{broadcast, mpsc};
use tracing::{debug, error, trace};
@@ -24,7 +24,7 @@ pub struct TrayEventReceiver {
}
impl TrayEventReceiver {
async fn new() -> stray::error::Result<Self> {
async fn new() -> system_tray::error::Result<Self> {
let id = format!("ironbar-{}", get_unique_usize());
let (tx, rx) = mpsc::channel(16);

6
src/modules/tray.rs
View File

@@ -11,9 +11,9 @@ use gtk::{
};
use serde::Deserialize;
use std::collections::HashMap;
use stray::message::menu::{MenuItem as MenuItemInfo, MenuType};
use stray::message::tray::StatusNotifierItem;
use stray::message::{NotifierItemCommand, NotifierItemMessage};
use system_tray::message::menu::{MenuItem as MenuItemInfo, MenuType};
use system_tray::message::tray::StatusNotifierItem;
use system_tray::message::{NotifierItemCommand, NotifierItemMessage};
use tokio::spawn;
use tokio::sync::mpsc;
use tokio::sync::mpsc::{Receiver, Sender};