gschema: move "org.gnome.nm-applet.gschema.xml" from network-manager-applet to libnma

The schema is also used by libnma's "src/nma-ws/nma-eap.c" (formerly
"src/wireless-security/eap-method.c") and g-c-c's
"panels/network/wireless-security/eap-method.c".

That means, despite the name of the schema, it really belongs to libnma.

Move it to libnma ([1]).

[1] https://gitlab.gnome.org/GNOME/libnma/-/commit/50cda26ae4beab31f30fb93fd36a7bcc5435adc1

See-also: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/881
See-also: https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/11

6 files changed, 8 insertions, 71 deletions

diff --git a/.gitignore b/.gitignore
index 6aff0319..ba1fd215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,8 +87,6 @@ test-*.log
 nm-applet.conf
 nm-applet.desktop
 nm-connection-editor.desktop
-org.gnome.nm-applet.gschema.xml
-org.gnome.nm-applet.gschema.valid
 org.gnome.nm-connection-editor.appdata.xml
 src/connection-editor/nm-connection-editor
 src/connection-editor/nm-connection-editor-service-glue.h
@@ -150,3 +148,11 @@ libnma.interfaces
 libnma.prerequisites
 libnma.signals
 libnma.types
+
+
+# The following names are no longer present on this branch,
+# but they were on older versions. Thus keep ignoring them
+# otherwise when switching branches these untracked files show
+# up.
+/org.gnome.nm-applet.gschema.xml
+/org.gnome.nm-applet.gschema.valid
diff --git a/Makefile.am b/Makefile.am
index 8da267b7..495594e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -621,9 +621,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 nm-connection-editor.desktop: nm-connection-editor.desktop.in
 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
-@GSETTINGS_RULES@
-
 appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = nm-connection-editor.appdata.xml.in
diff --git a/configure.ac b/configure.ac
index 1995f4a3..79f76ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,6 @@ AC_CONFIG_FILES([
 Makefile
 man/nm-applet.1
 man/nm-connection-editor.1
-org.gnome.nm-applet.gschema.xml
 po/Makefile.in
 ])
 AC_OUTPUT
diff --git a/meson.build b/meson.build
index fc3eacdc..f77c297c 100644
--- a/meson.build
+++ b/meson.build
@@ -289,18 +289,6 @@ if appstream_util.found()
   )
 endif
 
-schema_conf = configuration_data()
-schema_conf.set('GETTEXT_PACKAGE', nma_name)
-
-schema = '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
-)
-
 install_data(
   'nm-applet.convert',
   install_dir: join_paths(nma_datadir, 'GConf', 'gsettings')
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
deleted file mode 100644
index 9e2887ea..00000000
--- a/org.gnome.nm-applet.gschema.xml.in
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema id="org.gnome.nm-applet" path="/org/gnome/nm-applet/" gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="disable-connected-notifications" type="b">
-      <default>false</default>
-      <summary>Disable connected notifications</summary>
-      <description>Set this to true to disable notifications when connecting to a network.</description>
-    </key>
-    <key name="disable-disconnected-notifications" type="b">
-      <default>false</default>
-      <summary>Disable disconnected notifications</summary>
-      <description>Set this to true to disable notifications when disconnecting from a network.</description>
-    </key>
-    <key name="disable-vpn-notifications" type="b">
-      <default>false</default>
-      <summary>Disable VPN notifications</summary>
-      <description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</description>
-    </key>
-    <key name="suppress-wireless-networks-available" type="b">
-      <default>false</default>
-      <summary>Suppress networks available notifications</summary>
-      <description>Set this to true to disable notifications when Wi-Fi networks are available.</description>
-    </key>
-    <key name="stamp" type="i">
-      <default>0</default>
-      <summary>Stamp</summary>
-      <description>Used to determine whether settings should be migrated to a new version.</description>
-    </key>
-    <key name="disable-wifi-create" type="b">
-      <default>false</default>
-      <summary>Disable WiFi Create</summary>
-      <description>Set to true to disable creation of adhoc networks when using the applet.</description>
-    </key>
-    <key name="show-applet" type="b">
-      <default>true</default>
-      <summary>Show the applet in notification area</summary>
-      <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 201867a4..2b673632 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 nm-applet.desktop.in
 nm-connection-editor.appdata.xml.in
 nm-connection-editor.desktop.in
-org.gnome.nm-applet.gschema.xml.in
 shared/nm-utils/nm-shared-utils.c
 src/8021x.ui
 src/ap-menu-item.c