[totem/wip/hadess/remove-plugin-interface: 1/5] skipto: Use GResources to load UI file

[Bastien Nocera <hadess src gnome org>]

commit e76a74d9dc83eb0a7d4d65e7706dc327aaa3ec41
Author: Bastien Nocera <hadess hadess net>
Date:   Tue May 11 14:27:30 2021 +0200

    skipto: Use GResources to load UI file
    
    Removes the error handling, simplifies our code.

 src/plugins/skipto/meson.build          | 13 ++++++++-----
 src/plugins/skipto/skipto.gresource.xml |  6 ++++++
 src/plugins/skipto/totem-skipto.c       |  9 +--------
 3 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/src/plugins/skipto/meson.build b/src/plugins/skipto/meson.build
index bc2ea6cf4..c5056a839 100644
--- a/src/plugins/skipto/meson.build
+++ b/src/plugins/skipto/meson.build
@@ -8,6 +8,14 @@ plugin_files = files(
   'totem-' + plugin_name + '.c'
 )
 
+plugin_files += gnome.compile_resources(
+  'skiptoresources',
+  'skipto.gresource.xml',
+  export: true,
+  source_dir: '.',
+  c_name: 'skipto'
+)
+
 shared_module(
   plugin_name,
   sources: plugin_files,
@@ -28,8 +36,3 @@ custom_target(
   install: true,
   install_dir: plugin_dir
 )
-
-install_data(
-  plugin_name + '.ui',
-  install_dir: plugin_dir
-)
diff --git a/src/plugins/skipto/skipto.gresource.xml b/src/plugins/skipto/skipto.gresource.xml
new file mode 100644
index 000000000..ee5f3df86
--- /dev/null
+++ b/src/plugins/skipto/skipto.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/totem/plugins/skipto">
+    <file compressed="true">skipto.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/skipto/totem-skipto.c b/src/plugins/skipto/totem-skipto.c
index f21b199f3..791df6a30 100644
--- a/src/plugins/skipto/totem-skipto.c
+++ b/src/plugins/skipto/totem-skipto.c
@@ -184,14 +184,7 @@ totem_skipto_new (TotemObject *totem)
        skipto->priv->class_ref = g_type_class_ref (TOTEM_TYPE_TIME_ENTRY);
 
        skipto->priv->totem = totem;
-       skipto->priv->xml = totem_plugin_load_interface ("skipto",
-                                                        "skipto.ui", TRUE,
-                                                        NULL, skipto);
-
-       if (skipto->priv->xml == NULL) {
-               g_object_unref (skipto);
-               return NULL;
-       }
+       skipto->priv->xml = gtk_builder_new_from_resource ("/org/gnome/totem/plugins/skipto/skipto.ui");
 
        skipto->priv->adj = GTK_ADJUSTMENT (WID("tstw_skip_adjustment"));
        g_signal_connect (skipto->priv->adj, "value-changed",