[evolution/f15] Add patch for Red Hat bug #714793 (pop3 receives messages twice)

[Milan Crha]

commit 1453ee62426287ddb475227f01ffb101cdf75944
Author: Milan Crha <mcrha at redhat.com>
Date:   Wed Jun 22 07:52:36 2011 +0200

    Add patch for Red Hat bug #714793 (pop3 receives messages twice)

 evolution-3.0.2-disconnect-pop3.patch |   23 +++++++++++++++++++++++
 evolution.spec                        |    9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/evolution-3.0.2-disconnect-pop3.patch b/evolution-3.0.2-disconnect-pop3.patch
new file mode 100644
index 0000000..953c8b7
--- /dev/null
+++ b/evolution-3.0.2-disconnect-pop3.patch
@@ -0,0 +1,23 @@
+diff --git a/mail/mail-ops.c b/mail/mail-ops.c
+index 79fce90..338e83f 100644
+--- a/mail/mail-ops.c
++++ b/mail/mail-ops.c
+@@ -322,11 +322,18 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
+ 				em_filter_folder_element_exec (fm, cancellable, error);
+ 			}
+ 
++			g_object_ref (parent_store);
++
+ 			/* we unref the source folder here since we
+ 			   may now block in finalize (we try to
+ 			   disconnect cleanly) */
+ 			g_object_unref (fm->source_folder);
+ 			fm->source_folder = NULL;
++
++			/* also disconnect if not a local delivery mbox;
++			   there is no need to keep the connection alive forever */
++			camel_service_disconnect_sync (CAMEL_SERVICE (parent_store), TRUE, NULL);
++			g_object_unref (parent_store);
+ 		}
+ 	}
+ fail:
diff --git a/evolution.spec b/evolution.spec
index fa3ef29..8be4f45 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,7 +28,7 @@
 
 Name: evolution
 Version: 3.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -52,6 +52,9 @@ Patch14: evolution-help-gl.patch
 # RH bug #707578
 Patch15: evolution-3.0.2-rhbug707578.patch
 
+# RH bug #714793
+Patch16: evolution-3.0.2-disconnect-pop3.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -209,6 +212,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch13 -p1 -b .help-contents
 %patch14 -p1 -b .help-gl
 %patch15 -p1 -b .rhbug707578
+%patch16 -p1 -b .disconnect-pop3
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -598,6 +602,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Wed Jun 22 2011 Milan Crha <mcrha at redhat.com> - 3.0.2-3
+- Add patch for Red Hat bug #714793 (pop3 receives messages twice)
+
 * Thu Jun 02 2011 Milan Crha <mcrha at redhat.com> - 3.0.2-2
 - Add patch for Red Hat bug #707578 (crash on message fetching)