rpms/evolution-data-server/devel evolution-data-server-1.2.0-vcrap.patch, NONE, 1.1.4.1 evolution-data-server-1.5.91-check-only-active-folders.patch, NONE, 1.1.4.1 evolution-data-server.spec, 1.128, 1.128.2.1

Sat Sep 23 22:06:43 UTC 2006

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20530

Modified Files:
      Tag: private-e-d-s-sanity-1_8_0-9-branch
	evolution-data-server.spec 
Added Files:
      Tag: private-e-d-s-sanity-1_8_0-9-branch
	evolution-data-server-1.2.0-vcrap.patch 
	evolution-data-server-1.5.91-check-only-active-folders.patch 
Log Message:
usable build for FC6

evolution-data-server-1.2.0-vcrap.patch:
 camel-imap-provider.c |    6 +++++-
 camel-imap-store.c    |    5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE evolution-data-server-1.2.0-vcrap.patch ---
--- evolution-data-server-1.2.0/camel/providers/imap/camel-imap-provider.c~	2005-03-16 08:44:11.000000000 -0700
+++ evolution-data-server-1.2.0/camel/providers/imap/camel-imap-provider.c	2005-03-16 10:12:13.000000000 -0700
@@ -64,9 +64,13 @@ CamelProviderConfEntry imap_conf_entries
 	  N_("Namespace") },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "display_trash", NULL,
+	  N_("Display Trash folder"), "1" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "display_junk", NULL,
+	  N_("Display Junk folder"), "1" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,
 	  N_("_Apply filters to new messages in INBOX on this server"), "0" },
-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", NULL,
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", "display_junk",
 	  N_("Check new messages for _Junk contents"), "0" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk_inbox", "filter_junk",
 	  N_("Only check for Junk messa_ges in the INBOX folder"), "0" },
--- evolution-data-server-1.2.0/camel/providers/imap/camel-imap-store.c~	2005-03-16 08:44:11.000000000 -0700
+++ evolution-data-server-1.2.0/camel/providers/imap/camel-imap-store.c	2005-03-16 10:06:08.000000000 -0700
@@ -277,6 +277,11 @@ construct (CamelService *service, CamelS
 	if (camel_url_get_param (url, "filter_junk_inbox"))
 		imap_store->parameters |= IMAP_PARAM_FILTER_JUNK_INBOX;
 
+	if (!camel_url_get_param (url, "display_trash"))
+		store->flags &= ~CAMEL_STORE_VTRASH;
+	if (!camel_url_get_param (url, "display_junk"))
+		store->flags &= ~CAMEL_STORE_VJUNK;
+
 	/* setup/load the store summary */
 	tmp = alloca(strlen(imap_store->storage_path)+32);
 	sprintf(tmp, "%s/.ev-store-summary", imap_store->storage_path);

evolution-data-server-1.5.91-check-only-active-folders.patch:
 camel-imap-provider.c |    3 +++
 camel-imap-store.c    |   11 +++++++++++
 camel-imap-store.h    |    3 +++
 3 files changed, 17 insertions(+)

--- NEW FILE evolution-data-server-1.5.91-check-only-active-folders.patch ---
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-provider.c~	2006-02-27 14:05:10.000000000 +0000
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-provider.c	2006-02-27 16:43:47.000000000 +0000
@@ -40,8 +40,11 @@ static gint imap_url_equal (gconstpointe
 CamelProviderConfEntry imap_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
 	  N_("Checking for New Mail") },
+	/* FIXME: Ideally we want a list here: Check for mail in: {No folders / INBOX only / subscribed / all} */
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
 	  N_("C_heck for new messages in all folders"), "1" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_subscribed", NULL,
+	  N_("C_heck for new messages in all active folders"), "0" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 #ifndef G_OS_WIN32
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL,
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.c~	2006-02-27 14:05:10.000000000 +0000
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.c	2006-02-27 16:44:51.000000000 +0000
@@ -287,6 +287,8 @@ construct (CamelService *service, CamelS
 	}
 	if (camel_url_get_param (url, "check_all"))
 		imap_store->parameters |= IMAP_PARAM_CHECK_ALL;
+	if (camel_url_get_param (url, "check_subscribed"))
+		imap_store->parameters |= IMAP_PARAM_CHECK_SUBSCRIBED;
 	if (camel_url_get_param (url, "filter")) {
 		imap_store->parameters |= IMAP_PARAM_FILTER_INBOX;
 		store->flags |= CAMEL_STORE_FILTER_INBOX;
@@ -372,6 +374,12 @@ imap_setv (CamelObject *object, CamelExc
 			store->parameters = flags;
 			/* no need to reconnect for this option to take effect... */
 			break;
+		case CAMEL_IMAP_STORE_CHECK_SUBSCRIBED:
+			flags = args->argv[i].ca_int ? IMAP_PARAM_CHECK_SUBSCRIBED : 0;
+			flags |= (store->parameters & ~IMAP_PARAM_CHECK_SUBSCRIBED);
+			store->parameters = flags;
+			/* no need to reconnect for this option to take effect... */
+			break;
 		case CAMEL_IMAP_STORE_FILTER_INBOX:
 			flags = args->argv[i].ca_int ? IMAP_PARAM_FILTER_INBOX : 0;
 			flags |= (store->parameters & ~IMAP_PARAM_FILTER_INBOX);
@@ -427,6 +435,9 @@ imap_getv (CamelObject *object, CamelExc
 		case CAMEL_IMAP_STORE_CHECK_ALL:
 			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_CHECK_ALL ? TRUE : FALSE;
 			break;
+		case CAMEL_IMAP_STORE_CHECK_SUBSCRIBED:
+			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_CHECK_SUBSCRIBED ? TRUE : FALSE;
+			break;
 		case CAMEL_IMAP_STORE_FILTER_INBOX:
 			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_FILTER_INBOX ? TRUE : FALSE;
 			break;
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.h~	2005-09-02 15:37:44.000000000 +0100
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.h	2006-02-27 16:45:26.000000000 +0000
@@ -64,6 +64,7 @@ enum {
 	CAMEL_IMAP_STORE_ARG_NAMESPACE,
 	CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE,
 	CAMEL_IMAP_STORE_ARG_CHECK_ALL,
+	CAMEL_IMAP_STORE_ARG_CHECK_SUBSCRIBED,
 	CAMEL_IMAP_STORE_ARG_FILTER_INBOX,
 	CAMEL_IMAP_STORE_ARG_FILTER_JUNK,
 	CAMEL_IMAP_STORE_ARG_FILTER_JUNK_INBOX,
@@ -72,6 +73,7 @@ enum {
 #define CAMEL_IMAP_STORE_NAMESPACE           (CAMEL_IMAP_STORE_ARG_NAMESPACE | CAMEL_ARG_STR)
 #define CAMEL_IMAP_STORE_OVERRIDE_NAMESPACE  (CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_CHECK_ALL           (CAMEL_IMAP_STORE_ARG_CHECK_ALL | CAMEL_ARG_INT)
+#define CAMEL_IMAP_STORE_CHECK_SUBSCRIBED    (CAMEL_IMAP_STORE_ARG_CHECK_SUBSCRIBED | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_FILTER_INBOX        (CAMEL_IMAP_STORE_ARG_FILTER_INBOX | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_FILTER_JUNK         (CAMEL_IMAP_STORE_ARG_FILTER_JUNK | CAMEL_ARG_BOO)
 #define CAMEL_IMAP_STORE_FILTER_JUNK_INBOX   (CAMEL_IMAP_STORE_ARG_FILTER_JUNK_INBOX | CAMEL_ARG_BOO)
@@ -104,6 +106,7 @@ typedef enum {
 #define IMAP_PARAM_FILTER_JUNK			(1 << 3)
 #define IMAP_PARAM_FILTER_JUNK_INBOX		(1 << 4)
 #define IMAP_PARAM_SUBSCRIPTIONS		(1 << 5)
+#define IMAP_PARAM_CHECK_SUBSCRIBED		(1 << 6)
 
 struct _CamelImapStore {
 	CamelDiscoStore parent_object;	


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.128
retrieving revision 1.128.2.1
diff -u -r1.128 -r1.128.2.1
--- evolution-data-server.spec	21 Sep 2006 17:42:45 -0000	1.128
+++ evolution-data-server.spec	23 Sep 2006 22:06:41 -0000	1.128.2.1
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.8.0
-Release: 9%{?dist}
+Release: 9.dwmw2.1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -60,6 +60,9 @@
 # Gnome.org bug #356828
 Patch20: evolution-data-server-1.8.0-uninstall.patch
 
+Patch100: evolution-data-server-1.2.0-vcrap.patch
+Patch101: evolution-data-server-1.5.91-check-only-active-folders.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -150,6 +153,9 @@
 %patch19 -p1 -b .fix-ecal-crash
 %patch20 -p1 -b .uninstall
 
+%patch100 -p1 -b .vcrap
+%patch101 -p1 -b .checksub
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}


