[libnma/eap-schema] gschema: split org.gnome.nm-applet.eap off

[Lubomir Rintel <lkundrak src gnome org>]

commit 574ab844ea1249e26b680b1c43455e185af21bc9
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Oct 4 13:04:44 2022 +0200

    gschema: split org.gnome.nm-applet.eap off
    
    In commit 50cda26ae4be ('gschema: move "org.gnome.nm-applet.gschema.xml"
    from network-manager-applet to libnma'), this schema was moved over from
    nm-applet even though all we need is "org.gnome.nm-applet.eap".
    
    That's rather unfortunate, because it's sort of difficult to undo
    without breaking some versions of nm-connection-editor.
    
    Let's split off the part we need (org.gnome.nm-applet.eap), but keep the
    other half (org.gnome.nm-applet) in place for now, until we give
    nm-applet users a chance to upgrade to a version that has has it.
    
    Packagers can just choose to remove the file (e.g. %ignore in RPM) and
    ensure their nm-applet is new enough.

 .gitignore                             |  2 ++
 Makefile.am                            |  6 +++++-
 configure.ac                           |  1 +
 meson.build                            | 20 +++++++++++++-------
 org.gnome.nm-applet.eap.gschema.xml.in | 15 +++++++++++++++
 org.gnome.nm-applet.gschema.xml.in     | 12 ------------
 po/POTFILES.in                         |  2 +-
 7 files changed, 37 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 524c85ec..00ad5a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ autom4te.cache
 intltool-*
 /org.gnome.nm-applet.gschema.xml
 /org.gnome.nm-applet.gschema.valid
+/org.gnome.nm-applet.eap.gschema.xml
+/org.gnome.nm-applet.eap.gschema.valid
 
 po/boldquot.sed
 po/en@boldquot.header
diff --git a/Makefile.am b/Makefile.am
index ceb42230..bc3df6ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -797,7 +797,11 @@ MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)"
 
 ###############################################################################
 
-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
+# org.gnome.nm-applet.gschema.xml belongs to nm-applet.
+# Kept here for now to avoid breaking on upgrades.
+gsettings_SCHEMAS = \
+       org.gnome.nm-applet.gschema.xml \
+       org.gnome.nm-applet.eap.gschema.xml
 @GSETTINGS_RULES@
 
 check_PROGRAMS += $(check_programs)
diff --git a/configure.ac b/configure.ac
index 90891477..74fcba51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,6 +291,7 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
 AC_CONFIG_FILES([
 Makefile
 org.gnome.nm-applet.gschema.xml
+org.gnome.nm-applet.eap.gschema.xml
 po/Makefile.in
 src/libnma-gtk4.pc
 src/libnma.pc
diff --git a/meson.build b/meson.build
index 8114f4e7..595692cf 100644
--- a/meson.build
+++ b/meson.build
@@ -389,14 +389,20 @@ endif
 schema_conf = configuration_data()
 schema_conf.set('GETTEXT_PACKAGE', 'libnma')
 
-schema = 'org.gnome.nm-applet.gschema.xml'
+foreach schema : [
+  'org.gnome.nm-applet.eap.gschema.xml',
 
-configure_file(
-  input: schema + '.in',
-  output: schema,
-  install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
-  configuration: schema_conf,
-)
+  # This one belongs to nm-applet.
+  # Kept here for now to avoid breaking on upgrades.
+  'org.gnome.nm-applet.gschema.xml'
+]
+  configure_file(
+    input: schema + '.in',
+    output: schema,
+    install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
+    configuration: schema_conf,
+  )
+endforeach
 
 config = 'config.h'
 
diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in
new file mode 100644
index 00000000..0fc3ca9f
--- /dev/null
+++ b/org.gnome.nm-applet.eap.gschema.xml.in
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="org.gnome.nm-applet.eap" path="/org/gnome/nm-applet/eap/" gettext-domain="nm-applet">
+    <key name="ignore-ca-cert" type="b">
+      <default>false</default>
+      <summary>Ignore CA certificate</summary>
+      <description>Set this to true to disable warnings about CA certificates in EAP 
authentication.</description>
+    </key>
+    <key name="ignore-phase2-ca-cert" type="b">
+      <default>false</default>
+      <summary>Ignore CA certificate</summary>
+      <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP 
authentication.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 9e2887ea..09631a70 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -37,16 +37,4 @@
       <description>Set to FALSE to disable displaying the applet in the notification area.</description>
     </key>
   </schema>
-  <schema id="org.gnome.nm-applet.eap">
-    <key name="ignore-ca-cert" type="b">
-      <default>false</default>
-      <summary>Ignore CA certificate</summary>
-      <description>Set this to true to disable warnings about CA certificates in EAP 
authentication.</description>
-    </key>
-    <key name="ignore-phase2-ca-cert" type="b">
-      <default>false</default>
-      <summary>Ignore CA certificate</summary>
-      <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP 
authentication.</description>
-    </key>
-  </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 08e4f1f2..f76f5568 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-org.gnome.nm-applet.gschema.xml.in
+org.gnome.nm-applet.eap.gschema.xml.in
 shared/nm-utils/nm-shared-utils.c
 src/nma-bar-code-widget.c
 src/nma-bar-code-widget.ui