Finalise zbus3 conversion

This commit is contained in:
Luke D. Jones
2022-01-16 22:28:53 +13:00
parent bac2ba6f09
commit a85e2f6130
33 changed files with 1093 additions and 1077 deletions

View File

@@ -14,7 +14,7 @@ exclude = ["data"]
[features]
default = ["dbus"]
dbus = ["zvariant", "zvariant_derive"]
dbus = ["zvariant"]
[dependencies]
png_pong = "^0.8.0"
@@ -26,5 +26,5 @@ serde_derive = "^1.0"
glam = { version = "0.14.0", features = ["serde"] }
zvariant = { version = "^2.6", optional = true }
zvariant_derive = { version = "^2.6", optional = true }
zvariant = { version = "^3.0", optional = true }
#zvariant_derive = { version = "^3.0", optional = true }

View File

@@ -9,7 +9,7 @@ use std::{
use serde_derive::{Deserialize, Serialize};
#[cfg(feature = "dbus")]
use zvariant_derive::Type;
use zvariant::Type;
use crate::{error::AnimeError, AnimTime, AnimeGif};
@@ -27,7 +27,6 @@ const USB_PREFIX2: [u8; 7] = [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02];
#[cfg_attr(feature = "dbus", derive(Type))]
#[derive(Debug, PartialEq, Copy, Clone, Deserialize, Serialize)]
pub struct AnimePowerStates {
pub enabled: bool,
pub boot_anim_enabled: bool,