rpms/control-center/devel control-center-2.15.91-compiz-support.patch, 1.3, 1.4 control-center.spec, 1.191, 1.192

[fedora-cvs-commits at redhat.com]

Author: sandmann

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

Modified Files:
	control-center-2.15.91-compiz-support.patch 
	control-center.spec 
Log Message:
Update compiz patch to support raise window and show desktop

control-center-2.15.91-compiz-support.patch:
 common/wm-common.h                        |    1 
 keybindings/gnome-keybinding-properties.c |   81 +++++++++++++++++++++++++++---
 2 files changed, 76 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- control-center-2.15.91-compiz-support.patch	27 Sep 2006 19:59:36 -0000	1.3
+++ control-center-2.15.91-compiz-support.patch	28 Sep 2006 16:21:29 -0000	1.4
@@ -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-27 15:33:11.000000000 -0400
++++ control-center-2.16.0/capplets/keybindings/gnome-keybinding-properties.c	2006-09-28 12:16:02.000000000 -0400
 @@ -42,6 +42,11 @@
    { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
    { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
@@ -12,7 +12,7 @@
    { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
    { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
    { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
-@@ -49,6 +54,18 @@
+@@ -49,6 +54,19 @@
    { "/apps/metacity/global_keybindings/run_command_terminal", ALWAYS_VISIBLE, 0 },
    { NULL }
  };
@@ -25,21 +25,22 @@
 +  COMPIZ_KEY (main_menu_key),
 +  COMPIZ_KEY (run_command_screenshot_key),
 +  COMPIZ_KEY (run_command_window_screenshot_key),
++  COMPIZ_KEY (show_desktop_key),
 +  { NULL }
 +};
 +    
  static const KeyListEntry sounds_key_list[] =
  {
    { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 },
-@@ -64,6 +81,26 @@
+@@ -64,6 +82,26 @@
    { NULL }
  };
  
 +static const KeyListEntry compiz_key_list[] =
 +{
 +  COMPIZ_KEY (close_window_key),
++  COMPIZ_KEY (raise_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),
@@ -58,7 +59,7 @@
  static const KeyListEntry metacity_key_list[] =
  {
    { "/apps/metacity/window_keybindings/activate_window_menu",      ALWAYS_VISIBLE,  0 },
-@@ -453,10 +490,22 @@
+@@ -453,10 +491,22 @@
    i = 0;
    gtk_tree_model_foreach (model, count_rows_foreach, &i);
  
@@ -85,7 +86,7 @@
  
    for (j = 0; keys_list[j].name != NULL; j++)
      {
-@@ -522,7 +571,9 @@
+@@ -522,7 +572,9 @@
  					  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  	}
        i++;
@@ -95,7 +96,7 @@
        if (gconf_schema_get_short_desc (schema))
  	gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
  			    DESCRIPTION_COLUMN,
-@@ -551,14 +602,31 @@
+@@ -551,14 +603,31 @@
  reload_key_entries (gpointer wm_name, GladeXML *dialog)
  {
    clear_old_model (dialog, WID ("shortcut_treeview"));
@@ -130,7 +131,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-27 15:26:43.000000000 -0400
++++ control-center-2.16.0/capplets/common/wm-common.h	2006-09-27 15:36:29.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.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- control-center.spec	27 Sep 2006 19:59:36 -0000	1.191
+++ control-center.spec	28 Sep 2006 16:21:29 -0000	1.192
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.16.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -298,6 +298,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Sep 28 2006 Soren Sandmann <sandmann at redhat.com> - 2.16.0-8
+- Update the compiz-support.patch to support raising of windows (and also
+  show-desktop) (Bug 204129).
+
 * 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).