[librsvg/bilelmoussaoui/new-gtk-rs-stack: 6/10] c-api: adapt to macros renames
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/bilelmoussaoui/new-gtk-rs-stack: 6/10] c-api: adapt to macros renames
- Date: Sun, 16 Jan 2022 03:58:40 +0000 (UTC)
commit 83b522a64a543cab883565307b593f03fd920fe1
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date: Tue Dec 7 20:56:25 2021 +0100
c-api: adapt to macros renames
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/634>
src/c_api/handle.rs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/c_api/handle.rs b/src/c_api/handle.rs
index b1c3025b0..02ac00a11 100644
--- a/src/c_api/handle.rs
+++ b/src/c_api/handle.rs
@@ -34,9 +34,9 @@ use url::Url;
use glib::subclass::prelude::*;
use glib::translate::*;
+use glib::types::instance_of;
use glib::{ffi::gpointer, gobject_ffi};
use glib::{Bytes, Cast, StaticType, ToValue};
-use glib::types::instance_of;
use crate::api::{self, CairoRenderer, IntrinsicDimensions, Loader, LoadingError, SvgHandle};
@@ -80,7 +80,7 @@ impl fmt::Display for RenderingError {
}
/// Rust version of the `RsvgHandleFlags` enum in C.
-#[glib::gflags("RsvgHandleFlags")]
+#[glib::flags(name = "RsvgHandleFlags")]
pub enum HandleFlags {
#[gflags(name = "RSVG_HANDLE_FLAGS_NONE", nick = "flags-none")]
NONE = 0,
@@ -284,7 +284,7 @@ mod imp {
ParamFlags, ParamSpec, ParamSpecDouble, ParamSpecFlags, ParamSpecInt, ParamSpecString,
};
use once_cell::sync::Lazy;
-
+
/// Contains all the interior mutability for a RsvgHandle to be called
/// from the C API.
pub struct CHandle {
@@ -2094,11 +2094,11 @@ pub(crate) fn set_gerror(err: *mut *mut glib::ffi::GError, code: u32, msg: &str)
}
}
-#[derive(Debug, Eq, PartialEq, Clone, Copy, glib::GEnum)]
+#[derive(Debug, Eq, PartialEq, Clone, Copy, glib::Enum)]
#[repr(u32)]
-#[genum(type_name = "RsvgError")]
+#[enum_type(name = "RsvgError")]
enum Error {
- #[genum(name = "RSVG_ERROR_FAILED", nick = "failed")]
+ #[enum_value(name = "RSVG_ERROR_FAILED", nick = "failed")]
// Keep in sync with rsvg.h:RsvgError
Failed = 0,
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]