From cf3eb8ee1967c329e993a4d36a3ddf0bf70cabb7 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jul 03 2008 14:46:10 +0000
Subject: - Add patch for GNOME bug #534080 (fix attachment saving).


---

diff --git a/evolution-data-server-2.23.4-fix-attachment-saving.patch b/evolution-data-server-2.23.4-fix-attachment-saving.patch
new file mode 100644
index 0000000..c520292
--- /dev/null
+++ b/evolution-data-server-2.23.4-fix-attachment-saving.patch
@@ -0,0 +1,28 @@
+diff -up evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving evolution-data-server-2.23.4/camel/camel-stream-vfs.c
+--- evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving	2008-06-15 23:18:01.000000000 -0400
++++ evolution-data-server-2.23.4/camel/camel-stream-vfs.c	2008-07-03 07:15:10.000000000 -0400
+@@ -211,20 +211,20 @@ stream_read (CamelStream *stream, char *
+ static ssize_t
+ stream_write (CamelStream *stream, const char *buffer, size_t n)
+ {
+-	gssize nwritten;
++	gboolean success;
++	gsize bytes_written;
+ 	GError *error = NULL;
+ 	CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream);
+ 
+ 	g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream_vfs->stream), 0);
+ 
+-	nwritten = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, NULL, NULL, &error);
++	success = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, &bytes_written, NULL, &error);
+ 
+ 	if (error) {
+ 		g_warning ("%s", error->message);
+ 		g_error_free (error);
+ 	}
+-
+-	return nwritten;
++	return success ? bytes_written : -1;
+ }
+ 
+ static int
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index ee4216f..357a96b 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.23.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,6 +50,9 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# RH bug #534080
+Patch14: evolution-data-server-2.23.4-fix-attachment-saving.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -126,6 +129,7 @@ This package contains developer documentation for %{name}.
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
+%patch14 -p1 -b .fix-attachment-saving
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -372,6 +376,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Jul 03 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-2.fc10
+- Add patch for GNOME bug #534080 (fix attachment saving).
+
 * Mon Jun 16 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-1.fc10
 - Update to 2.23.4