rpms/file-roller/F-12 property-get.patch, NONE, 1.1 file-roller.spec, 1.159, 1.160

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19601

Modified Files:
	file-roller.spec 
Added Files:
	property-get.patch 
Log Message:
Fix a crash


property-get.patch:
 fr-window.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE property-get.patch ---
diff -up file-roller-2.28.1/src/fr-window.c.property-get file-roller-2.28.1/src/fr-window.c
--- file-roller-2.28.1/src/fr-window.c.property-get	2009-12-14 00:59:59.792797354 -0500
+++ file-roller-2.28.1/src/fr-window.c	2009-12-14 01:01:49.141546600 -0500
@@ -4138,13 +4138,14 @@ get_xds_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;
 }
 
 


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- file-roller.spec	30 Oct 2009 03:32:15 -0000	1.159
+++ file-roller.spec	14 Dec 2009 13:31:21 -0000	1.160
@@ -20,13 +20,15 @@ Source:		http://download.gnome.org/sourc
 # https://bugzilla.gnome.org/show_bug.cgi?id=590606
 Patch0:		sticky-dnd.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604535
+Patch1:         property-get.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel
 BuildRequires: nautilus-devel >= %{nautilus_version}
-BuildRequires: automake autoconf
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: libSM-devel
@@ -55,6 +57,7 @@ such as tar or zip files.
 %prep
 %setup -q
 %patch0 -p1 -b .sticky-dnd
+%patch1 -p1 -b .property-get
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -131,6 +134,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
+- Fix a wrong use of gdk_property_get (#538535)
+
 * Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
 - Fix sticky DND