rpms/metacity/devel metacity-theme-crash.patch, NONE, 1.1 metacity.spec, 1.149, 1.150

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8718

Modified Files:
	metacity.spec 
Added Files:
	metacity-theme-crash.patch 
Log Message:
Fix a possible crash in the appearance capplet with
  invalid metacity themes (launchpad #199402)



metacity-theme-crash.patch:

--- NEW FILE metacity-theme-crash.patch ---
Index: src/ui/preview-widget.c
===================================================================
--- src/ui/preview-widget.c	(revision 3666)
+++ src/ui/preview-widget.c	(working copy)
@@ -478,6 +478,19 @@
 
   flags = (META_PREVIEW (preview)->flags);
 
+  window_xregion = gdk_region_new ();
+
+  xrect.x = 0;
+  xrect.y = 0;
+  xrect.width = new_window_width;
+  xrect.height = new_window_height;
+
+  gdk_region_union_with_rect (window_xregion, &xrect);
+
+  if (preview->theme == NULL)
+    return window_xregion;
+
+  /* Otherwise, we do have a theme, so calculate the corners */
   frame_style = meta_theme_get_frame_style (preview->theme,
       META_FRAME_TYPE_NORMAL, flags);
 
@@ -558,14 +571,6 @@
         }
     }
 
-  window_xregion = gdk_region_new ();
-
-  xrect.x = 0;
-  xrect.y = 0;
-  xrect.width = new_window_width;
-  xrect.height = new_window_height;
-
-  gdk_region_union_with_rect (window_xregion, &xrect);
   gdk_region_subtract (window_xregion, corners_xregion);
   gdk_region_destroy (corners_xregion);
 


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- metacity.spec	12 Mar 2008 18:26:13 -0000	1.149
+++ metacity.spec	24 Apr 2008 05:07:26 -0000	1.150
@@ -1,7 +1,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
@@ -11,6 +11,9 @@
 Patch3: metacity-2.21.13-dont-move-windows.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=519188
 Patch4: metacity-2.22.0-keepabove.patch
+# fixed in upstream svn
+Patch5: metacity-theme-crash.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +71,7 @@
 %patch2 -p1 -b .skip-taskbar-tab
 %patch3 -p0 -b .dont-move-windows
 %patch4 -p0 -b .keepabove
+%patch5 -p0 -b .theme-crash
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -154,6 +158,10 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Apr 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
+- Fix a possible crash in the appearance capplet with
+  invalid metacity themes (launchpad #199402)
+
 * Wed Mar 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 2.22.0-2
 - Add patch to fix focus of keep-above windows
   http://bugzilla.gnome.org/show_bug.cgi?id=519188