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.
This commit is contained in:
Vicki Pfau 2024-11-07 17:04:31 -08:00
parent f7bfdd7d7a
commit 2f4cfb1e66
3 changed files with 30 additions and 19 deletions

View file

@ -381,10 +381,10 @@
</interface> </interface>
<!-- <!--
com.steampowered.SteamOSManager1.Job com.steampowered.SteamOSManager1.Job1
@short_description: Interface to control a job @short_description: Interface to control a job
--> -->
<interface name="com.steampowered.SteamOSManager1.Job"> <interface name="com.steampowered.SteamOSManager1.Job1">
<!-- <!--
Pause: Pause:
@ -462,8 +462,19 @@
</interface> </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"> <signal name="JobStarted">
<arg type="o" name="job"/> <arg type="o" name="job"/>
</signal> </signal>

View file

@ -9,14 +9,6 @@
// Re-export relevant proxies // 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 // Deprecated interface
mod manager; mod manager;
pub use crate::proxy::manager::ManagerProxy; 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::update_dock1::UpdateDock1Proxy;
pub use crate::proxy::wifi_debug1::WifiDebug1Proxy; pub use crate::proxy::wifi_debug1::WifiDebug1Proxy;
pub use crate::proxy::wifi_power_management1::WifiPowerManagement1Proxy; 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;

View file

@ -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. //! This code was generated by `zbus-xmlgen` `4.1.0` from D-Bus introspection data.
//! Source: `com.steampowered.SteamOSManager1.xml`. //! Source: `com.steampowered.SteamOSManager1.xml`.
@ -13,13 +13,13 @@
//! [D-Bus standard interfaces]: https://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces, //! [D-Bus standard interfaces]: https://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces,
use zbus::proxy; use zbus::proxy;
#[proxy( #[proxy(
interface = "com.steampowered.SteamOSManager1.UdevEvents", interface = "com.steampowered.SteamOSManager1.UdevEvents1",
default_service = "com.steampowered.SteamOSManager1", default_service = "com.steampowered.SteamOSManager1",
default_path = "/com/steampowered/SteamOSManager1/UdevEvents", default_path = "/com/steampowered/SteamOSManager1",
assume_defaults = true assume_defaults = true
)] )]
trait UdevEvents { trait UdevEvents1 {
/// OverCurrent signal /// UsbOverCurrent signal
#[zbus(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<()>;
} }