[evolution-data-server/f20] Add patch for Red Hat bug #1075461 (get_timezone incorrect assumption)

[Milan Crha]

commit 811f8453cb234f409edc3457078c193869379205
Author: Milan Crha <mcrha at redhat.com>
Date:   Fri Mar 14 10:34:46 2014 +0100

    Add patch for Red Hat bug #1075461 (get_timezone incorrect assumption)

 ...server-3.10.4-calendar-get-timezone-check.patch |   29 ++++++++++++++++++++
 evolution-data-server.spec                         |    9 +++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.10.4-calendar-get-timezone-check.patch b/evolution-data-server-3.10.4-calendar-get-timezone-check.patch
new file mode 100644
index 0000000..b246f2d
--- /dev/null
+++ b/evolution-data-server-3.10.4-calendar-get-timezone-check.patch
@@ -0,0 +1,29 @@
+diff -up evolution-data-server-3.10.4/calendar/libedata-cal/e-cal-backend.c.calendar-get-timezone-check evolution-data-server-3.10.4/calendar/libedata-cal/e-cal-backend.c
+--- evolution-data-server-3.10.4/calendar/libedata-cal/e-cal-backend.c.calendar-get-timezone-check	2013-12-08 19:43:26.000000000 +0100
++++ evolution-data-server-3.10.4/calendar/libedata-cal/e-cal-backend.c	2014-03-14 10:32:46.109041790 +0100
+@@ -3832,7 +3832,7 @@ e_cal_backend_get_timezone_finish (ECalB
+ 	g_return_val_if_fail (
+ 		g_simple_async_result_is_valid (
+ 		result, G_OBJECT (backend),
+-		e_cal_backend_get_timezone), FALSE);
++		e_cal_backend_get_timezone), NULL);
+ 
+ 	simple = G_SIMPLE_ASYNC_RESULT (result);
+ 	async_context = g_simple_async_result_get_op_res_gpointer (simple);
+@@ -3840,10 +3840,14 @@ e_cal_backend_get_timezone_finish (ECalB
+ 	cal_backend_unblock_operations (backend, simple);
+ 
+ 	if (g_simple_async_result_propagate_error (simple, error))
+-		return FALSE;
++		return NULL;
+ 
+ 	tzobject = g_queue_pop_head (&async_context->result_queue);
+-	g_return_val_if_fail (tzobject != NULL, NULL);
++
++	if (!tzobject)
++		g_set_error_literal (error,
++			E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_OBJECT_NOT_FOUND,
++			e_client_error_to_string (E_CAL_CLIENT_ERROR_OBJECT_NOT_FOUND));
+ 
+ 	g_warn_if_fail (g_queue_is_empty (&async_context->result_queue));
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 7f05aa6..a56fc26 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -29,7 +29,7 @@
 
 Name: evolution-data-server
 Version: 3.10.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -48,6 +48,9 @@ Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 # RH bug #1065796
 Patch02: evolution-data-server-3.10.4-weather-calendar-crash.patch
 
+# RH bug #1075461
+Patch03: evolution-data-server-3.10.4-calendar-get-timezone-check.patch
+
 ### Dependencies ###
 
 Requires: dconf
@@ -128,6 +131,7 @@ This package contains developer documentation for %{name}.
 
 %patch01 -p1 -b .fix-64bit-acinclude
 %patch02 -p1 -b .weather-calendar-crash
+%patch03 -p1 -b .calendar-get-timezone-check
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -376,6 +380,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserver
 
 %changelog
+* Fri Mar 14 2014 Milan Crha <mcrha at redhat.com> - 3.10.4-3
+- Add patch for Red Hat bug #1075461 (get_timezone incorrect assumption)
+
 * Thu Feb 20 2014 Milan Crha <mcrha at redhat.com> - 3.10.4-2
 - Add patch for Red Hat bug #1065796 (Crash in weather calendar)