[gedit/zbrown/deteplification-src: 78/633] plugins' gschemas: simplify setting the gettext-domain

[Zander Brown <zbrown src gnome org>]

commit 21e773f6f118d70144295b8d8dfb92e673cfc256
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Dec 5 10:37:16 2019 +0100

    plugins' gschemas: simplify setting the gettext-domain
    
    There are plenty of org.gnome.gedit or /org/gnome/gedit/, so hard-coding
    the gettext-domain to "gedit" is fine IMHO.

 data/meson.build                                             |  1 -
 plugins/checkupdate/meson.build                              | 11 +++--------
 ...ml.in => org.gnome.gedit.plugins.checkupdate.gschema.xml} |  4 ++--
 plugins/externaltools/meson.build                            | 12 ++++--------
 ....in => org.gnome.gedit.plugins.externaltools.gschema.xml} |  4 ++--
 plugins/filebrowser/meson.build                              | 12 ++++--------
 ...ml.in => org.gnome.gedit.plugins.filebrowser.gschema.xml} |  4 ++--
 plugins/pythonconsole/meson.build                            | 12 ++++--------
 ....in => org.gnome.gedit.plugins.pythonconsole.gschema.xml} |  4 ++--
 plugins/spell/meson.build                                    | 12 ++++--------
 ...hema.xml.in => org.gnome.gedit.plugins.spell.gschema.xml} |  4 ++--
 plugins/time/meson.build                                     | 12 ++++--------
 ...chema.xml.in => org.gnome.gedit.plugins.time.gschema.xml} |  4 ++--
 13 files changed, 35 insertions(+), 61 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index f9faecbf4..ef6907bcb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -55,7 +55,6 @@ foreach plugin_name:active_plugins
 endforeach
 
 gschema_in = configuration_data()
-gschema_in.set('GETTEXT_PACKAGE', meson.project_name())
 gschema_in.set('ACTIVE_PLUGINS', ', '.join(quoted_plugins))
 
 gschema_file = configure_file(
diff --git a/plugins/checkupdate/meson.build b/plugins/checkupdate/meson.build
index 250112fc3..79c3b70a9 100644
--- a/plugins/checkupdate/meson.build
+++ b/plugins/checkupdate/meson.build
@@ -25,14 +25,9 @@ libcheckupdate_sha = shared_module(
   name_suffix: module_suffix,
 )
 
-configure_file(
-  input: 'org.gnome.gedit.plugins.checkupdate.gschema.xml.in',
-  output: 'org.gnome.gedit.plugins.checkupdate.gschema.xml',
-  configuration: gschema_xml,
-  install_dir: join_paths(
-    glibdir,
-    'schemas',
-  )
+install_data(
+  'org.gnome.gedit.plugins.checkupdate.gschema.xml',
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 custom_target(
diff --git a/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in 
b/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml
similarity index 67%
rename from plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
rename to plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml
index 594a01b35..b8efb9533 100644
--- a/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
+++ b/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml
@@ -1,5 +1,5 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.checkupdate" 
path="/org/gnome/gedit/plugins/checkupdate/">
+<schemalist gettext-domain="gedit">
+  <schema id="org.gnome.gedit.plugins.checkupdate" path="/org/gnome/gedit/plugins/checkupdate/">
     <key name="ignore-version" type="s">
       <default>''</default>
       <summary>Version to Ignore</summary>
diff --git a/plugins/externaltools/meson.build b/plugins/externaltools/meson.build
index 9718b9188..d46d0ddad 100644
--- a/plugins/externaltools/meson.build
+++ b/plugins/externaltools/meson.build
@@ -2,14 +2,10 @@ subdir('scripts')
 subdir('tools')
 subdir('data')
 
-externaltools_gschema_file = configure_file(
-  input: 'org.gnome.gedit.plugins.externaltools.gschema.xml.in',
-  output: 'org.gnome.gedit.plugins.externaltools.gschema.xml',
-  configuration: gschema_in,
-  install_dir: join_paths(
-    glibdir,
-    'schemas',
-  )
+externaltools_gschema_file = files('org.gnome.gedit.plugins.externaltools.gschema.xml')
+install_data(
+  externaltools_gschema_file,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 if xmllint.found()
diff --git a/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in 
b/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml
similarity index 80%
rename from plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
rename to plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml
index 79152389a..d760de2f6 100644
--- a/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
+++ b/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml
@@ -1,5 +1,5 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.externaltools" 
path="/org/gnome/gedit/plugins/externaltools/">
+<schemalist gettext-domain="gedit">
+  <schema id="org.gnome.gedit.plugins.externaltools" path="/org/gnome/gedit/plugins/externaltools/">
     <key name="use-system-font" type="b">
       <default>true</default>
       <summary>Whether to use the system font</summary>
diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
index da60e76ac..99d0570ad 100644
--- a/plugins/filebrowser/meson.build
+++ b/plugins/filebrowser/meson.build
@@ -101,14 +101,10 @@ custom_target(
   )
 )
 
-filebrowser_gschema_file = configure_file(
-  input: 'org.gnome.gedit.plugins.filebrowser.gschema.xml.in',
-  output: 'org.gnome.gedit.plugins.filebrowser.gschema.xml',
-  configuration: gschema_in,
-  install_dir: join_paths(
-    glibdir,
-    'schemas',
-  )
+filebrowser_gschema_file = files('org.gnome.gedit.plugins.filebrowser.gschema.xml')
+install_data(
+  filebrowser_gschema_file,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 if xmllint.found()
diff --git a/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in 
b/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml
similarity index 95%
rename from plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
rename to plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml
index 1213d0413..9e9d85627 100644
--- a/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
+++ b/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml
@@ -1,5 +1,5 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.filebrowser" 
path="/org/gnome/gedit/plugins/filebrowser/">
+<schemalist gettext-domain="gedit">
+  <schema id="org.gnome.gedit.plugins.filebrowser" path="/org/gnome/gedit/plugins/filebrowser/">
     <key name="tree-view" type="b">
       <default>true</default>
       <summary>Open With Tree View</summary>
diff --git a/plugins/pythonconsole/meson.build b/plugins/pythonconsole/meson.build
index 786167537..1aecada27 100644
--- a/plugins/pythonconsole/meson.build
+++ b/plugins/pythonconsole/meson.build
@@ -1,13 +1,9 @@
 subdir('pythonconsole')
 
-pythonconsole_gschema_file = configure_file(
-  input: 'org.gnome.gedit.plugins.pythonconsole.gschema.xml.in',
-  output: 'org.gnome.gedit.plugins.pythonconsole.gschema.xml',
-  configuration: gschema_in,
-  install_dir: join_paths(
-    glibdir,
-    'schemas',
-  )
+pythonconsole_gschema_file = files('org.gnome.gedit.plugins.pythonconsole.gschema.xml')
+install_data(
+  pythonconsole_gschema_file,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 if xmllint.found()
diff --git a/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in 
b/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml
similarity index 86%
rename from plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
rename to plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml
index 526ad895e..0a29031c4 100644
--- a/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
+++ b/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml
@@ -1,5 +1,5 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.pythonconsole" 
path="/org/gnome/gedit/plugins/pythonconsole/">
+<schemalist gettext-domain="gedit">
+  <schema id="org.gnome.gedit.plugins.pythonconsole" path="/org/gnome/gedit/plugins/pythonconsole/">
     <key name="command-color" type="s">
       <default>'#314e6c'</default>
       <summary>Command Color Text</summary>
diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
index a39f80e5c..177ce0ec8 100644
--- a/plugins/spell/meson.build
+++ b/plugins/spell/meson.build
@@ -28,14 +28,10 @@ libspell_sha = shared_module(
   name_suffix: module_suffix,
 )
 
-spell_gschema_file = configure_file(
-  input: 'org.gnome.gedit.plugins.spell.gschema.xml.in',
-  output: 'org.gnome.gedit.plugins.spell.gschema.xml',
-  configuration: gschema_in,
-  install_dir: join_paths(
-    glibdir,
-    'schemas',
-  )
+spell_gschema_file = files('org.gnome.gedit.plugins.spell.gschema.xml')
+install_data(
+  spell_gschema_file,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 if xmllint.found()
diff --git a/plugins/spell/org.gnome.gedit.plugins.spell.gschema.xml.in 
b/plugins/spell/org.gnome.gedit.plugins.spell.gschema.xml
similarity index 65%
rename from plugins/spell/org.gnome.gedit.plugins.spell.gschema.xml.in
rename to plugins/spell/org.gnome.gedit.plugins.spell.gschema.xml
index 3d740b659..c1dd1869e 100644
--- a/plugins/spell/org.gnome.gedit.plugins.spell.gschema.xml.in
+++ b/plugins/spell/org.gnome.gedit.plugins.spell.gschema.xml
@@ -1,5 +1,5 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.spell" 
path="/org/gnome/gedit/plugins/spell/">
+<schemalist gettext-domain="gedit">
+  <schema id="org.gnome.gedit.plugins.spell" path="/org/gnome/gedit/plugins/spell/">
     <key name="highlight-misspelled" type="b">
       <default>false</default>
       <summary>Highlight misspelled words</summary>
diff --git a/plugins/time/meson.build b/plugins/time/meson.build
index ea867601c..2eb70499f 100644
--- a/plugins/time/meson.build
+++ b/plugins/time/meson.build
@@ -42,14 +42,10 @@ libtime_sha = shared_module(
   name_suffix: module_suffix,
 )
 
-time_gschema_file = configure_file(
-  input: 'org.gnome.gedit.plugins.time.gschema.xml.in',
-  output: 'org.gnome.gedit.plugins.time.gschema.xml',
-  configuration: gschema_in,
-  install_dir: join_paths(
-    glibdir,
-    'schemas',
-  )
+time_gschema_file = files('org.gnome.gedit.plugins.time.gschema.xml')
+install_data(
+  time_gschema_file,
+  install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 if xmllint.found()
diff --git a/plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in 
b/plugins/time/org.gnome.gedit.plugins.time.gschema.xml
similarity index 85%
rename from plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
rename to plugins/time/org.gnome.gedit.plugins.time.gschema.xml
index b825b4704..d0121918b 100644
--- a/plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
+++ b/plugins/time/org.gnome.gedit.plugins.time.gschema.xml
@@ -1,5 +1,5 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.time" 
path="/org/gnome/gedit/plugins/time/">
+<schemalist gettext-domain="gedit">
+  <schema id="org.gnome.gedit.plugins.time" path="/org/gnome/gedit/plugins/time/">
     <key name="prompt-type" enum="org.gnome.gedit.plugins.time.GeditTimePluginPromptType">
       <default>'prompt-selected-format'</default>
       <summary>Prompt Type</summary>