rpms/gnome-utils/devel shape-crash.patch, NONE, 1.1 gnome-utils.spec, 1.166, 1.167

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11102

Modified Files:
	gnome-utils.spec 
Added Files:
	shape-crash.patch 
Log Message:
fix a crash in gnome-screenshot


shape-crash.patch:

--- NEW FILE shape-crash.patch ---
diff -up gnome-utils-2.23.90/gnome-screenshot/screenshot-utils.c.shape-crash gnome-utils-2.23.90/gnome-screenshot/screenshot-utils.c
--- gnome-utils-2.23.90/gnome-screenshot/screenshot-utils.c.shape-crash	2008-08-28 00:57:25.000000000 -0400
+++ gnome-utils-2.23.90/gnome-screenshot/screenshot-utils.c	2008-08-28 00:57:52.000000000 -0400
@@ -350,7 +350,7 @@ screenshot_get_pixbuf (GdkWindow *window
                                         ShapeBounding,
                                         &rectangle_count,
                                         &rectangle_order);
-      if (rectangle_count > 0)
+      if (rectangles && rectangle_count > 0)
         {
           gboolean has_alpha = gdk_pixbuf_get_has_alpha (screenshot);
           


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-utils.spec	28 Aug 2008 04:29:29 -0000	1.166
+++ gnome-utils.spec	28 Aug 2008 05:02:10 -0000	1.167
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.23.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -26,6 +26,8 @@
 Patch2:		logview-versions-crash.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497490
 Patch3:		logview-versions-format.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=549667
+Patch4:		shape-crash.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -84,6 +86,7 @@
 %patch1 -p1 -b .logview-scroll
 %patch2 -p1 -b .versions-crash
 %patch3 -p1 -b .versions-format
+%patch4 -p1 -b .shape-crash
 
 # Hide from menus
 pushd gsearchtool
@@ -243,6 +246,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-2
+- Fix a crash in gnome-screenshot
+
 * Tue Aug 26 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.90-1
 - Update to 2.23.90
 - Drop upstreamed patches