[evolution-kolab/ek-wip-porting: 5/5] CamelKolabIMAPXProvider: pulled in upstream changes

[Christian Hilberg <chilberg src gnome org>]

commit 58a4c468f1894dd3c845c85e5e72a65580819291
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Feb 7 19:47:40 2012 +0100

    CamelKolabIMAPXProvider: pulled in upstream changes
    
    * pulled in upstream CamelIMAPXProvider changes
      (configuration options for filter application)

 src/camel/camel-kolab-imapx-provider.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-provider.c b/src/camel/camel-kolab-imapx-provider.c
index 6f93fb1..5c0ef50 100644
--- a/src/camel/camel-kolab-imapx-provider.c
+++ b/src/camel/camel-kolab-imapx-provider.c
@@ -77,8 +77,10 @@ CamelProviderConfEntry kolab_conf_entries[] = {
 	  N_("_Show only subscribed folders"), "1" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter-inbox", NULL,
-	  N_("_Apply filters to new messages in Inbox on this server"), "0" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter-all", NULL,
+	  N_("Apply _filters to new messages in all folders"), "0" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter-inbox", "!filter-all",
+	  N_("_Apply filters to new messages in Inbox on this server"), "1" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter-junk", NULL,
 	  N_("Check new messages for Jun_k contents"), "0" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter-junk-inbox", "filter-junk",