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

fix a crash with a single workspace

Browse Source
This commit is contained in:
Matthias Clasen 2007-11-12 04:48:10 +00:00
parent c263ca988e
commit 2d39531310
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
metacity.spec
View File

@ -7,12 +7,14 @@
Summary: Metacity window manager
Name: metacity
Version: %{metacity_version}
Release: 3%{?dist}
Release: 4%{?dist}
URL: http://download.gnome.org/sources/metacity/
Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
Patch0: default-theme.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=482354
Patch1: metacity-firefox-workaround-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=496054
Patch2: single-workspace-crash.patch
License: GPLv2+
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -67,6 +69,7 @@ API. This package exists purely for technical reasons.
%setup -q -n %{metacity_filename}
%patch0 -p1 -b .default-theme
%patch1 -p0 -b .firefox-workaround
%patch2 -p1 -b .single-workspace-crash
%build
rm -rf $RPM_BUILD_ROOT
@ -153,6 +156,9 @@ fi
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
* Sun Nov 11 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0-4
- Fix a crash when the number of workspaces is 1
* Thu Oct 18 2007 Colin Walters <walters@redhat.com> - 2.20.0-3
- Add patch to fix workspace behavior when presenting normal windows

19
single-workspace-crash.patch Normal file
View File

@ -0,0 +1,19 @@
diff -up metacity-2.20.0/src/menu.c.single-workspace-crash metacity-2.20.0/src/menu.c
--- metacity-2.20.0/src/menu.c.single-workspace-crash 2007-11-11 23:41:43.000000000 -0500
+++ metacity-2.20.0/src/menu.c 2007-11-11 23:41:52.000000000 -0500
@@ -474,10 +474,12 @@ meta_window_menu_new (MetaFrames
g_free, FALSE, FALSE);
}
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu->menu), mi);
+ if (mi)
+ {
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu->menu), mi);
- gtk_widget_show (mi);
+ gtk_widget_show (mi);
+ }
}
}