rpms/seahorse/F-12 property-get.patch, NONE, 1.1 seahorse.spec, 1.83, 1.84

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23719

Modified Files:
	seahorse.spec 
Added Files:
	property-get.patch 
Log Message:
Fix a wrong use of gdk_property_get


property-get.patch:
 seahorse-key-manager-store.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE property-get.patch ---
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


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/F-12/seahorse.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- seahorse.spec	19 Oct 2009 08:58:37 -0000	1.83
+++ seahorse.spec	14 Dec 2009 13:54:33 -0000	1.84
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.28.1
-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 at redhat.com> 2.28.1-2
+- Fix a wrong use of gdk_property_get that can lead to crashes
+
 * Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
 - Update to 2.28.1