[seahorse] Resources: only include in src, use auto-register.



commit 39c2d56153552d463a3913da4c0f736f59a07e4c
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Wed May 9 07:46:40 2018 +0200

    Resources: only include in src, use auto-register.

 data/meson.build        |    4 ----
 libseahorse/meson.build |    1 -
 src/main.vala           |    2 --
 src/meson.build         |    2 +-
 4 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index ea50166..ca88c02 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,10 +13,6 @@ install_data(gsettings_files,
 # Resources
 resources_src = gnome.compile_resources('seahorse-resources',
   'seahorse.gresource.xml',
-  c_name: 'seahorse',
-  extra_args: [
-    '--manual-register',
-  ]
 )
 
 # The appdata file
diff --git a/libseahorse/meson.build b/libseahorse/meson.build
index b1e8045..2b9205c 100644
--- a/libseahorse/meson.build
+++ b/libseahorse/meson.build
@@ -14,7 +14,6 @@ libseahorse_sources = [
   'seahorse-util.c',
   'seahorse-widget.c',
   marshaller,
-  resources_src,
 ]
 
 libseahorse_deps = [
diff --git a/src/main.vala b/src/main.vala
index 6746b2d..96d1f9f 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -24,8 +24,6 @@ public int main (string[] args) {
     Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
     Intl.textdomain(Config.GETTEXT_PACKAGE);
 
-    Seahorse.register_resource();
-
     Seahorse.Application app = new Seahorse.Application();
     int status = app.run(args);
 
diff --git a/src/meson.build b/src/meson.build
index e57f932..950c3c8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,7 +13,7 @@ seahorse_sources = [
   'search-provider.vala',
   'sidebar.vala',
 
-  # resources_src,
+  resources_src,
   search_provider_src,
 ]
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]