From 2c0ce47a992b68ccfe06d6b3da22da3aec07e872 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Thu, 24 Jan 2008 03:03:46 +0000
Subject: ** Fix for bug #510779

2008-01-24  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #510779

	* em-mailer-prefs.c: (jh_tree_refill), (jh_add_cb), (jh_remove_cb),
	(init_junk_tree), (custom_junk_button_toggled),
	(em_mailer_prefs_construct): Added UI for the new junk preferences.
	* em-mailer-prefs.h:
	* evolution-mail.schemas.in: Add schema for junk header and address
	lookup.
	* mail-config.c: (gconf_jh_check_changed),
	(gconf_lookup_book_changed), (gconf_jh_headers_changed),
	(mail_config_init), (mail_config_reload_junk_headers),
	(mail_config_get_lookup_book):
	* mail-config.glade:
	* mail-config.h:
	* mail-session.c: (class_init), (lookup_addressbook),
	(mail_session_init), (mail_session_set_junk_headers):
	* mail-session.h:

2008-01-22  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #405777

	* em-folder-view.c: (emfv_setup_view_instance),
	(emfv_setting_notify): Don't break abstraction. Call the right derived
	class.



svn path=/trunk/; revision=34873
---
 mail/evolution-mail.schemas.in | 43 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'mail/evolution-mail.schemas.in')

diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index ebe54e0e10..36a685b45b 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -969,7 +969,7 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-         <short>Level beyond which it should the message should be logged.</short>
+         <short>Level beyond which the message should be logged.</short>
          <long> This can have three possible values. 0 for errors. 1 for warnings. 
 	 	2 for debug messages.
          </long>
@@ -1098,6 +1098,47 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/junk/lookup_addressbook</key>
+      <applyto>/apps/evolution/mail/junk/lookup_addressbook</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Determines whether to lookup in addressbook for sender email</short>
+         <long>
+	 Determines whether to loopup the sender email in addressbook. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote addressbooks (like ldap) are marked for autocompletion.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/junk/check_custom_header</key>
+      <applyto>/apps/evolution/mail/junk/check_custom_header</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Determines whether to use custom headers to check for junk</short>
+         <long>
+          Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed.
+         </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/evolution/mail/junk/custom_header</key>
+      <applyto>/apps/evolution/mail/junk/custom_header</applyto>
+      <owner>evolution-mail</owner>
+       <type>list</type>
+      <list_type>string</list_type>
+      <default>[X-Spam-Flag=YES,X-Spam-Level=*****]</default>
+      <locale name="C">
+         <short>Specifies the header to check for junk.</short>
+         <long>
+	 Specifies the header to check for junk. The format is headername=value in gconf.
+         </long>
+      </locale>
+    </schema>
     <!-- Account settings -->
 
     <schema>
-- 
cgit