[librsvg/librsvg-2.48] Use a single rsvg_rust_handle_set_dpi_x_y

[Federico Mena Quintero <federico src gnome org>]

commit 1523b8b1703165aae29bf3639976ade34ddc10db
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Apr 8 21:40:28 2020 -0500

    Use a single rsvg_rust_handle_set_dpi_x_y
    
    The separate functions for x and y were a leftover from the initial
    rustification.

 librsvg/c_api.rs      | 19 ++++++-------------
 librsvg/lib.rs        |  3 +--
 librsvg/rsvg-handle.c |  6 ++----
 3 files changed, 9 insertions(+), 19 deletions(-)
---
diff --git a/librsvg/c_api.rs b/librsvg/c_api.rs
index 41a23080..f914c788 100644
--- a/librsvg/c_api.rs
+++ b/librsvg/c_api.rs
@@ -1003,7 +1003,11 @@ pub unsafe extern "C" fn rsvg_rust_handle_get_base_url(
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn rsvg_rust_handle_set_dpi_x(handle: *const RsvgHandle, dpi_x: f64) {
+pub unsafe extern "C" fn rsvg_rust_handle_set_dpi_x_y(
+    handle: *const RsvgHandle,
+    dpi_x: f64,
+    dpi_y: f64,
+) {
     rsvg_return_if_fail! {
         rsvg_handle_set_dpi_x_y;
 
@@ -1012,6 +1016,7 @@ pub unsafe extern "C" fn rsvg_rust_handle_set_dpi_x(handle: *const RsvgHandle, d
 
     let rhandle = get_rust_handle(handle);
     rhandle.set_dpi_x(dpi_x);
+    rhandle.set_dpi_y(dpi_y);
 }
 
 #[no_mangle]
@@ -1020,18 +1025,6 @@ pub unsafe extern "C" fn rsvg_rust_handle_get_dpi_x(raw_handle: *const RsvgHandl
     rhandle.get_dpi_x()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn rsvg_rust_handle_set_dpi_y(handle: *const RsvgHandle, dpi_y: f64) {
-    rsvg_return_if_fail! {
-        rsvg_handle_set_dpi_x_y;
-
-        is_rsvg_handle(handle),
-    }
-
-    let rhandle = get_rust_handle(handle);
-    rhandle.set_dpi_y(dpi_y);
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn rsvg_rust_handle_get_dpi_y(raw_handle: *const RsvgHandle) -> f64 {
     let rhandle = get_rust_handle(raw_handle);
diff --git a/librsvg/lib.rs b/librsvg/lib.rs
index dc9dcaf7..bc3598db 100644
--- a/librsvg/lib.rs
+++ b/librsvg/lib.rs
@@ -31,8 +31,7 @@ pub use crate::c_api::{
     rsvg_rust_handle_render_layer,
     rsvg_rust_handle_set_base_gfile,
     rsvg_rust_handle_set_base_url,
-    rsvg_rust_handle_set_dpi_x,
-    rsvg_rust_handle_set_dpi_y,
+    rsvg_rust_handle_set_dpi_x_y,
     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 1dd112c6..0013f7aa 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -325,8 +325,7 @@
 /* Implemented in rsvg_internals/src/handle.rs */
 extern double rsvg_rust_handle_get_dpi_x (RsvgHandle *raw_handle);
 extern double rsvg_rust_handle_get_dpi_y (RsvgHandle *raw_handle);
-extern void rsvg_rust_handle_set_dpi_x (RsvgHandle *raw_handle, double dpi_x);
-extern void rsvg_rust_handle_set_dpi_y (RsvgHandle *raw_handle, double dpi_y);
+extern void rsvg_rust_handle_set_dpi_x_y (RsvgHandle *raw_handle, double dpi_x, 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);
@@ -1078,8 +1077,7 @@ rsvg_handle_set_dpi (RsvgHandle *handle, double dpi)
 void
 rsvg_handle_set_dpi_x_y (RsvgHandle *handle, double dpi_x, double dpi_y)
 {
-    rsvg_rust_handle_set_dpi_x (handle, dpi_x);
-    rsvg_rust_handle_set_dpi_y (handle, dpi_y);
+    rsvg_rust_handle_set_dpi_x_y (handle, dpi_x, dpi_y);
 }
 
 /**