r10199 - in /desktop/experimental/control-center/debian: changelog patches/36-compiz-keybindings-support.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Apr 22 11:24:19 2007
New Revision: 10199

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10199
Log:
* New patch, 36-compiz-keybindings-support, permits configuring keybindings
  when using compiz as window manager; from the Ubuntu package.

Added:
    desktop/experimental/control-center/debian/patches/36-compiz-keybindings-support.patch
Modified:
    desktop/experimental/control-center/debian/changelog

Modified: desktop/experimental/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/changelog?rev=10199&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/changelog (original)
+++ desktop/experimental/control-center/debian/changelog Sun Apr 22 11:24:19 2007
@@ -46,8 +46,10 @@
     - Rename patch 05_autotools to 70_relibtoolize and update it.
     - New patch, 90_workaround_gnome_doc_utils_bug, works around a build
       failure with newer gnome-doc-utils; from the Ubuntu package.
-
- -- Loic Minier <lool at dooz.org>  Sun, 22 Apr 2007 13:19:26 +0200
+  * New patch, 36-compiz-keybindings-support, permits configuring keybindings
+    when using compiz as window manager; from the Ubuntu package.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 22 Apr 2007 13:23:44 +0200
 
 control-center (1:2.16.3-1) experimental; urgency=low
 

Added: desktop/experimental/control-center/debian/patches/36-compiz-keybindings-support.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/36-compiz-keybindings-support.patch?rev=10199&op=file
==============================================================================
--- desktop/experimental/control-center/debian/patches/36-compiz-keybindings-support.patch (added)
+++ desktop/experimental/control-center/debian/patches/36-compiz-keybindings-support.patch Sun Apr 22 11:24:19 2007
@@ -1,0 +1,23 @@
+diff -ruN control-center-2.17.91/capplets/common/wm-common.h control-center-2.17.91.new/capplets/common/wm-common.h
+--- control-center-2.17.91/capplets/common/wm-common.h	2007-01-02 13:47:02.000000000 +0100
++++ control-center-2.17.91.new/capplets/common/wm-common.h	2007-02-18 14:56:08.000000000 +0100
+@@ -3,6 +3,7 @@
+ 
+ #define WM_COMMON_METACITY "Metacity"
+ #define WM_COMMON_SAWFISH  "Sawfish"
++#define WM_COMMON_COMPIZ "compiz"
+ #define WM_COMMON_UNKNOWN  "Unknown"
+ 
+ gchar *wm_common_get_current_window_manager (void);
+diff -ruN control-center-2.17.91/capplets/keybindings/gnome-keybinding-properties.c control-center-2.17.91.new/capplets/keybindings/gnome-keybinding-properties.c
+--- control-center-2.17.91/capplets/keybindings/gnome-keybinding-properties.c	2007-02-12 10:28:24.000000000 +0100
++++ control-center-2.17.91.new/capplets/keybindings/gnome-keybinding-properties.c	2007-02-18 14:55:20.000000000 +0100
+@@ -568,7 +568,7 @@
+   append_keys_to_tree (dialog, _("Desktop"), desktop_key_list);
+   append_keys_to_tree (dialog, _("Sound"), sounds_key_list);
+   
+-  if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0)
++  if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0 || strcmp((char *) wm_name, WM_COMMON_COMPIZ) == 0)
+     {
+       append_keys_to_tree (dialog, _("Window Management"), metacity_key_list);
+     }