From 305df9566fc1734157a9702b8cb3cde3534b5aeb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Wed, 8 Nov 2006 17:20:13 +0000
Subject: [PATCH] - Add patch for RH bug #203058 (name selector dialog glitch).

---
 ...erver-1.9.2-fix-name-selector-dialog.patch | 45 +++++++++++++++++++
 evolution-data-server.spec                    |  9 +++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 evolution-data-server-1.9.2-fix-name-selector-dialog.patch

diff --git a/evolution-data-server-1.9.2-fix-name-selector-dialog.patch b/evolution-data-server-1.9.2-fix-name-selector-dialog.patch
new file mode 100644
index 0000000..17ce0fe
--- /dev/null
+++ b/evolution-data-server-1.9.2-fix-name-selector-dialog.patch
@@ -0,0 +1,45 @@
+--- evolution-data-server-1.9.2/libedataserverui/e-name-selector-dialog.c.fix-name-selector-dialog	2006-11-08 11:23:52.000000000 -0500
++++ evolution-data-server-1.9.2/libedataserverui/e-name-selector-dialog.c	2006-11-08 11:45:54.000000000 -0500
+@@ -1189,30 +1189,24 @@
+ {
+ 	EDestinationStore *destination_store = E_DESTINATION_STORE (model);
+ 	EDestination      *destination;
+-	gchar             *string;
++	GString           *buffer;
+ 
+        	destination = e_destination_store_get_destination (destination_store, iter);
+ 	g_assert (destination);
+ 
+-	if (e_destination_is_evolution_list (destination)) {
+-		if (e_destination_list_show_addresses (destination)) {
+-			const gchar *name;
+-			const gchar *addresses;
+-
+-			name      = e_destination_get_name (destination);
+-			addresses = e_destination_get_address (destination);
+-
+-			string = g_strdup_printf ("%s%s(%s)", name ? name : "",
+-						  name ? " " : "", addresses ? addresses : "?");
+-		} else {
+-			string = g_strdup (e_destination_get_name (destination));
+-		}
+-	} else {
+-		string = g_strdup (e_destination_get_address (destination));
++	buffer = g_string_new (e_destination_get_name (destination));
++
++	if (!e_destination_is_evolution_list (destination)) {
++		const gchar *email;
++
++		email = e_destination_get_email (destination);
++		if (email == NULL || *email == '\0')
++			email = "?";
++		g_string_append_printf (buffer, " <%s>", email);
+ 	}
+ 
+-	g_object_set (cell, "text", string, NULL);
+-	g_free (string);
++	g_object_set (cell, "text", buffer->str, NULL);
++	g_string_free (buffer, TRUE);
+ }
+ 
+ /* ----------------------- *
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index f87c2af..53e59ba 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 1.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -68,6 +68,9 @@ Patch22: evolution-data-server-1.9.1-kill-ememory.patch
 # Gnome.org bug #353924
 Patch23: evolution-data-server-1.9.1-fix-categories.patch
 
+# RH bug #203058
+Patch24: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -158,6 +161,7 @@ evolution-data-server.
 %patch21 -p1 -b .kill-ethread
 %patch22 -p1 -b .kill-ememory
 %patch23 -p1 -b .fix-categories
+%patch24 -p1 -b .fix-name-selector-dialog
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -375,6 +379,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Nov 08 2006 Matthew Barnes <mbarnes@redhat.com> - 1.9.2-2.fc7
+- Add patch for RH bug #203058 (name selector dialog glitch).
+
 * Mon Nov 06 2006 Matthew Barnes <mbarnes@redhat.com> - 1.9.2-1.fc7
 - Update to 1.9.2
 - Remove patch for Gnome.org bugs #369168, #369259, and #369261