diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2022-10-04 13:08:44 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-10-04 14:45:48 +0200 |
commit | af2902c8c2053609153187a83b2e20f0a29e8f4b (patch) | |
tree | 358232f2ca242d630c918eba98198eca6c83eec4 | |
parent | 2724ffa34527f68fcdd37bc64254c05a3af43ef0 (diff) | |
download | network-manager-applet-eap-schema.tar.gz |
gschema: bring back org.gnome.nm-applet schemaeap-schema
In commit 6b1aaade74cf ('gschema: move "org.gnome.nm-applet.gschema.xml"
from network-manager-applet to libnma'), both "org.gnome.nm-applet" and
"org.gnome.nm-applet.eap" have been moved over to libnma, whereas only
the latter should have been.
Bring it back.
See-also: https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/42
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | meson.build | 12 | ||||
-rw-r--r-- | org.gnome.nm-applet.gschema.xml.in | 40 | ||||
-rw-r--r-- | po/POTFILES.in | 1 |
6 files changed, 59 insertions, 2 deletions
@@ -87,6 +87,8 @@ 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 @@ -153,7 +155,5 @@ libnma.types # 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 src/wireless-security/ws-resources.c src/wireless-security/ws-resources.h diff --git a/Makefile.am b/Makefile.am index 9ce11178..95bfa7d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -616,6 +616,9 @@ 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 c8968c00..e9fa60cb 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ 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 babc6de2..9d4741a9 100644 --- a/meson.build +++ b/meson.build @@ -289,6 +289,18 @@ 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 new file mode 100644 index 00000000..09631a70 --- /dev/null +++ b/org.gnome.nm-applet.gschema.xml.in @@ -0,0 +1,40 @@ +<?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> +</schemalist> diff --git a/po/POTFILES.in b/po/POTFILES.in index a5521ae0..5937dd9c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,7 @@ 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 |