From a9a32817e0c32622f7592d8bf64d283338a963ab Mon Sep 17 00:00:00 2001 From: Jake Stanger Date: Sun, 2 Jun 2024 17:42:18 +0100 Subject: [PATCH] Revert "Fix Pango markup not escaped" --- src/dynamic_value/dynamic_string.rs | 2 +- src/gtk_helpers.rs | 17 ++--------------- src/modules/clock.rs | 4 ++-- src/modules/custom/button.rs | 3 +-- src/modules/custom/label.rs | 3 +-- src/modules/focused.rs | 2 +- src/modules/label.rs | 3 +-- src/modules/music/mod.rs | 10 +++++----- src/modules/notifications.rs | 2 +- src/modules/script.rs | 3 +-- src/modules/sysinfo.rs | 4 ++-- src/modules/tray/interface.rs | 2 +- src/modules/upower.rs | 6 +++--- src/modules/volume.rs | 2 +- 14 files changed, 23 insertions(+), 40 deletions(-) diff --git a/src/dynamic_value/dynamic_string.rs b/src/dynamic_value/dynamic_string.rs index b33711f..6c0cfb5 100644 --- a/src/dynamic_value/dynamic_string.rs +++ b/src/dynamic_value/dynamic_string.rs @@ -22,7 +22,7 @@ enum DynamicStringSegment { /// /// ```rs /// dynamic_string(&text, move |string| { -/// label.set_markup_escaped(&string); +/// label.set_markup(&string); /// }); /// ``` pub fn dynamic_string(input: &str, mut f: F) diff --git a/src/gtk_helpers.rs b/src/gtk_helpers.rs index c6d2fb6..cc88822 100644 --- a/src/gtk_helpers.rs +++ b/src/gtk_helpers.rs @@ -1,6 +1,6 @@ -use glib::{markup_escape_text, IsA}; +use glib::IsA; use gtk::prelude::*; -use gtk::{Label, Orientation, Widget}; +use gtk::{Orientation, Widget}; /// Represents a widget's size /// and location relative to the bar's start edge. @@ -75,16 +75,3 @@ impl> IronbarGtkExt for W { unsafe { self.set_data(key, value) } } } - -pub trait IronbarLabelExt { - /// Sets a label's pango markup, escaping it in the process. - /// This should be used for any label values - /// which could contain special characters, for example `&`. - fn set_markup_escaped(&self, text: &str); -} - -impl IronbarLabelExt for Label { - fn set_markup_escaped(&self, text: &str) { - self.set_markup(markup_escape_text(text).as_str()) - } -} diff --git a/src/modules/clock.rs b/src/modules/clock.rs index 07d4036..6af5e88 100644 --- a/src/modules/clock.rs +++ b/src/modules/clock.rs @@ -9,7 +9,7 @@ use tokio::sync::{broadcast, mpsc}; use tokio::time::sleep; use crate::config::{CommonConfig, ModuleOrientation}; -use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt}; +use crate::gtk_helpers::IronbarGtkExt; use crate::modules::{ Module, ModuleInfo, ModuleParts, ModulePopup, ModuleUpdateEvent, PopupButton, WidgetContext, }; @@ -143,7 +143,7 @@ impl Module