[libnma/th/add-nm-applet-gschema] gschema: move "org.gnome.nm-applet.gschema.xml" from network-manager-applet to libnma
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libnma/th/add-nm-applet-gschema] gschema: move "org.gnome.nm-applet.gschema.xml" from network-manager-applet to libnma
- Date: Thu, 5 Mar 2020 08:23:58 +0000 (UTC)
commit d4d524faed19b9d9c45082385135154f686de3b6
Author: Thomas Haller <thaller redhat com>
Date: Thu Mar 5 09:10:34 2020 +0100
gschema: move "org.gnome.nm-applet.gschema.xml" from network-manager-applet to libnma
The schema is also used by "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 scheme, it really belongs to libnma.
Add it.
https://gitlab.gnome.org/GNOME/gnome-control-center/issues/ ## 881
.gitignore | 2 ++
Makefile.am | 3 +++
configure.ac | 1 +
meson.build | 12 +++++++++
org.gnome.nm-applet.gschema.xml.in | 52 ++++++++++++++++++++++++++++++++++++++
po/POTFILES.in | 1 +
6 files changed, 71 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index 4369118b..31d871f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,8 @@ stamp-*
.libs
autom4te.cache
intltool-*
+/org.gnome.nm-applet.gschema.xml
+/org.gnome.nm-applet.gschema.valid
po/boldquot.sed
po/en@boldquot.header
diff --git a/Makefile.am b/Makefile.am
index d67fc76a..5baca0b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -779,6 +779,9 @@ MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)"
###############################################################################
+gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
+@GSETTINGS_RULES@
+
check_PROGRAMS += $(check_programs)
check-local: $(check_local)
diff --git a/configure.ac b/configure.ac
index 170f2cbd..5927601f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,6 +256,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
po/Makefile.in
src/libnma-gtk4.pc
src/libnma.pc
diff --git a/meson.build b/meson.build
index f673ecdd..b7417f19 100644
--- a/meson.build
+++ b/meson.build
@@ -360,6 +360,18 @@ if enable_gtk_doc
)
endif
+schema_conf = configuration_data()
+schema_conf.set('GETTEXT_PACKAGE', 'libnma')
+
+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,
+)
+
config = 'config.h'
configure_file(
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
new file mode 100644
index 00000000..9e2887ea
--- /dev/null
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -0,0 +1,52 @@
+<?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 5cd71cb8..2ed2ff93 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
+org.gnome.nm-applet.gschema.xml.in
shared/nm-utils/nm-shared-utils.c
src/nma-bar-code-widget.c
src/nma-bar-code-widget.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]