Change GTK UI builder handling to use resource API

GTK UI builder resources have till now been exclusively stored on disc
requiring netsurf to ship numerous additional resource files. This
requires going to disc every time a UI action is performed which can
become a lot of unwanted file handling.

GLib/GTK has moved towards GResource handling for such resources
instead. It now seems that migrating to this style of usage is
expected and indeed the only portable way to include pixbufs.

This introduces an API to hide the various implementation details of
how resources are handled from the rest of the codebase.

1 files changed, 37 insertions, 0 deletions

diff --git a/gtk/compat.c b/gtk/compat.c
index 51469b26e..4c5524b0e 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -601,3 +601,40 @@ void nsgtk_widget_set_margins(GtkWidget *widget, gint hmargin, gint vmargin)
 	gtk_misc_set_padding(GTK_MISC(widget), hmargin, vmargin);
 #endif
 }
+
+/* exported interface documented in gtk/compat.h */
+guint
+nsgtk_builder_add_from_resource(GtkBuilder *builder,
+				const gchar *resource_path,
+				GError **error)
+{
+	guint ret;
+
+#ifdef WITH_GRESOURCE
+#if GTK_CHECK_VERSION(3,4,0)
+	ret = gtk_builder_add_from_resource(builder, resource_path, error);
+#else
+	GBytes *data;
+	const gchar *buffer;
+	gsize buffer_length;
+
+	g_assert(error && *error == NULL);
+
+	data = g_resources_lookup_data(resource_path, 0, error);
+	if (data == NULL) {
+		return 0;
+	}
+
+	buffer_length = 0;
+	buffer = g_bytes_get_data(data, &buffer_length);
+	g_assert(buffer != NULL);
+
+	ret = gtk_builder_add_from_string(builder, buffer, buffer_length, error);
+
+	g_bytes_unref(data);
+#endif
+#else
+	ret = 0; /* return an error as GResource not supported before GLIB 2.32 */
+#endif
+	return ret;
+}