rpms/control-center/devel control-center-2.15.91-compiz-support.patch, NONE, 1.1 control-center.spec, 1.171, 1.172

[fedora-cvs-commits at redhat.com]

Author: sandmann

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

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.91-compiz-support.patch 
Log Message:
* Tue Aug 22 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.91-6.fc6
- Add support for compiz in keybinding dialog.



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

--- NEW FILE control-center-2.15.91-compiz-support.patch ---
--- control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c.orig	2006-08-15 18:56:34.000000000 -0400
+++ control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c	2006-08-15 18:56:45.000000000 -0400
@@ -64,6 +64,28 @@
   { NULL }
 };
 
+#define COMPIZ_KEY(k) { "/apps/compiz/general/allscreens/options/" #k, ALWAYS_VISIBLE, 0 }
+
+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),
+};
+
 static const KeyListEntry metacity_key_list[] =
 {
   { "/apps/metacity/window_keybindings/activate_window_menu",      ALWAYS_VISIBLE,  0 },
@@ -559,6 +581,10 @@
     {
       append_keys_to_tree (dialog, _("Window Management"), metacity_key_list);
     }
+  else if (strcmp((char *) wm_name, WM_COMMON_COMPIZ) == 0)
+    {
+      append_keys_to_tree (dialog, _("Window Management"), compiz_key_list);
+    }
 }
 
 static void
--- control-center-2.15.91/capplets/common/wm-common.h.orig	2006-08-15 18:56:14.000000000 -0400
+++ control-center-2.15.91/capplets/common/wm-common.h	2006-08-15 18:56:45.000000000 -0400
@@ -2,6 +2,7 @@
 #define WM_COMMON_H
 
 #define WM_COMMON_METACITY "Metacity"
+#define WM_COMMON_COMPIZ   "compiz"
 #define WM_COMMON_SAWFISH  "Sawfish"
 #define WM_COMMON_UNKNOWN  "Unknown"
 


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- control-center.spec	21 Aug 2006 16:36:12 -0000	1.171
+++ control-center.spec	22 Aug 2006 19:54:48 -0000	1.172
@@ -39,6 +39,7 @@
 Patch10: control-center-2.15.4-finish.patch
 Patch11: control-center-2.15.91-search.patch
 Patch12: control-center-2.15.91-fix-thumbnailing.patch
+Patch13: control-center-2.15.91-compiz-support.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -135,6 +136,7 @@
 %patch10 -p1 -b .finish
 %patch11 -p1 -b .search
 %patch12 -p1 -b .fix-thumbnailing
+%patch13 -p1 -b .compiz-support.patch
 
 %build
 
@@ -272,6 +274,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug 22 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.91-6.fc6
+- Add support for compiz in keybinding dialog.
+
 * Mon Aug 21 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-5.fc6
 - When creating new thumbnails, record thumbnail location rather
   that regenerating them over and over again.