rpms/gnome-utils/F-12 selfshot.patch, NONE, 1.1 gnome-utils.spec, 1.207, 1.208

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28885

Modified Files:
	gnome-utils.spec 
Added Files:
	selfshot.patch 
Log Message:
Fix a crash


selfshot.patch:
 screenshot-utils.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE selfshot.patch ---
diff -up gnome-utils-2.28.1/gnome-screenshot/screenshot-utils.c.segfault gnome-utils-2.28.1/gnome-screenshot/screenshot-utils.c
--- gnome-utils-2.28.1/gnome-screenshot/screenshot-utils.c.segfault	2009-11-24 18:27:30.147717368 -0500
+++ gnome-utils-2.28.1/gnome-screenshot/screenshot-utils.c	2009-11-24 18:27:33.428463721 -0500
@@ -231,7 +231,7 @@ screenshot_find_current_window ()
   GdkWindow *current_window;
 
   current_window = screenshot_find_active_window ();
-  
+
   /* If there's no active window, we fall back to returning the
    * window that the cursor is in.
    */
@@ -241,13 +241,16 @@ screenshot_find_current_window ()
   if (current_window)
     {
       if (screenshot_window_is_desktop (current_window))
-	/* if the current window is the desktop (e.g. nautilus), we
+        /* if the current window is the desktop (e.g. nautilus), we
 	 * return NULL, as getting the whole screen makes more sense.
          */
         return NULL;
 
       /* Once we have a window, we take the toplevel ancestor. */
       current_window = gdk_window_get_toplevel (current_window);
+
+      if (!gdk_window_ensure_native (current_window))
+        return NULL;
     }
 
   return current_window;


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/gnome-utils.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- gnome-utils.spec	25 Oct 2009 23:44:48 -0000	1.207
+++ gnome-utils.spec	24 Nov 2009 23:47:27 -0000	1.208
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.28.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -20,6 +20,8 @@ Source0:        http://download.gnome.or
 
 Patch0:		spinner.patch
 Patch1:		0001-gsearchtool-Backport-the-version-fix.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=597435
+Patch2:		selfshot.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,6 +92,7 @@ view various system log files.
 %setup -q
 %patch0 -p1 -b .spinner
 %patch1 -p1 -b .version
+%patch2 -p1 -b .selfshot
 
 # Hide from menus
 pushd gsearchtool
@@ -318,8 +321,11 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Tue Nov 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-4
+- Avoid segfault with gnome-screenshot self-portraits (#541006)
+
 * Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-3
-- Fxi the --version command (#516491)
+- Fix the --version command (#516491)
 
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-2
 - Fix the gsearchtool spinner