From 6717922b8d3c121ae7fde5e15226f6693046374f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Dec 14 2009 13:57:28 +0000
Subject: Fix a wrong use of gdk_property_get


---

diff --git a/property-get.patch b/property-get.patch
new file mode 100644
index 0000000..858d989
--- /dev/null
+++ b/property-get.patch
@@ -0,0 +1,24 @@
+diff -up seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get seahorse-2.28.1/src/seahorse-key-manager-store.c
+--- seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get	2009-12-14 08:48:11.767890524 -0500
++++ seahorse-2.28.1/src/seahorse-key-manager-store.c	2009-12-14 08:48:46.853113546 -0500
+@@ -407,13 +407,14 @@ xds_get_atom_value (GdkDragContext *cont
+ 	g_return_val_if_fail (context != NULL, NULL);
+ 	g_return_val_if_fail (context->source_window != NULL, NULL);
+ 
+-	gdk_property_get (context->source_window,
+-			  XDS_ATOM, TEXT_ATOM,
+-			  0, MAX_XDS_ATOM_VAL_LEN,
+-			  FALSE, NULL, NULL, NULL,
+-			  (unsigned char **) &ret);
++	if (gdk_property_get (context->source_window,
++			      XDS_ATOM, TEXT_ATOM,
++			      0, MAX_XDS_ATOM_VAL_LEN,
++			      FALSE, NULL, NULL, NULL,
++			      (unsigned char **) &ret);
++		return ret;
+ 
+-	return ret;
++	return NULL;
+ }
+ 
+ static gboolean
diff --git a/seahorse.spec b/seahorse.spec
index fd82bce..2b8caea 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.29.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -40,6 +40,9 @@ Requires:       pinentry-gtk
 
 Obsoletes: gnome-keyring-manager
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604541 
+Patch0: property-get.patch
+
 %description
 Seahorse is a graphical interface for managing and using encryption keys.
 It also integrates with nautilus, gedit and other places for encryption
@@ -59,6 +62,7 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
+%patch0 -p1 -b .property-get
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -164,6 +168,9 @@ fi
 %{_datadir}/gtk-doc/html/libseahorse
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen@redhat.com> 2.29.3-2
+- Fix a wrong use of gdk_property_get that can lead to crashes
+
 * Mon Nov 30 2009 Tomas Bzatek <tbzatek@redhat.com> 2.29.3-1
 - Update to 2.29.3