Copy F12 work over

This commit is contained in:
Matthias Clasen 2009-11-02 05:59:45 +00:00
parent 041f42fef1
commit 3e263b8c06
3 changed files with 53 additions and 12 deletions

View File

@ -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:

View File

@ -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

40
unknown-key.patch Normal file
View File

@ -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"/>