rpms/evolution-data-server/FC-5 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.90, 1.90.2.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 24 10:47:11 UTC 2006
- Previous message (by thread): rpms/ltrace/devel ltrace-opd.patch, NONE, 1.1 ltrace-testsuite.patch, 1.4, 1.5 ltrace.spec, 1.29, 1.30
- Next message (by thread): rpms/evolution/FC-5 evolution-2.5.91-check-only-active-folders.patch, NONE, 1.1.6.1 evolution.spec, 1.136, 1.136.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/dist/rpms/evolution-data-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16269
Modified Files:
Tag: private-1_6_1-check-only-active-folders-branch
evolution-data-server.spec
Added Files:
Tag: private-1_6_1-check-only-active-folders-branch
evolution-data-server-1.2.0-vcrap.patch
evolution-data-server-1.5.91-check-only-active-folders.patch
Log Message:
Update bug fix branch
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/FC-5/evolution-data-server.spec,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- evolution-data-server.spec 11 Apr 2006 02:34:20 -0000 1.90
+++ evolution-data-server.spec 24 Apr 2006 10:47:07 -0000 1.90.2.1
@@ -13,7 +13,7 @@
%define use_gtk_doc 0
-%define support_imap4_provider 0
+%define support_imap4_provider 1
%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
@@ -21,7 +21,7 @@
Summary: Backend data server for evolution
Name: evolution-data-server
Version: 1.6.1
-Release: 1.fc5.2
+Release: 1.fc5.2.dwmw2.1
License: LGPL
Group: System Environment/Libraries
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -45,6 +45,9 @@
Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
+Patch400: evolution-data-server-1.5.91-check-only-active-folders.patch
+Patch401: evolution-data-server-1.2.0-vcrap.patch
+
BuildRoot: %{_tmppath}/%{name}-root
Requires: libsoup >= %{soup_version}
Requires: ORBit2 >= %{orbit2_version}
@@ -121,6 +124,10 @@
%patch201 -p0 -b .fix-comp-ref-leak
%patch300 -p1 -b .make_imap4_optional
+%patch400 -p1 -b .checksub
+%patch401 -p1 -b .vcrap
+
+
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
mkdir -p krb5-fakeprefix/%{_lib}
- Previous message (by thread): rpms/ltrace/devel ltrace-opd.patch, NONE, 1.1 ltrace-testsuite.patch, 1.4, 1.5 ltrace.spec, 1.29, 1.30
- Next message (by thread): rpms/evolution/FC-5 evolution-2.5.91-check-only-active-folders.patch, NONE, 1.1.6.1 evolution.spec, 1.136, 1.136.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list