rpms/evolution-data-server/devel evolution-data-server-2.23.4-fix-attachment-saving.patch, NONE, 1.1 evolution-data-server.spec, 1.219, 1.220

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5652

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.23.4-fix-attachment-saving.patch 
Log Message:

* Thu Jul 03 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.4-2.fc10
- Add patch for GNOME bug #534080 (fix attachment saving).


evolution-data-server-2.23.4-fix-attachment-saving.patch:

--- NEW FILE evolution-data-server-2.23.4-fix-attachment-saving.patch ---
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


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- evolution-data-server.spec	16 Jun 2008 17:41:48 -0000	1.219
+++ evolution-data-server.spec	3 Jul 2008 14:46:10 -0000	1.220
@@ -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 @@
 # 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 @@
 %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 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Jul 03 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.4-2.fc10
+- Add patch for GNOME bug #534080 (fix attachment saving).
+
 * Mon Jun 16 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.4-1.fc10
 - Update to 2.23.4