summaryrefslogtreecommitdiff
path: root/schema
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-10-06 12:51:08 +0200
committerStef Walter <stefw@collabora.co.uk>2011-10-06 13:22:43 +0200
commitf28d3d768f0e4057f727e8c3b93ba50c19f5db24 (patch)
tree288ef581590dfccbfddcad3c87d98ce3a4ed0a97 /schema
parent626eef363c0ece57713c5be5939677784e8115cc (diff)
Split Gcr and Gck libraries out of gnome-keyring
Diffstat (limited to 'schema')
-rw-r--r--schema/Makefile.am7
-rw-r--r--schema/org.gnome.crypto.pgp.convert6
-rw-r--r--schema/org.gnome.crypto.pgp.gschema.xml34
-rw-r--r--schema/org.gnome.crypto.pgp_keyservers.convert2
4 files changed, 2 insertions, 47 deletions
diff --git a/schema/Makefile.am b/schema/Makefile.am
index ad0f15a3..b0f2eefe 100644
--- a/schema/Makefile.am
+++ b/schema/Makefile.am
@@ -1,14 +1,11 @@
gsettings_SCHEMAS = \
- org.gnome.crypto.cache.gschema.xml \
- org.gnome.crypto.pgp.gschema.xml
+ org.gnome.crypto.cache.gschema.xml
@GSETTINGS_RULES@
convert_DATA = \
- org.gnome.crypto.cache.convert \
- org.gnome.crypto.pgp.convert \
- org.gnome.crypto.pgp_keyservers.convert
+ org.gnome.crypto.cache.convert
convertdir = \
$(datarootdir)/GConf/gsettings
diff --git a/schema/org.gnome.crypto.pgp.convert b/schema/org.gnome.crypto.pgp.convert
deleted file mode 100644
index 86387d54..00000000
--- a/schema/org.gnome.crypto.pgp.convert
+++ /dev/null
@@ -1,6 +0,0 @@
-[org.gnome.crypto.pgp]
-default-key = /desktop/pgp/default_key
-ascii-armor = /desktop/pgp/ascii_armor
-sort-recipients-by = /desktop/pgp/recipients/sort_by
-encrypt-to-self = /desktop/pgp/encrypt_to_self
-last-signer = /desktop/pgp/last_signer_openpgp
diff --git a/schema/org.gnome.crypto.pgp.gschema.xml b/schema/org.gnome.crypto.pgp.gschema.xml
deleted file mode 100644
index 08c9d400..00000000
--- a/schema/org.gnome.crypto.pgp.gschema.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<schemalist>
- <schema id="org.gnome.crypto.pgp" path="/desktop/gnome/crypto/pgp/">
- <key name="default-key" type="s">
- <default>''</default>
- <summary>Default PGP Key</summary>
- <description>This specifies the ID of the default PGP key to use for certain operations, mainly signing.</description>
- </key>
- <key name="ascii-armor" type="b">
- <default>true</default>
- <summary>ASCII Armor</summary>
- <description>When encrypting or signing PGP files whether to use ASCII armor encoding.</description>
- </key>
- <key name="sort-recipients-by" type="s">
- <default>'name'</default>
- <summary>The column to sort the recipients</summary>
- <description>Specify the column to sort the recipients window by. Columns are: 'name' and 'id'. Put a '-' in front of the column name to sort in descending order.</description>
- </key>
- <key name="encrypt-to-self" type="b">
- <default>true</default>
- <summary>Whether to always encrypt to default key</summary>
- <description>If set to true, then the default key will always be added to an encryption recipients list.</description>
- </key>
- <key name="last-signer" type="s">
- <default>''</default>
- <summary>Last key used to sign a message.</summary>
- <description>The ID of the last secret key used to sign a message.</description>
- </key>
- <key name="keyservers" type="as">
- <default>['hkp://pool.sks-keyservers.net', 'ldap://keyserver.pgp.com']</default>
- <summary>PGP key servers</summary>
- <description>A list of key server URIs to search for remote PGP keys. A display name can be included, by appending a space and then the name.</description>
- </key>
- </schema>
-</schemalist>
diff --git a/schema/org.gnome.crypto.pgp_keyservers.convert b/schema/org.gnome.crypto.pgp_keyservers.convert
deleted file mode 100644
index 24bbbdda..00000000
--- a/schema/org.gnome.crypto.pgp_keyservers.convert
+++ /dev/null
@@ -1,2 +0,0 @@
-[org.gnome.crypto.pgp]
-keyservers = /desktop/pgp/keyservers/all_keyservers