From 2f4cfb1e66ad0338c05df02b84cef26db83c9f43 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Thu, 7 Nov 2024 17:04:31 -0800
Subject: [PATCH] Proxy: Fix up straggler interface names

A handful of interface names got updated but the XML and implementations got
out of sync. This fixes that, as well as adding some missing comments and
fixing formatting in the XML.
---
 com.steampowered.SteamOSManager1.xml          | 21 ++++++++++++++-----
 src/proxy/mod.rs                              | 16 +++++++-------
 src/proxy/{udev_events.rs => udev_events1.rs} | 12 +++++------
 3 files changed, 30 insertions(+), 19 deletions(-)
 rename src/proxy/{udev_events.rs => udev_events1.rs} (71%)

diff --git a/com.steampowered.SteamOSManager1.xml b/com.steampowered.SteamOSManager1.xml
index 8fbff78..688bdec 100644
--- a/com.steampowered.SteamOSManager1.xml
+++ b/com.steampowered.SteamOSManager1.xml
@@ -381,10 +381,10 @@
   </interface>
 
   <!--
-      com.steampowered.SteamOSManager1.Job
+      com.steampowered.SteamOSManager1.Job1
       @short_description: Interface to control a job
   -->
-  <interface name="com.steampowered.SteamOSManager1.Job">
+  <interface name="com.steampowered.SteamOSManager1.Job1">
 
       <!--
         Pause:
@@ -430,7 +430,7 @@
 
         @result: The exit code, or negative signal number if the process
         exited via signal.
-        -->
+      -->
       <method name="ExitCode">
         <arg type="i" name="result" direction="out"/>
       </method>
@@ -453,7 +453,7 @@
         @port: The associated port.
         @count: The number of times this devices has had an over-current
         event.
-        -->
+      -->
       <signal name="UsbOverCurrent">
         <arg type="s" name="devpath"/>
         <arg type="s" name="port"/>
@@ -462,8 +462,19 @@
 
   </interface>
 
-  <interface name="com.steampowered.SteamOSManager1.JobManager">
+  <!--
+      com.steampowered.SteamOSManager1.JobManager1
+      @short_description: Interface to manage jobs
+  -->
+  <interface name="com.steampowered.SteamOSManager1.JobManager1">
 
+      <!--
+        JobStarted:
+
+        Signals that a job has started
+
+        @job: The object path of the job
+      -->
       <signal name="JobStarted">
         <arg type="o" name="job"/>
       </signal>
diff --git a/src/proxy/mod.rs b/src/proxy/mod.rs
index db1d4fc..c37dcdc 100644
--- a/src/proxy/mod.rs
+++ b/src/proxy/mod.rs
@@ -9,14 +9,6 @@
 
 // Re-export relevant proxies
 
-// TODO Some of these should get renamed
-mod job1;
-mod job_manager1;
-mod udev_events;
-pub use crate::proxy::job1::Job1Proxy;
-pub use crate::proxy::job_manager1::JobManager1Proxy;
-pub use crate::proxy::udev_events::UdevEventsProxy;
-
 // Deprecated interface
 mod manager;
 pub use crate::proxy::manager::ManagerProxy;
@@ -50,3 +42,11 @@ pub use crate::proxy::update_bios1::UpdateBios1Proxy;
 pub use crate::proxy::update_dock1::UpdateDock1Proxy;
 pub use crate::proxy::wifi_debug1::WifiDebug1Proxy;
 pub use crate::proxy::wifi_power_management1::WifiPowerManagement1Proxy;
+
+// Sub-interfaces
+mod job1;
+mod job_manager1;
+mod udev_events1;
+pub use crate::proxy::job1::Job1Proxy;
+pub use crate::proxy::job_manager1::JobManager1Proxy;
+pub use crate::proxy::udev_events1::UdevEvents1Proxy;
diff --git a/src/proxy/udev_events.rs b/src/proxy/udev_events1.rs
similarity index 71%
rename from src/proxy/udev_events.rs
rename to src/proxy/udev_events1.rs
index bce44b2..215239c 100644
--- a/src/proxy/udev_events.rs
+++ b/src/proxy/udev_events1.rs
@@ -1,4 +1,4 @@
-//! # D-Bus interface proxy for: `com.steampowered.SteamOSManager1.UdevEvents`
+//! # D-Bus interface proxy for: `com.steampowered.SteamOSManager1.UdevEvents1`
 //!
 //! This code was generated by `zbus-xmlgen` `4.1.0` from D-Bus introspection data.
 //! Source: `com.steampowered.SteamOSManager1.xml`.
@@ -13,13 +13,13 @@
 //! [D-Bus standard interfaces]: https://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces,
 use zbus::proxy;
 #[proxy(
-    interface = "com.steampowered.SteamOSManager1.UdevEvents",
+    interface = "com.steampowered.SteamOSManager1.UdevEvents1",
     default_service = "com.steampowered.SteamOSManager1",
-    default_path = "/com/steampowered/SteamOSManager1/UdevEvents",
+    default_path = "/com/steampowered/SteamOSManager1",
     assume_defaults = true
 )]
-trait UdevEvents {
-    /// OverCurrent signal
+trait UdevEvents1 {
+    /// UsbOverCurrent signal
     #[zbus(signal)]
-    fn over_current(&self, devpath: &str, port: &str, count: u64) -> zbus::Result<()>;
+    fn usb_over_current(&self, devpath: &str, port: &str, count: u64) -> zbus::Result<()>;
 }