summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--metacity.spec8
-rw-r--r--title-click.patch11
2 files changed, 18 insertions, 1 deletions
diff --git a/metacity.spec b/metacity.spec
index 5d7081f..4ed457f 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -3,7 +3,7 @@
Summary: Unobtrusive window manager
Name: metacity
Version: 2.30.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://download.gnome.org/sources/metacity/
Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -39,6 +39,8 @@ Patch24: metacity-2.28-empty-keybindings.patch
Patch25: metacity-2.28-xioerror-unknown-display.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=611260
Patch26: libs.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=614592
+Patch27: title-click.patch
License: GPLv2+
Group: User Interface/Desktops
@@ -115,6 +117,7 @@ API. This package exists purely for technical reasons.
%patch24 -p1 -b .empty-keybindings
%patch25 -p1 -b .xioerror-unknown-display
%patch26 -p1 -b .libs
+%patch27 -p1 -b .title-click
# force regeneration
rm src/metacity.schemas
@@ -222,6 +225,9 @@ fi
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
+* Mon Apr 5 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-2
+- Don't crash on titlebar right-click
+
* Wed Mar 31 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
- Update to 2.30.0
diff --git a/title-click.patch b/title-click.patch
new file mode 100644
index 0000000..9c42aa4
--- /dev/null
+++ b/title-click.patch
@@ -0,0 +1,11 @@
+--- metacity-2.30.0/src/core/core.c.orig 2010-03-31 21:37:39.000000000 +0100
++++ metacity-2.30.0/src/core/core.c 2010-04-01 15:59:26.000000000 +0100
+@@ -520,7 +520,7 @@ meta_core_get_menu_accelerator (MetaMenu
+ switch (menu_op)
+ {
+ case META_MENU_OP_NONE:
+- name = "none";
++ /* No keybinding for this one */
+ break;
+ case META_MENU_OP_DELETE:
+ name = "close";