--- a/ChangeLog	Thu Jul 17 14:03:24 2003 +0000
+++ b/ChangeLog	Thu Jul 17 14:23:15 2003 +0000
@@ -1,3 +1,8 @@
+2003-07-17  Ghee Teo <[email protected]>
+
+	* Merged metacity' ctrl-esc patch with WIndow-R key patch
+	  into metacity-04-ctrl-esc-mod4-r.diff
+
 2003-07-17  Glynn Foster  <[email protected]>
 
 	* gaim.spec: Fix Gaim's menu entry a little bit.

--- a/metacity.spec	Thu Jul 17 14:03:24 2003 +0000
+++ b/metacity.spec	Thu Jul 17 14:23:15 2003 +0000
@@ -2,7 +2,7 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.4.34
-Release:      8
+Release:      9
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      GNOME Window Manager
@@ -11,7 +11,7 @@
 Patch1:       metacity-01-panel-keybindings.diff
 Patch2:       metacity-02-panel-keybindings.diff
 Patch3:       metacity-03-default-theme.diff
-Patch4:       metacity-04-ctrl-escape.diff
+Patch4:       metacity-04-ctrl-esc-mod4-r.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -33,11 +33,11 @@
 Metacity is the window manager for the GNOME Desktop.
 
 %prep
-%setup
+%setup -q
 %patch1
 %patch2
 %patch3 -p1
-%patch4
+%patch4 -p1
 tar -jxf %SOURCE1
 
 %build
@@ -81,6 +81,10 @@
 %{_datadir}/themes/*/metacity-1/*
 
 %changelog
+* Thu Jul 17 2003 - [email protected]
+- Combined the esc-ctrl patch with Mod4 (window) R key
+  patch.
+
 * Thu Jul 10 2003 - [email protected]
 - Added .po tarball
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/metacity-04-ctrl-esc-mod4-r.diff	Thu Jul 17 14:23:15 2003 +0000
@@ -0,0 +1,21 @@
+diff -urN metacity-2.4.34.orig/src/metacity.schemas.in metacity-2.4.34/src/metacity.schemas.in
+--- metacity-2.4.34.orig/src/metacity.schemas.in	2003-07-17 14:21:30.000000000 +0100
++++ metacity-2.4.34/src/metacity.schemas.in	2003-07-17 14:20:54.000000000 +0100
+@@ -1553,7 +1553,7 @@
+       <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto>
+       <owner>metacity</owner>
+       <type>string</type>
+-      <default>&lt;Alt&gt;F1</default>
++      <default>&lt;Control&gt;Escape</default>
+       <locale name="C">
+          <short>Show the panel menu</short>
+          <long>
+@@ -1576,7 +1576,7 @@
+       <applyto>/apps/metacity/global_keybindings/panel_run_dialog</applyto>
+       <owner>metacity</owner>
+       <type>string</type>
+-      <default>&lt;Alt&gt;F2</default>
++      <default>&lt;Mod4&gt;r</default>
+       <locale name="C">
+          <short>Show the panel run dialog</short>
+          <long>

--- a/patches/metacity-04-ctrl-escape.diff	Thu Jul 17 14:03:24 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urNp ../metacity-2.4.34.old/src/metacity.schemas.in ./src/metacity.schemas.in
---- ../metacity-2.4.34.old/src/metacity.schemas.in	2003-07-02 15:31:42.000000000 +0100
-+++ ./src/metacity.schemas.in	2003-07-02 15:33:13.000000000 +0100
-@@ -1553,7 +1553,7 @@ you set
-       <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto>
-       <owner>metacity</owner>
-       <type>string</type>
--      <default>&lt;Alt&gt;F1</default>
-+      <default>&lt;Control&gt;Escape</default>
-       <locale name="C">
-          <short>Show the panel menu</short>
-          <long>