From 2187af3b01d0b7218fa600bc96508535fae118e9 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Apr 02 2007 14:10:00 +0000
Subject: - Make the new ESourceComboBox widget work properly (RH bug #234760).


---

diff --git a/evolution-data-server-1.10.0-code-cleanup.patch b/evolution-data-server-1.10.0-code-cleanup.patch
index 5baa59b..427316b 100644
--- a/evolution-data-server-1.10.0-code-cleanup.patch
+++ b/evolution-data-server-1.10.0-code-cleanup.patch
@@ -1011,12 +1011,12 @@
 +	combo_box = GTK_COMBO_BOX (source_combo_box);
 +
 +	reference = g_hash_table_lookup (priv->uid_to_row_reference, uid);
-+	g_return_if_fail (reference != NULL);
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
 +
 +	iter_was_set = gtk_tree_model_get_iter (
 +		gtk_combo_box_get_model (combo_box), &iter,
 +		gtk_tree_row_reference_get_path (reference));
-+	g_return_if_fail (!iter_was_set);
++	g_return_if_fail (iter_was_set);
 +
 +	gtk_combo_box_set_active_iter (combo_box, &iter);
 +}
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index e7dcb54..55d8e66 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -392,6 +392,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Apr 02 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-5.fc7
+- Make the new ESourceComboBox widget work properly (RH bug #234760).
+
 * Tue Mar 27 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-4.fc7
 - Link to static evolution-openldap library (RH bug #210126).
 - Require openssl-devel when statically linking against openldap.