From 5efdc804e452ab547cc2a1d04c8d7173a2c9b6d5 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@gnome-db.org>
Date: Fri, 14 Oct 2011 13:46:33 +0200
Subject: Make e_utils_prompt_user and callers use GSettings keys

---
 data/evolution.convert                       |  4 +++-
 data/org.gnome.evolution.mail.gschema.xml.in | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/evolution.convert b/data/evolution.convert
index 4d9377de6f..44fb9a8787 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -80,7 +80,6 @@ address-count = /apps/evolution/mail/display/address_count
 animate-images = /apps/evolution/mail/display/animate_images
 caret-mode = /apps/evolution/mail/display/caret_mode
 charset = /apps/evolution/mail/display/charset
-check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
 citation-colour = /apps/evolution/mail/display/citation_colour
 composer-charset = /apps/evolution/mail/composer/charset
 composer-current-folder = /apps/evolution/mail/composer/current_folder
@@ -147,9 +146,12 @@ monospace-font = /apps/evolution/mail/display/fonts/monospace
 no-folder-dots = /apps/evolution/mail/display/no_folder_dots
 paned-size = /apps/evolution/mail/display/paned_size
 photo-local = /apps/evolution/mail/display/photo_local
+prompt-check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
 prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder
 prompt-on-empty-subject = /apps/evolution/mail/prompts/empty_subject
+prompt-on-empty-trash = /apps/evolution/mail/prompts/empty_trash
 prompt-on-expunge = /apps/evolution/mail/prompts/expunge
+prompt-on-invalid-recip = /apps/evolution/mail/prompts/send_invalid_recip
 prompt-on-list-reply-to = /apps/evolution/mail/prompts/list_reply_to
 prompt-on-mark-all-read = /apps/evolution/mail/prompts/mark_all_read
 prompt-on-only-bcc = /apps/evolution/mail/prompts/only_bcc
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index c52c76c170..649dca1ed8 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -1,6 +1,6 @@
 <schemalist>
   <schema gettext-domain="evolution" id="org.gnome.evolution.mail" path="/org/gnome/evolution/mail/">
-    <key name="check-if-default-mailer" type="b">
+    <key name="prompt-check-if-default-mailer" type="b">
       <default>true</default>
       <_summary>Check whether Evolution is the default mailer</_summary>
       <_description>Every time Evolution starts, check whether or not it is the default mailer.</_description>
@@ -360,11 +360,21 @@
       <_summary>Prompt on empty subject</_summary>
       <_description>Prompt the user when he or she tries to send a message without a Subject.</_description>
     </key>
+    <key name="prompt-on-empty-trash" type="b">
+      <default>true</default>
+      <_summary>Prompt when emptying the trash</_summary>
+      <_description>Prompt the user when he or she tries to empty the trash.</_description>
+    </key>
     <key name="prompt-on-expunge" type="b">
       <default>true</default>
       <_summary>Prompt when user expunges</_summary>
       <_description>Prompt the user when he or she tries to expunge a folder.</_description>
     </key>
+    <key name="prompt-on-invalid-recip" type="b">
+      <default>true</default>
+      <_summary>Prompt before sending to recipients not entered as mail addresses</_summary>
+      <_description>It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses</_description>
+    </key>
     <key name="prompt-on-only-bcc" type="b">
       <default>true</default>
       <_summary>Prompt when user only fills Bcc</_summary>
-- 
cgit v1.2.3