diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2007-11-12 04:48:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2007-11-12 04:48:10 +0000 |
| commit | 2d39531310bbfba12666a089dfcce2127bc8541b (patch) | |
| tree | e97b86955804cee5f98dac881a7ff1c4aead4d72 | |
| parent | c263ca988eb1ae0664b73c1e3b72f45ec0b5a214 (diff) | |
| download | metacity-2d39531310bbfba12666a089dfcce2127bc8541b.tar.gz metacity-2d39531310bbfba12666a089dfcce2127bc8541b.tar.xz metacity-2d39531310bbfba12666a089dfcce2127bc8541b.zip | |
fix a crash with a single workspacemetacity-2_20_0-4_fc9
| -rw-r--r-- | metacity.spec | 8 | ||||
| -rw-r--r-- | single-workspace-crash.patch | 19 |
2 files changed, 26 insertions, 1 deletions
diff --git a/metacity.spec b/metacity.spec index a26a825..6581419 100644 --- a/metacity.spec +++ b/metacity.spec @@ -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 diff --git a/single-workspace-crash.patch b/single-workspace-crash.patch new file mode 100644 index 0000000..1dbe176 --- /dev/null +++ b/single-workspace-crash.patch @@ -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); ++ } + } + } + |