rpms/control-center/devel control-center-2.15.91-compiz-support.patch, 1.1, 1.2 control-center.spec, 1.189, 1.190

[fedora-cvs-commits at redhat.com]

Author: sandmann

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

Modified Files:
	control-center-2.15.91-compiz-support.patch 
	control-center.spec 
Log Message:
Update compiz patch to support more keybindings

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.15.91-compiz-support.patch	22 Aug 2006 19:54:48 -0000	1.1
+++ control-center-2.15.91-compiz-support.patch	26 Sep 2006 22:29:55 -0000	1.2
@@ -1,11 +1,40 @@
---- 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 @@
+--- 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
+@@ -42,6 +42,11 @@
+   { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
++  { NULL }
++};
++
++static const KeyListEntry desktop_key_list_metacity[] =
++{
+   { "/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 @@
+   { "/apps/metacity/global_keybindings/run_command_terminal", ALWAYS_VISIBLE, 0 },
    { NULL }
  };
- 
++    
 +#define COMPIZ_KEY(k) { "/apps/compiz/general/allscreens/options/" #k, ALWAYS_VISIBLE, 0 }
 +
++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),
++  { NULL }
++};
++    
+ static const KeyListEntry sounds_key_list[] =
+ {
+   { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 },
+@@ -64,6 +81,26 @@
+   { NULL }
+ };
+ 
 +static const KeyListEntry compiz_key_list[] =
 +{
 +  COMPIZ_KEY (close_window),
@@ -29,7 +58,67 @@
  static const KeyListEntry metacity_key_list[] =
  {
    { "/apps/metacity/window_keybindings/activate_window_menu",      ALWAYS_VISIBLE,  0 },
-@@ -559,6 +581,10 @@
+@@ -453,10 +490,22 @@
+   i = 0;
+   gtk_tree_model_foreach (model, count_rows_foreach, &i);
+ 
+-  gtk_tree_store_append (GTK_TREE_STORE (model), &parent_iter, NULL);
+-  gtk_tree_store_set (GTK_TREE_STORE (model), &parent_iter,
+-  		      DESCRIPTION_COLUMN, title,
+-  		      -1);
++  if (title)
++    {
++      gtk_tree_store_append (GTK_TREE_STORE (model), &parent_iter, NULL);
++
++      gtk_tree_store_set (GTK_TREE_STORE (model), &parent_iter,
++			  DESCRIPTION_COLUMN, title,
++			  -1);
++    }
++  else
++    {
++      if (gtk_tree_model_get_iter_first (model, &parent_iter))
++	while (gtk_tree_model_iter_next (model, &parent_iter))
++	  ;
++      else
++	return;
++    }
+ 
+   for (j = 0; keys_list[j].name != NULL; j++)
+     {
+@@ -522,7 +571,9 @@
+ 					  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ 	}
+       i++;
++
+       gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent_iter);
++      
+       if (gconf_schema_get_short_desc (schema))
+ 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
+ 			    DESCRIPTION_COLUMN,
+@@ -551,14 +602,31 @@
+ reload_key_entries (gpointer wm_name, GladeXML *dialog)
+ {
+   clear_old_model (dialog, WID ("shortcut_treeview"));
+-  
++
++  /* Desktop keybindings */
+   append_keys_to_tree (dialog, _("Desktop"), desktop_key_list);
++
++  if (strcmp ((char *) wm_name, WM_COMMON_METACITY) == 0)
++    {
++      append_keys_to_tree (dialog, NULL, desktop_key_list_metacity);
++    }
++  else if (strcmp ((char *) wm_name, WM_COMMON_COMPIZ) == 0)
++    {
++      append_keys_to_tree (dialog, NULL, desktop_key_list_compiz);
++    }
++
++  /* Sound keybindings */
+   append_keys_to_tree (dialog, _("Sound"), sounds_key_list);
+-  
++
++  /* Window management */
+   if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0)
      {
        append_keys_to_tree (dialog, _("Window Management"), metacity_key_list);
      }
@@ -40,8 +129,8 @@
  }
  
  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
+--- 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
 @@ -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.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- control-center.spec	20 Sep 2006 01:24:17 -0000	1.189
+++ control-center.spec	26 Sep 2006 22:29:55 -0000	1.190
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.16.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -298,6 +298,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* 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.
+
 * Tue Sep 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.16.0-5
 - Update the Orca patch