[gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     2c1336ff29072752c349e5f53d7427a8d3c103c6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 13:19:24 2013 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 13:19:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2c1336ff

gnome-extra/evolution-data-server: Fix critical bug

All users of Evolution should upgrade.

https://bugzilla.gnome.org/show_bug.cgi?id=693101

---
 ...uild => evolution-data-server-3.7.92-r1.ebuild} |    3 ++
 ...n-data-server-3.7.92-fix-imapx-redownload.patch |   39 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.92.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild
similarity index 97%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.7.92.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild
index 9b27f80..cee2bb1 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.92.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild
@@ -82,6 +82,9 @@ pkg_setup() {
 src_prepare() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=693101
+	epatch "${FILESDIR}/${P}-fix-imapx-redownload.patch"
+
 	gnome2_src_prepare
 	use vala && vala_src_prepare
 

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch
new file mode 100644
index 0000000..f6e17f0
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch
@@ -0,0 +1,39 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=693101
+
+diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
+index 33ee30e..0161536 100644
+--- a/camel/camel-imapx-store.c
++++ b/camel/camel-imapx-store.c
+@@ -1132,11 +1132,30 @@ sync_folders (CamelIMAPXStore *istore,
+ 	GHashTable *folders_from_server;
+ 	gboolean notify_all;
+ 	gint i, total;
++	GError *local_error = NULL;
+ 
+ 	folders_from_server = fetch_folders_for_namespaces (
+-		istore, pattern, sync, cancellable, error);
+-	if (folders_from_server == NULL)
++		istore, pattern, sync, cancellable, &local_error);
++	if (folders_from_server == NULL) {
++		if (local_error)
++			g_propagate_error (error, local_error);
+ 		return FALSE;
++	}
++
++	/* In certain situations can happen that the function returns data,
++	   even either the operation was cancelled or an error was set,
++	   thus check for this and do not update local list of folders
++	   with incomplete data
++	*/
++	if (g_cancellable_is_cancelled (cancellable) || local_error) {
++		g_hash_table_foreach (folders_from_server, imapx_get_folders_free, NULL);
++		g_hash_table_destroy (folders_from_server);
++
++		if (local_error)
++			g_propagate_error (error, local_error);
++
++		return FALSE;
++	}
+ 
+ 	settings = camel_service_ref_settings (CAMEL_SERVICE (istore));
+ 	notify_all = !camel_imapx_settings_get_use_subscriptions (CAMEL_IMAPX_SETTINGS (settings));