rpms/libgnome-keyring/F-13 libgnome-keyring-2.29.5-find-password-return-no-match.patch, NONE, 1.1 libgnome-keyring.spec, 1.3, 1.4

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/libgnome-keyring/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30963

Modified Files:
	libgnome-keyring.spec 
Added Files:
	libgnome-keyring-2.29.5-find-password-return-no-match.patch 
Log Message:
* Wed Feb 17 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.4-4
- When no password is found, return GNOME_KEYRING_RESULT_NO_MATCH


libgnome-keyring-2.29.5-find-password-return-no-match.patch:
 gnome-keyring.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libgnome-keyring-2.29.5-find-password-return-no-match.patch ---
>From dca74bd36dd5f3f16f963a194e53a05fda68d868 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz at gnome.org>
Date: Tue, 16 Feb 2010 13:06:41 +0100
Subject: [PATCH] When no password is found, return GNOME_KEYRING_RESULT_NO_MATCH

We were returning GNOME_KEYRING_RESULT_OK with a NULL password, but some
applications rely on GNOME_KEYRING_RESULT_NO_MATCH.

https://bugzilla.gnome.org/show_bug.cgi?id=608510
---
 library/gnome-keyring.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
index 8931fe5..35a860c 100644
--- a/library/gnome-keyring.c
+++ b/library/gnome-keyring.c
@@ -4379,7 +4379,7 @@ find_password_1_reply (GkrOperation *op, const char *path, gpointer user_data)
 	/* All done, complete the operation here */
 	if (path == NULL) {
 		cb = gkr_operation_pop (op);
-		gkr_callback_invoke_ok_string (cb, NULL);
+		gkr_callback_invoke_res (cb, GNOME_KEYRING_RESULT_NO_MATCH);
 
 	/* We need a session to get the secret for this item */
 	} else {
-- 
1.6.6.1



Index: libgnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome-keyring/F-13/libgnome-keyring.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libgnome-keyring.spec	16 Feb 2010 15:14:22 -0000	1.3
+++ libgnome-keyring.spec	17 Feb 2010 14:44:33 -0000	1.4
@@ -6,7 +6,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: libgnome-keyring
 Version: 2.29.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/libgnome-keyring/2.29/libgnome-keyring-%{version}.tar.bz2
@@ -27,6 +27,9 @@ Patch1: libgnome-keyring-2.29.5-session-
 Patch2: libgnome-keyring-2.29.5-set-info-type-property.patch
 Patch3: libgnome-keyring-2.29.5-assertion-password-not-found.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=608510#c7
+Patch4: libgnome-keyring-2.29.5-find-password-return-no-match.patch
+
 %description
 gnome-keyring is a program that keep password and other secrets for
 users. The library libgnome-keyring is used by applications to integrate
@@ -53,6 +56,7 @@ header files needed to develop applicati
 %patch1 -p1 -b .session-clear
 %patch2 -p1 -b .info-type
 %patch3 -p1 -b .assert-not-found
+%patch4 -p1 -b .find-password-return-no-match
 
 
 %build
@@ -94,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 17 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.4-4
+- When no password is found, return GNOME_KEYRING_RESULT_NO_MATCH
+
 * Tue Feb 16 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.4-3
 - Fix assertion when password is not found