From 33f73eefa066a56dc01321895b2f32fa97a515a7 Mon Sep 17 00:00:00 2001
From: Reinout Meliesie <zedfrigg@kernelmaft.com>
Date: Tue, 14 May 2024 19:02:16 +0200
Subject: [PATCH] Add GTK Box import alias, change DBus strings to const

---
 src/clients/networkmanager.rs | 6 +++---
 src/modules/networkmanager.rs | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/clients/networkmanager.rs b/src/clients/networkmanager.rs
index a1b760f..32487c0 100644
--- a/src/clients/networkmanager.rs
+++ b/src/clients/networkmanager.rs
@@ -12,9 +12,9 @@ use zbus::{
 
 use crate::{register_fallible_client, spawn_blocking};
 
-static DBUS_BUS: &str = "org.freedesktop.NetworkManager";
-static DBUS_PATH: &str = "/org/freedesktop/NetworkManager";
-static DBUS_INTERFACE: &str = "org.freedesktop.NetworkManager";
+const DBUS_BUS: &str = "org.freedesktop.NetworkManager";
+const DBUS_PATH: &str = "/org/freedesktop/NetworkManager";
+const DBUS_INTERFACE: &str = "org.freedesktop.NetworkManager";
 
 #[derive(Debug)]
 pub struct Client {
diff --git a/src/modules/networkmanager.rs b/src/modules/networkmanager.rs
index 972fccb..16e8239 100644
--- a/src/modules/networkmanager.rs
+++ b/src/modules/networkmanager.rs
@@ -2,7 +2,7 @@ use color_eyre::Result;
 use futures_lite::StreamExt;
 use futures_signals::signal::SignalExt;
 use gtk::prelude::ContainerExt;
-use gtk::{Box, Image, Orientation};
+use gtk::{Box as GtkBox, Image, Orientation};
 use serde::Deserialize;
 use tokio::sync::mpsc::Receiver;
 
@@ -26,7 +26,7 @@ const fn default_icon_size() -> i32 {
     24
 }
 
-impl Module<Box> for NetworkManagerModule {
+impl Module<GtkBox> for NetworkManagerModule {
     type SendMessage = ClientState;
     type ReceiveMessage = ();
 
@@ -53,8 +53,8 @@ impl Module<Box> for NetworkManagerModule {
         self,
         context: WidgetContext<ClientState, ()>,
         info: &ModuleInfo,
-    ) -> Result<ModuleParts<Box>> {
-        let container = Box::new(Orientation::Horizontal, 0);
+    ) -> Result<ModuleParts<GtkBox>> {
+        let container = GtkBox::new(Orientation::Horizontal, 0);
         let icon = Image::new();
         icon.add_class("icon");
         container.add(&icon);