Merge tag 'upstream/3.8.0'

Upstream version 3.8.0

# gpg: Signature made So 31 Mär 2013 16:25:02 CEST
# gpg:                using DSA key 0x9FCF2CCD3F3E6426
# gpg: please do a --check-trustdb
# gpg: Good signature from "Guido Günther <agx@sigxcpu.org>"
# gpg:                 aka "Guido Guenther <agx@debian.org>"
# gpg:                 aka "Guido Guenther <agx@sigxcpu.org>"

1 files changed, 70 insertions, 0 deletions

diff --git a/src/org.gnome.KrbAuthDialog.gschema.xml b/src/org.gnome.KrbAuthDialog.gschema.xml
new file mode 100644
index 0000000..4764744
--- /dev/null
+++ b/src/org.gnome.KrbAuthDialog.gschema.xml
@@ -0,0 +1,70 @@
+<schemalist>
+  <schema id="org.gnome.KrbAuthDialog" path="/apps/krb5-auth-dialog/">
+    <key name="principal" type="s">
+      <default>''</default>
+      <summary>Kerberos principal</summary>
+      <description>The Kerberos principal to acquire the ticket for</description>
+    </key>
+    <key name="pk-userid" type="s">
+      <default>''</default>
+      <summary>PKINIT identifier</summary>
+      <description>The principal's public/private/certificate identifier when using PKINIT</description>
+    </key>
+    <key name="pk-anchors" type="s">
+      <default>''</default>
+      <summary>PKINIT trust anchors</summary>
+      <description>PKINIT CA certificates</description>
+    </key>
+    <key name="prompt-minutes" type="i">
+      <default>30</default>
+      <summary>Prompt minutes before expiry</summary>
+      <description>Start prompting/displaying notifications that many minutes before expiry</description>
+    </key>
+    <key name="forwardable" type="b">
+      <default>false</default>
+      <summary>Forwardable ticket</summary>
+      <description>Requested tickets should be forwardable</description>
+    </key>
+    <key name="renewable" type="b">
+      <default>false</default>
+      <summary>Renewable ticket</summary>
+      <description>Requested tickets should be renewable</description>
+    </key>
+    <key name="proxiable" type="b">
+      <default>false</default>
+      <summary>Proxiable ticket</summary>
+      <description>Requested tickets should be proxiable</description>
+    </key>
+    <key name="conf-tickets" type="b">
+      <default>false</default>
+      <summary>Configuration tickets</summary>
+      <description>Show configuration tickets</description>
+    </key>
+    <child name="notify" schema="org.gnome.KrbAuthDialog.notify"/>
+    <child name="plugins" schema="org.gnome.KrbAuthDialog.plugins"/>
+  </schema>
+  <schema id="org.gnome.KrbAuthDialog.notify" path="/apps/krb5-auth-dialog/notify/">
+    <key name="valid" type="b">
+      <default>true</default>
+      <summary>valid ticket notification</summary>
+      <description>Notify user when ticket becomes valid</description>
+    </key>
+    <key name="expiring" type="b">
+      <default>true</default>
+      <summary>ticket expiring notification</summary>
+      <description>Notify user when ticket is about to expire</description>
+    </key>
+    <key name="expired" type="b">
+      <default>true</default>
+      <summary>ticket expired notification</summary>
+      <description>Notify user when ticket has expired</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.KrbAuthDialog.plugins" path="/apps/krb5-auth-dialog/plugins/">
+    <key name="enabled" type="as">
+      <default>[]</default>
+      <summary>Enabled plugins</summary>
+      <description>List of plugins that should be loaded and activated on startup.</description>
+    </key>
+  </schema>
+</schemalist>