rpms/metacity
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a possible crash in the appearance capplet with invalid metacity themes

Browse Source 
(launchpad #199402)
This commit is contained in:
Matthias Clasen 2008-04-24 05:07:26 +00:00
parent c6249b13fe
commit a336c6a98a
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
metacity-theme-crash.patch Normal file
View File

@ -0,0 +1,39 @@
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);

10
metacity.spec
View File

@ -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 @@ Patch2: skip-taskbar-tab.patch
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 @@ API. This package exists purely for technical reasons.
%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 @@ fi
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
* Thu Apr 24 2008 Matthias Clasen <mclasen@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@redhat.com> - 2.22.0-2
- Add patch to fix focus of keep-above windows
http://bugzilla.gnome.org/show_bug.cgi?id=519188