From 0ce8a7303952cf03c36a726f5f98a6247136dbcc Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Feb 01 2010 12:39:23 +0000
Subject: - Fix hidden entry boxes in the new password prompt (#560345)


---

diff --git a/gnome-keyring-2.29.6-prompt-show-entry.patch b/gnome-keyring-2.29.6-prompt-show-entry.patch
new file mode 100644
index 0000000..2c722d3
--- /dev/null
+++ b/gnome-keyring-2.29.6-prompt-show-entry.patch
@@ -0,0 +1,18 @@
+
+--- a/daemon/dbus/gkd-secret-create.c	2009-12-14 20:30:29.000000000 +0530
++++ b/daemon/dbus/gkd-secret-create.c	2010-01-23 02:41:54.000000000 +0530
+@@ -82,9 +82,9 @@
+ 	gkd_prompt_set_secondary_text (prompt, text);
+ 	g_free (text);
+ 
+-	gkd_prompt_hide_widget (prompt, "name_area");
+-	gkd_prompt_hide_widget (prompt, "confirm_area");
+-	gkd_prompt_hide_widget (prompt, "details_area");
++	gkd_prompt_show_widget (prompt, "password_area");
++	gkd_prompt_show_widget (prompt, "confirm_area");
++	gkd_prompt_show_widget (prompt, "details_area");
+ 
+ 	g_free (label);
+ }
+
+Diff finished.  Sat Jan 23 02:42:59 2010
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 7100fbb..e08cede 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -9,7 +9,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.29.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.29/gnome-keyring-%{version}.tar.bz2
@@ -28,6 +28,11 @@ Patch4: gnome-keyring-2.29.6-lookup-endless-loop.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=607819
 Patch5: gnome-keyring-2.29.6-stat-include.patch
 
+# Gnome keyring prompt new password request does not have text entry boxes
+# https://bugzilla.redhat.com/show_bug.cgi?id=560345
+# https://bugzilla.gnome.org/show_bug.cgi?id=607869
+Patch6: gnome-keyring-2.29.6-prompt-show-entry.patch
+
 
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,6 +96,7 @@ automatically unlock the "login" keyring when the user logs in.
 %patch3 -p1 -b .no-pass
 %patch4 -p1 -b .lookup-endless-loop
 %patch5 -p1 -b .ftbfs-stat
+%patch6 -p1 -b .prompt-entry
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -168,6 +174,9 @@ fi
 
 
 %changelog
+* Mon Feb  1 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.5-3
+- Fix hidden entry boxes in the new password prompt (#560345)
+
 * Mon Jan 25 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.29.5-2
 - Fix endless loop when looking for password in login keyring
 - Fix undefined reference to S_ISSOCK (#557970)