From 6eae8e8c2477359e487bdea940a8cca162e2a051 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 27 Feb 2021 09:50:44 -0600 Subject: [PATCH] Remove use of deprecated librsvg functions. --- lua/librsvg-helper.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lua/librsvg-helper.h b/lua/librsvg-helper.h index 351e0d24..5c7990bb 100644 --- a/lua/librsvg-helper.h +++ b/lua/librsvg-helper.h @@ -55,8 +55,11 @@ void rsvgPositionDataGet(RsvgPositionData *pd, int *x, int *y) { } RsvgHandle *rsvg_create_handle_from_file(const char *filename) { + GFile *gfile = g_file_new_for_path(filename); + GError *error = NULL; - RsvgHandle *handle = rsvg_handle_new_from_file(filename, &error); + RsvgHandle *handle = rsvg_handle_new_from_gfile_sync( + gfile, RSVG_HANDLE_FLAGS_NONE, NULL, &error); if (error) { g_object_unref(error); @@ -64,22 +67,15 @@ RsvgHandle *rsvg_create_handle_from_file(const char *filename) { handle = NULL; } + g_object_unref(gfile); + return handle; } int rsvg_destroy_handle(RsvgHandle *handle) { - int status = 0; + if (handle) { g_object_unref(handle); } - if (handle) { - GError *error = NULL; - status = rsvg_handle_close(handle, &error); - - if (status) g_object_unref(handle); - - if (error) g_object_unref(error); - } - - return status; + return 0; } #endif /* _LIBRSVG_HELPER_H_ */