Hi, Why is this submission targeting 1.1? We are currently working on the 1.2 release.
Regards, Madhu -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of ext Federico Mena Quintero Sent: Friday, December 10, 2010 1:46 AM To: [email protected] Subject: [meego-commits] 10786: Changes to MeeGo:1.1:Core/evolution-data-server Hi, I have made the following changes to evolution-data-server in project MeeGo:1.1:Core. Please review and accept ASAP. Thank You, Federico Mena Quintero [This message was auto-generated] --- Request #10786: submit: home:federico:branches:MeeGo:1.1:Core/evolution-data-server(r2)(cleanup) -> MeeGo:1.1:Core/evolution-data-server Message: bmc#6498 - updates for imapx, and enable filtering by default State: new 2010-12-09T15:46:06 federico Comment: None changes files: -------------- --- evolution-data-server.changes +++ evolution-data-server.changes @@ -0,0 +1,6 @@ +* Thu Dec 09 2010 Federico Mena-Quintero <[email protected]> - 2.30.2 +- Added evolution-data-server-bmc6498-imapx-update-gnome-2-30.patch + and evolution-data-server-bmc6498-imapx-filter-incoming-by-default.patch + for bmc#6498. In conjunction with fixes to Evolution, this makes + filtering work by default for the imapx provider. + new: ---- evolution-data-server-bmc6498-imapx-filter-incoming-by-default.patch evolution-data-server-bmc6498-imapx-update-gnome-2-30.patch spec files: ----------- --- evolution-data-server.spec +++ evolution-data-server.spec @@ -59,6 +59,8 @@ Patch5: evolution-data-server-bmo182-camel-socks5.patch Patch6: evolution-data-server-contacts-bug-2330.patch Patch7: evolution-data-server-bmc3667-camel-socks-error-fallbacks.patch +Patch8: evolution-data-server-bmc6498-imapx-update-gnome-2-30.patch +Patch9: evolution-data-server-bmc6498-imapx-filter-incoming-by-default.patch %description The %{name} package provides a unified backend for programs @@ -87,6 +89,8 @@ %patch5 -p1 -b .evolution-data-server-bmo182-camel-socks5 %patch6 -p1 -b .evolution-data-server-contacts-bug-2330 %patch7 -p1 -b .evolution-data-server-bmc3667-camel-socks-error-fallbacks +%patch8 -p1 -b .evolution-data-server-bmc6498-imapx-update-gnome-2-30 +%patch9 -p1 -b .evolution-data-server-bmc6498-imapx-filter-incoming-by-default %build %if %{ldap_support} other changes: -------------- ++++++ evolution-data-server-bmc6498-imapx-filter-incoming-by-default.patch (new) --- evolution-data-server-bmc6498-imapx-filter-incoming-by-default.patch +++ evolution-data-server-bmc6498-imapx-filter-incoming-by-default.patch +From 11d6bc87d95b34e86d7e187ff904248fc1af802b Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero <[email protected]> +Date: Thu, 9 Dec 2010 17:54:17 -0600 +Subject: [PATCH 1/1] bmc#6498 - Filter incoming messages in imapx by default + +--- + camel/providers/imap/camel-imap-provider.c | 2 +- + camel/providers/imapx/camel-imapx-provider.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c +index d5c9ef8..3f0653b 100644 +--- a/camel/providers/imap/camel-imap-provider.c ++++ b/camel/providers/imap/camel-imap-provider.c +@@ -67,7 +67,7 @@ static CamelProviderConfEntry imap_conf_entries[] = { + { CAMEL_PROVIDER_CONF_SECTION_END }, + { CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") }, + { CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL, +- N_("_Apply filters to new messages in INBOX on this server"), "0" }, ++ 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", +diff --git a/camel/providers/imapx/camel-imapx-provider.c b/camel/providers/imapx/camel-imapx-provider.c +index c704ed0..53f4ed6 100644 +--- a/camel/providers/imapx/camel-imapx-provider.c ++++ b/camel/providers/imapx/camel-imapx-provider.c +@@ -78,7 +78,7 @@ CamelProviderConfEntry imapx_conf_entries[] = { + { CAMEL_PROVIDER_CONF_SECTION_END }, + { CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") }, + { CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL, +- N_("_Apply filters to new messages in INBOX on this server"), "0" }, ++ 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", +-- +1.7.1 + ++++++ evolution-data-server-bmc6498-imapx-update-gnome-2-30.patch (new) --- evolution-data-server-bmc6498-imapx-update-gnome-2-30.patch +++ evolution-data-server-bmc6498-imapx-update-gnome-2-30.patch +From b99024cf46c183edff9a8e77663fd5e16b6a3e4b Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero <[email protected]> +Date: Thu, 9 Dec 2010 17:53:26 -0600 +Subject: [PATCH 1/1] Updates from upstream's imapx in gnome-2-30 + +--- + camel/providers/imapx/camel-imapx-folder.c | 80 ++- + camel/providers/imapx/camel-imapx-folder.h | 19 +- + camel/providers/imapx/camel-imapx-provider.c | 25 +- + camel/providers/imapx/camel-imapx-server.c | 586 ++++++++++++++++------ + camel/providers/imapx/camel-imapx-server.h | 23 +- + camel/providers/imapx/camel-imapx-store.c | 159 +++++-- + camel/providers/imapx/camel-imapx-store.h | 20 +- + camel/providers/imapx/camel-imapx-stream.c | 18 +- + camel/providers/imapx/camel-imapx-stream.h | 14 +- + camel/providers/imapx/camel-imapx-summary.c | 49 ++- + camel/providers/imapx/camel-imapx-summary.h | 4 +- + camel/providers/imapx/camel-imapx-utils.c | 54 ++- + camel/providers/imapx/camel-imapx-utils.h | 22 +- + camel/providers/imapx/camel-imapx-view-summary.c | 16 +- + camel/providers/imapx/camel-imapx-view-summary.h | 16 +- + camel/providers/imapx/test-imapx.c | 19 + + 16 files changed, 800 insertions(+), 324 deletions(-) + +diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c +index 3d9b0c0..87b49d0 100644 +--- a/camel/providers/imapx/camel-imapx-folder.c ++++ b/camel/providers/imapx/camel-imapx-folder.c +@@ -1,24 +1,23 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + /* camel-imap-folder.c : class for a imap folder */ +- + /* + * Authors: Michael Zucchi <[email protected]> + * +- * Copyright (C) 2002 Ximian, Inc. (www.ximian.com) ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of version 2 of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. + * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +- * USA ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + */ + + #ifdef HAVE_CONFIG_H +@@ -129,25 +128,33 @@ static void + imapx_refresh_info (CamelFolder *folder, CamelException *ex) + { + CamelIMAPXStore *istore = (CamelIMAPXStore *)folder->parent_store; ++ CamelIMAPXServer *server; + + if (CAMEL_OFFLINE_STORE (istore)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) + return; + + camel_service_connect((CamelService *)istore, ex); +- if (istore->server && camel_imapx_server_connect (istore->server, TRUE, ex)) +- camel_imapx_server_refresh_info(istore->server, folder, ex); ++ server = camel_imapx_store_get_server(istore, ex); ++ if (server) { ++ camel_imapx_server_refresh_info(server, folder, ex); ++ camel_object_unref(server); ++ } + } + + static void + imapx_expunge (CamelFolder *folder, CamelException *ex) + { + CamelIMAPXStore *is = (CamelIMAPXStore *)folder->parent_store; ++ CamelIMAPXServer *server; + + if (CAMEL_OFFLINE_STORE (is)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) + return; + +- if (is->server && camel_imapx_server_connect (is->server, TRUE, ex)) +- camel_imapx_server_expunge(is->server, folder, ex); ++ server = camel_imapx_store_get_server(is, ex); ++ if (server) { ++ camel_imapx_server_expunge(server, folder, ex); ++ camel_object_unref(server); ++ } + + } + +@@ -155,6 +162,7 @@ static void + imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex) + { + CamelIMAPXStore *is = (CamelIMAPXStore *)folder->parent_store; ++ CamelIMAPXServer *server; + CamelException eex = CAMEL_EXCEPTION_INITIALISER; + + if (CAMEL_OFFLINE_STORE (is)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) +@@ -163,17 +171,21 @@ imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex) + if (!ex) + ex = &eex; + +- if (is->server && camel_imapx_server_connect (is->server, TRUE, ex)) +- camel_imapx_server_sync_changes (is->server, folder, ex); ++ server = camel_imapx_store_get_server(is, ex); ++ if (!server) ++ return; ++ ++ camel_imapx_server_sync_changes (server, folder, ex); + + /* Sync twice - make sure deleted flags are written out, + then sync again incase expunge changed anything */ + camel_exception_clear(ex); + +- if (is->server && expunge) { +- camel_imapx_server_expunge(is->server, folder, ex); ++ if (expunge) { ++ camel_imapx_server_expunge(server, folder, ex); + camel_exception_clear(ex); + } ++ camel_object_unref(server); + } + + static CamelMimeMessage * +@@ -183,6 +195,7 @@ imapx_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex) + CamelStream *stream = NULL; + CamelIMAPXStore *istore = (CamelIMAPXStore *)folder->parent_store; + CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) folder; ++ CamelIMAPXServer *server; + const gchar *path = NULL; + gboolean offline_message = FALSE; + +@@ -203,9 +216,12 @@ imapx_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex) + if (CAMEL_OFFLINE_STORE (istore)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) + return NULL; + +- if (istore->server && camel_imapx_server_connect (istore->server, TRUE, ex)) { +- stream = camel_imapx_server_get_message(istore->server, folder, uid, ex); ++ server = camel_imapx_store_get_server(istore, ex); ++ if (server) { ++ stream = camel_imapx_server_get_message(server, folder, uid, ex); ++ camel_object_unref(server); + } else { ++ /* It should _always_ be set */ + if (!camel_exception_is_set (ex)) + camel_exception_setv(ex, 1, "not authenticated"); + return NULL; +@@ -231,12 +247,16 @@ static void + imapx_sync_message (CamelFolder *folder, const gchar *uid, CamelException *ex) + { + CamelIMAPXStore *istore = (CamelIMAPXStore *)folder->parent_store; ++ CamelIMAPXServer *server; + + if (CAMEL_OFFLINE_STORE (istore)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) + return; + +- if (istore->server && camel_imapx_server_connect (istore->server, TRUE, ex)) +- camel_imapx_server_sync_message (istore->server, folder, uid, ex); ++ server = camel_imapx_store_get_server(istore, ex); ++ if (server) { ++ camel_imapx_server_sync_message (server, folder, uid, ex); ++ camel_object_unref(server); ++ } + } + + static void +@@ -245,12 +265,16 @@ imapx_transfer_messages_to (CamelFolder *source, GPtrArray *uids, + gboolean delete_originals, CamelException *ex) + { + CamelIMAPXStore *istore = (CamelIMAPXStore *) source->parent_store; ++ CamelIMAPXServer *server; + + if (CAMEL_OFFLINE_STORE (istore)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) + return; + +- if (istore->server && camel_imapx_server_connect (istore->server, TRUE, ex)) +- camel_imapx_server_copy_message (istore->server, source, dest, uids, delete_originals, ex); ++ server = camel_imapx_store_get_server(istore, ex); ++ if (server) { ++ camel_imapx_server_copy_message (server, source, dest, uids, delete_originals, ex); ++ camel_object_unref(server); ++ } + + imapx_refresh_info (dest, ex); + } +@@ -259,6 +283,7 @@ static void + imapx_append_message(CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, gchar **appended_uid, CamelException *ex) + { (2422 more lines skipped) _______________________________________________ MeeGo-commits mailing list [email protected] http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
