rpms/gnome-desktop/devel no-info.patch, NONE, 1.1 gnome-desktop.spec, 1.125, 1.126

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16732

Modified Files:
	gnome-desktop.spec 
Added Files:
	no-info.patch 
Log Message:
Fix a crash


no-info.patch:

--- NEW FILE no-info.patch ---
diff -up gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c.no-info gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c
--- gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c.no-info	2008-02-19 12:08:34.000000000 -0500
+++ gnome-desktop-2.21.91/libgnome-desktop/gnome-bg.c	2008-02-19 12:08:56.000000000 -0500
@@ -1076,10 +1076,11 @@ get_mtime (const char *uri)
 		file = g_file_new_for_uri (uri);
 		info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
 					  G_FILE_QUERY_INFO_NONE, NULL, NULL);
-		if (info)
+		if (info) {
 			mtime = g_file_info_get_attribute_uint64 (info,
 								  G_FILE_ATTRIBUTE_TIME_MODIFIED);
-		g_object_unref (info);
+			g_object_unref (info);
+		}
 		g_object_unref (file);
 	}
 	


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-desktop.spec	16 Feb 2008 01:38:09 -0000	1.125
+++ gnome-desktop.spec	19 Feb 2008 17:14:06 -0000	1.126
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.21.91
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -21,6 +21,8 @@
 
 Patch1:   gnome-desktop-2.1.90-kdetheme.patch
 Patch2:   add-randr-12.patch
+# fixed in upstream svn
+Patch3:   no-info.patch
 
 Requires: redhat-menus
 
@@ -73,6 +75,7 @@
 
 %patch1 -p1 -b .kdetheme
 %patch2 -p1 -b .add-randr-12
+%patch3 -p1 -b .no-info
 
 %build
 autoreconf
@@ -119,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Feb 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-6
+- Fix a possible crash in the background code
+
 * Fri Feb 15 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.91-5
 * Update randr code