rpms/evolution-data-server/devel evolution-data-server-1.7.3-gpg-account-name.patch, NONE, 1.1 evolution-data-server.spec, 1.98, 1.99

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6346

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.3-gpg-account-name.patch 
Log Message:
- Show GPG key name when asking for the password (Gnome.org #345965).


evolution-data-server-1.7.3-gpg-account-name.patch:
 camel-gpg-context.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-data-server-1.7.3-gpg-account-name.patch ---
Index: camel/camel-gpg-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-gpg-context.c,v
retrieving revision 1.81
diff -u -r1.81 camel-gpg-context.c
--- camel/camel-gpg-context.c	1 May 2006 14:16:33 -0000	1.81
+++ camel/camel-gpg-context.c	26 Jun 2006 15:31:18 -0000
@@ -809,15 +809,15 @@
 		g_free (gpg->need_id);
 		gpg->need_id = userid;
 	} else if (!strncmp (status, "GET_HIDDEN ", 11)) {
+		const char *name = NULL;
 		char *prompt, *passwd;
-		const char *name;
 		guint32 flags;
 		
 		status += 11;
 		
 		if (gpg->need_id && !(name = g_hash_table_lookup (gpg->userid_hint, gpg->need_id)))
 			name = gpg->need_id;
-		else
+		else if (!name)
 			name = "";
 		
 		if (!strncmp (status, "passphrase.pin.ask", 18)) {


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- evolution-data-server.spec	14 Jun 2006 14:20:29 -0000	1.98
+++ evolution-data-server.spec	27 Jun 2006 19:53:27 -0000	1.99
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.7.3
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -47,6 +47,9 @@
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# Gnome.org #345965 - fixed upstream
+Patch301: evolution-data-server-1.7.3-gpg-account-name.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -128,6 +131,7 @@
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
+%patch301 -p0 -b .gpg-account-name
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -324,6 +328,9 @@
 
 
 %changelog
+* Tue Jun 27 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.3-3
+- Show GPG key name when asking for the password (Gnome.org #345965).
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.7.3-2
 - rebuilt with new gnutls