[evolution/f14/master] Add patch for RH bug #629753/Gnome bug #630700 (crash on message send)

[Milan Crha]

commit f3065f8b9600ebf2971947eb748f5987eed33a8a
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Sep 27 09:58:56 2010 +0200

    Add patch for RH bug #629753/Gnome bug #630700 (crash on message send)

 evolution-2.31.92-gn630700.patch |   16 ++++++++++++++++
 evolution.spec                   |   11 +++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/evolution-2.31.92-gn630700.patch b/evolution-2.31.92-gn630700.patch
new file mode 100644
index 0000000..d479ea1
--- /dev/null
+++ b/evolution-2.31.92-gn630700.patch
@@ -0,0 +1,16 @@
+diff --git a/mail/mail-ops.c b/mail/mail-ops.c
+index 1303dae..6b9ae79 100644
+--- a/mail/mail-ops.c
++++ b/mail/mail-ops.c
+@@ -603,8 +603,9 @@ mail_send_message (struct _send_queue_msg *m,
+ 				g_string_append_printf (
+ 					err, _("Failed to append to %s: %s\n"
+ 					"Appending to local 'Sent' folder instead."),
+-					sent_folder_uri, local_error->message);
+-				g_clear_error (&local_error);
++					sent_folder_uri, local_error ? local_error->message : _("Unknown error"));
++				if (local_error)
++					g_clear_error (&local_error);
+ 			}
+ 		}
+ 
diff --git a/evolution.spec b/evolution.spec
index f462b0b..9c43e12 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -33,7 +33,7 @@
 
 Name: evolution
 Version: 2.31.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -55,9 +55,12 @@ Patch12: evolution-2.9.1-im-context-reset.patch
 # RH bug #589555
 Patch13: evolution-2.30.1-help-contents.patch
 
-# RH bug #626066
+# GN bug #626066
 Patch14: evolution-2.31.92-gn626066.patch
 
+# GN bug #630700
+Patch15: evolution-2.31.92-gn630700.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -211,6 +214,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch12 -p1 -b .im-context-reset
 %patch13 -p1 -b .help-contents
 %patch14 -p1 -b .gn626066
+%patch15 -p1 -b .gn630700
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -619,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 27 2010 Milan Crha <mcrha at redhat.com> - 2.31.92-2.fc14
+- Add patch for Gnome bug #630700 (crash on message send)
+
 * Mon Sep 13 2010 Milan Crha <mcrha at redhat.com> - 2.31.92-1.fc14
 - Update to 2.31.92
 - Add patch for Gnome bug #626066 (login to NSS on demand)