152 lines
5.6 KiB
Diff
152 lines
5.6 KiB
Diff
From 446e1936f5798ba38683fe910469ad995abfdfa8 Mon Sep 17 00:00:00 2001
|
|
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
Date: Mon, 18 May 2020 17:04:37 +0200
|
|
Subject: [PATCH] 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
|
|
(cherry-picked from commit 6b1aaade74cf9d2cc5f02433cf34525b279011de)
|
|
---
|
|
Makefile.am | 3 --
|
|
configure.ac | 1 -
|
|
meson.build | 13 --------
|
|
org.gnome.nm-applet.gschema.xml.in | 52 ------------------------------
|
|
po/POTFILES.in | 1 -
|
|
5 files changed, 70 deletions(-)
|
|
delete mode 100644 org.gnome.nm-applet.gschema.xml.in
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index c863e8d4..09d258af 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1128,9 +1128,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 5f6a24c0..2144415d 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -339,7 +339,6 @@ src/libnma/libnma.pc
|
|
po/Makefile.in
|
|
man/nm-applet.1
|
|
man/nm-connection-editor.1
|
|
-org.gnome.nm-applet.gschema.xml
|
|
src/libnma/nma-version.h
|
|
])
|
|
AC_OUTPUT
|
|
diff --git a/meson.build b/meson.build
|
|
index cf5d02f7..7f7ad12e 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -419,19 +419,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: true,
|
|
- 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 4f8c16af..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>true</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 31cfdef8..7a7b546d 100644
|
|
--- a/po/POTFILES.in
|
|
+++ b/po/POTFILES.in
|
|
@@ -2,7 +2,6 @@
|
|
# Please keep this file sorted alphabetically.
|
|
nm-applet.desktop.in
|
|
nm-connection-editor.desktop.in
|
|
-org.gnome.nm-applet.gschema.xml.in
|
|
nm-connection-editor.appdata.xml.in
|
|
shared/nm-utils/nm-shared-utils.c
|
|
src/8021x.ui
|
|
--
|
|
2.25.3
|
|
|