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

[Thomas Haller <thaller src gnome org>]

commit 6b1aaade74cf9d2cc5f02433cf34525b279011de
Author: Thomas Haller <thaller redhat com>
Date:   Thu Mar 5 11:00:59 2020 +0100

    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

 .gitignore                         | 10 ++++++--
 Makefile.am                        |  3 ---
 configure.ac                       |  1 -
 meson.build                        | 12 ---------
 org.gnome.nm-applet.gschema.xml.in | 52 --------------------------------------
 po/POTFILES.in                     |  1 -
 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/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