From 3e263b8c0625605bacf7682754dead1f067a970a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 2 Nov 2009 05:59:45 +0000
Subject: [PATCH] Copy F12 work over

---
 compiz-0.3.6-wnck-modal-window.patch | 10 -------
 compiz.spec                          | 15 +++++++++--
 unknown-key.patch                    | 40 ++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 12 deletions(-)
 delete mode 100644 compiz-0.3.6-wnck-modal-window.patch
 create mode 100644 unknown-key.patch

diff --git a/compiz-0.3.6-wnck-modal-window.patch b/compiz-0.3.6-wnck-modal-window.patch
deleted file mode 100644
index 3ea5c91..0000000
--- a/compiz-0.3.6-wnck-modal-window.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- compiz-0.3.6/gtk/window-decorator/gtk-window-decorator.c.wnck-modal-window	2007-06-05 01:25:00.000000000 -0400
-+++ compiz-0.3.6/gtk/window-decorator/gtk-window-decorator.c	2007-06-05 01:25:05.000000000 -0400
-@@ -4085,7 +4085,6 @@ action_menu_map (WnckWindow *win,
- 	return;
-     case WNCK_WINDOW_NORMAL:
-     case WNCK_WINDOW_DIALOG:
--    case WNCK_WINDOW_MODAL_DIALOG:
-     case WNCK_WINDOW_TOOLBAR:
-     case WNCK_WINDOW_MENU:
-     case WNCK_WINDOW_UTILITY:
diff --git a/compiz.spec b/compiz.spec
index 3cbc859..b48681b 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        15%{?dist}
+Release:        18%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,8 @@ Patch125: compiz-0.8.2-gnome-terminal.patch
 #Fix build
 Patch126: compiz-0.8.2-gconf-buildfix.patch
 
+Patch127: unknown-key.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -137,6 +139,7 @@ and other kde integration related stuff.
 %patch123 -p1 -b .initial-plugins
 %patch125 -p1 -b .gnome-terminal
 %patch126 -p1 -b .gconf
+%patch127 -p1 -b .unknown-key
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -217,7 +220,6 @@ for f in %{gnome_plugins}; do
   echo %{_datadir}/compiz/$f.xml
 done >> gnome-files.txt
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -316,6 +318,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen@redhat.com> - 0.8.2-18
+- Better fix for keybindings
+
+* Mon Oct 26 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-17
+- Fix was wrong - revert it
+
+* Mon Oct 26 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-16
+- Don't ship broken keybindings files RH #530603
+
 * Mon Sep 21 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-15
 - Revert pageflip patch
 
diff --git a/unknown-key.patch b/unknown-key.patch
new file mode 100644
index 0000000..7212a4c
--- /dev/null
+++ b/unknown-key.patch
@@ -0,0 +1,40 @@
+diff -up compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in
+--- compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key	2009-10-26 19:31:49.714797414 -0400
++++ compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in	2009-10-26 19:32:47.250797450 -0400
+@@ -1,16 +1,16 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
+ 
+-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_key"/>
++	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_key"/>
+ 
+-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/main_menu_key"/>
++	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/main_menu_key"/>
+ 
+-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_screenshot_key"/>
++	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_screenshot_key"/>
+ 
+-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
++	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
+ 
+ 	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
+ 
+-        <KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_terminal_key"/>
++        <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_terminal_key"/>
+ 
+ </KeyListEntries>
+diff -up compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in
+--- compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key	2009-10-26 19:33:00.669802869 -0400
++++ compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in	2009-10-26 19:47:07.630802031 -0400
+@@ -15,9 +15,9 @@
+ 
+ 	<KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
+ 
+-	<KeyListEntry name="/apps/compiz/general/allscreens/options/opacity_decrease_key"/>
++	<KeyListEntry name="/apps/compiz/plugins/obs/allscreens/options/opacity_decrease_key"/>
+ 
+-	<KeyListEntry name="/apps/compiz/general/allscreens/options/opacity_increase_key"/>
++	<KeyListEntry name="/apps/compiz/plugins/obs/allscreens/options/opacity_increase_key"/>
+ 
+ 	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
+