[librsvg: 2/5] CHandle: add accessors for setting/getting flags

[Federico Mena Quintero <federico src gnome org>]

commit ca928b3ad398c9aa8806c356405f7d02109e0202
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Oct 28 15:05:57 2019 -0600

    CHandle: add accessors for setting/getting flags
    
    Direct all API-facing calls through those accessors.
    
    Whee, this found a couple of unused functions!

 librsvg/c_api.rs      | 35 ++++++++++-------------------------
 librsvg/lib.rs        |  2 --
 librsvg/rsvg-handle.c |  2 --
 3 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/librsvg/c_api.rs b/librsvg/c_api.rs
index c8c7723c..5ce5396e 100644
--- a/librsvg/c_api.rs
+++ b/librsvg/c_api.rs
@@ -348,7 +348,7 @@ impl ObjectImpl for CHandle {
         match *prop {
             subclass::Property("flags", ..) => {
                 let v: HandleFlags = value.get().expect("flags value has incorrect type");
-                self.load_flags.set(LoadFlags::from(v));
+                self.set_flags(v);
             }
 
             subclass::Property("dpi-x", ..) => {
@@ -382,10 +382,7 @@ impl ObjectImpl for CHandle {
         let prop = &PROPERTIES[id];
 
         match *prop {
-            subclass::Property("flags", ..) => {
-                let flags = HandleFlags::from(self.load_flags.get());
-                Ok(flags.to_value())
-            }
+            subclass::Property("flags", ..) => Ok(self.get_flags().to_value()),
 
             subclass::Property("dpi-x", ..) => Ok(self.get_dpi_x().to_value()),
             subclass::Property("dpi-y", ..) => Ok(self.get_dpi_y().to_value()),
@@ -475,6 +472,14 @@ impl CHandle {
         self.dpi.get().y()
     }
 
+    fn set_flags(&self, flags: HandleFlags) {
+        self.load_flags.set(LoadFlags::from(flags));
+    }
+
+    fn get_flags(&self) -> HandleFlags {
+        HandleFlags::from(self.load_flags.get())
+    }
+
     fn load_options(&self) -> LoadOptions {
         let flags = self.load_flags.get();
         LoadOptions::new(self.base_url.borrow().get().map(|u| (*u).clone()))
@@ -908,26 +913,6 @@ pub unsafe extern "C" fn rsvg_rust_handle_get_dpi_y(raw_handle: *const RsvgHandl
     rhandle.get_dpi_y()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn rsvg_rust_handle_get_flags(
-    raw_handle: *const RsvgHandle,
-) -> RsvgHandleFlags {
-    let rhandle = get_rust_handle(raw_handle);
-
-    HandleFlags::from(rhandle.load_flags.get()).to_glib()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn rsvg_rust_handle_set_flags(
-    raw_handle: *const RsvgHandle,
-    flags: RsvgHandleFlags,
-) {
-    let rhandle = get_rust_handle(raw_handle);
-
-    let flags: HandleFlags = from_glib(flags);
-    rhandle.load_flags.set(LoadFlags::from(flags));
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn rsvg_rust_handle_set_size_callback(
     raw_handle: *const RsvgHandle,
diff --git a/librsvg/lib.rs b/librsvg/lib.rs
index 116203cb..770ea939 100644
--- a/librsvg/lib.rs
+++ b/librsvg/lib.rs
@@ -13,7 +13,6 @@ pub use crate::c_api::{
     rsvg_rust_handle_get_dimensions_sub,
     rsvg_rust_handle_get_dpi_x,
     rsvg_rust_handle_get_dpi_y,
-    rsvg_rust_handle_get_flags,
     rsvg_rust_handle_get_geometry_for_element,
     rsvg_rust_handle_get_geometry_for_layer,
     rsvg_rust_handle_get_intrinsic_dimensions,
@@ -34,7 +33,6 @@ pub use crate::c_api::{
     rsvg_rust_handle_set_base_url,
     rsvg_rust_handle_set_dpi_x,
     rsvg_rust_handle_set_dpi_y,
-    rsvg_rust_handle_set_flags,
     rsvg_rust_handle_set_size_callback,
     rsvg_rust_handle_set_testing,
     rsvg_rust_handle_write,
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index a3c4a3a4..0b06203e 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -333,8 +333,6 @@ extern void rsvg_rust_handle_set_dpi_y (RsvgHandle *raw_handle, double dpi_y);
 extern void rsvg_rust_handle_set_base_url (RsvgHandle *raw_handle, const char *uri);
 extern void rsvg_rust_handle_set_base_gfile (RsvgHandle *raw_handle, GFile *file);
 extern const char *rsvg_rust_handle_get_base_url (RsvgHandle *raw_handle);
-extern guint rsvg_rust_handle_get_flags (RsvgHandle *raw_handle);
-extern void rsvg_rust_handle_set_flags (RsvgHandle *raw_handle, guint flags);
 extern guint rsvg_rust_handle_set_testing (RsvgHandle *raw_handle, gboolean testing);
 extern gboolean rsvg_rust_handle_read_stream_sync (RsvgHandle *handle,
                                                    GInputStream *stream,