rpms/control-center/devel control-center-2.15.91-compiz-support.patch, 1.2, 1.3 control-center.spec, 1.190, 1.191

[fedora-cvs-commits at redhat.com]

Author: sandmann

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22384

Modified Files:
	control-center-2.15.91-compiz-support.patch 
	control-center.spec 
Log Message:
Fix gconf keys for compiz key bindings

control-center-2.15.91-compiz-support.patch:
 common/wm-common.h                        |    1 
 keybindings/gnome-keybinding-properties.c |   80 +++++++++++++++++++++++++++---
 2 files changed, 75 insertions(+), 6 deletions(-)

Index: control-center-2.15.91-compiz-support.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.15.91-compiz-support.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- control-center-2.15.91-compiz-support.patch	26 Sep 2006 22:29:55 -0000	1.2
+++ control-center-2.15.91-compiz-support.patch	27 Sep 2006 19:59:36 -0000	1.3
@@ -1,5 +1,5 @@
 --- control-center-2.16.0/capplets/keybindings/gnome-keybinding-properties.c.compiz-support	2006-07-27 07:42:45.000000000 -0400
-+++ control-center-2.16.0/capplets/keybindings/gnome-keybinding-properties.c	2006-09-26 18:25:23.000000000 -0400
++++ control-center-2.16.0/capplets/keybindings/gnome-keybinding-properties.c	2006-09-27 15:33:11.000000000 -0400
 @@ -42,6 +42,11 @@
    { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
    { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
@@ -21,10 +21,10 @@
 +
 +static const KeyListEntry desktop_key_list_compiz[] =
 +{
-+  COMPIZ_KEY (run),
-+  COMPIZ_KEY (main_menu),
-+  COMPIZ_KEY (run_command_screenshot),
-+  COMPIZ_KEY (run_command_window_screenshot),
++  COMPIZ_KEY (run_key),
++  COMPIZ_KEY (main_menu_key),
++  COMPIZ_KEY (run_command_screenshot_key),
++  COMPIZ_KEY (run_command_window_screenshot_key),
 +  { NULL }
 +};
 +    
@@ -37,22 +37,22 @@
  
 +static const KeyListEntry compiz_key_list[] =
 +{
-+  COMPIZ_KEY (close_window),
-+  COMPIZ_KEY (lower_window),
-+  COMPIZ_KEY (main_menu),
-+  COMPIZ_KEY (maximize_window),
-+  COMPIZ_KEY (maximize_window_horizontally),
-+  COMPIZ_KEY (maximize_window_vertically),
-+  COMPIZ_KEY (minimize_window),
-+  COMPIZ_KEY (opacity_decrease),
-+  COMPIZ_KEY (opacity_increase),
-+  COMPIZ_KEY (show_desktop),
-+  COMPIZ_KEY (toggle_window_maximized),
-+  COMPIZ_KEY (toggle_window_maximized_horizontally),
-+  COMPIZ_KEY (toggle_window_maximized_vertically),
-+  COMPIZ_KEY (toggle_window_shaded),
-+  COMPIZ_KEY (unmaximize_window),
-+  COMPIZ_KEY (window_menu),
++  COMPIZ_KEY (close_window_key),
++  COMPIZ_KEY (lower_window_key),
++  COMPIZ_KEY (main_menu_key),
++  COMPIZ_KEY (maximize_window_key),
++  COMPIZ_KEY (maximize_window_horizontally_key),
++  COMPIZ_KEY (maximize_window_vertically_key),
++  COMPIZ_KEY (minimize_window_key),
++  COMPIZ_KEY (opacity_decrease_key),
++  COMPIZ_KEY (opacity_increase_key),
++  COMPIZ_KEY (show_desktop_key),
++  COMPIZ_KEY (toggle_window_maximized_key),
++  COMPIZ_KEY (toggle_window_maximized_horizontally_key),
++  COMPIZ_KEY (toggle_window_maximized_vertically_key),
++  COMPIZ_KEY (toggle_window_shaded_key),
++  COMPIZ_KEY (unmaximize_window_key),
++  COMPIZ_KEY (window_menu_key),
 +};
 +
  static const KeyListEntry metacity_key_list[] =
@@ -130,7 +130,7 @@
  
  static void
 --- control-center-2.16.0/capplets/common/wm-common.h.compiz-support	2002-06-21 09:29:29.000000000 -0400
-+++ control-center-2.16.0/capplets/common/wm-common.h	2006-09-26 17:46:31.000000000 -0400
++++ control-center-2.16.0/capplets/common/wm-common.h	2006-09-27 15:26:43.000000000 -0400
 @@ -2,6 +2,7 @@
  #define WM_COMMON_H
  


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- control-center.spec	26 Sep 2006 22:29:55 -0000	1.190
+++ control-center.spec	27 Sep 2006 19:59:36 -0000	1.191
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.16.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -298,6 +298,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 27 2006 Soren Sandmann <sandmann at redhat.com> - 2.16.0-7
+- Update the compiz-support.patch to use the correct gconf keys for
+  the compiz keyboard bindings. (Bug 204094).
+
 * Tue Sep 26 2006 Soren Sandmann <sandmann at redhat.com> - 2.16.0-6
 - Update the compiz-support patch to also make the "Desktop" keybindings
   work. Bug 200290.