- merged from DEVEL

Changed files:
    control-center-additional-metacity-keybinding.patch -> 1.2
    control-center-capplet.patch -> 1.6

diff --git a/control-center-additional-metacity-keybinding.patch b/control-center-additional-metacity-keybinding.patch
index f3abef2bd85c74df2c7c79253ea3958d20ea09ad..27a4cae35bfd4d277262cd29be7fb3a8f0757d4d 100644 (file)
--- a/control-center-additional-metacity-keybinding.patch
+++ b/control-center-additional-metacity-keybinding.patch
@@ -1,7 +1,7 @@
-diff -Nuard control-center-2.4.0.orig/capplets/keybindings/gnome-keybinding-properties.c control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c
---- control-center-2.4.0.orig/capplets/keybindings/gnome-keybinding-properties.c       2003-07-25 22:29:26.000000000 +0200
-+++ control-center-2.4.0/capplets/keybindings/gnome-keybinding-properties.c    2003-11-05 00:19:32.000000000 +0100
-@@ -56,6 +56,7 @@
+diff -urN control-center-2.17.92/capplets/keybindings/gnome-keybinding-properties.c control-center-2.17.92.new/capplets/keybindings/gnome-keybinding-properties.c
+--- control-center-2.17.92/capplets/keybindings/gnome-keybinding-properties.c  2007-02-26 20:39:50.000000000 +0100
++++ control-center-2.17.92.new/capplets/keybindings/gnome-keybinding-properties.c      2007-03-03 11:13:11.000000000 +0100
+@@ -77,6 +77,7 @@
    { "/apps/metacity/window_keybindings/begin_resize",              ALWAYS_VISIBLE,  0 },
    { "/apps/metacity/window_keybindings/toggle_on_all_workspaces",  N_WORKSPACES_GT, 1 },
    /* These next three are out of order compared to the schemas file. */
@@ -9,7 +9,7 @@ diff -Nuard control-center-2.4.0.orig/capplets/keybindings/gnome-keybinding-prop
    { "/apps/metacity/window_keybindings/raise_or_lower",            ALWAYS_VISIBLE,  0 },
    { "/apps/metacity/window_keybindings/raise",                     ALWAYS_VISIBLE,  0 },
    { "/apps/metacity/window_keybindings/lower",                     ALWAYS_VISIBLE,  0 },
-@@ -78,9 +79,12 @@
+@@ -99,10 +100,13 @@
    { "/apps/metacity/window_keybindings/move_to_workspace_up",      N_WORKSPACES_GT, 1 },
    { "/apps/metacity/window_keybindings/move_to_workspace_down",    N_WORKSPACES_GT, 1 },
    { "/apps/metacity/global_keybindings/switch_windows",            ALWAYS_VISIBLE,  0 },
@@ -17,6 +17,7 @@ diff -Nuard control-center-2.4.0.orig/capplets/keybindings/gnome-keybinding-prop
    { "/apps/metacity/global_keybindings/switch_panels",             ALWAYS_VISIBLE,  0 },
    { "/apps/metacity/global_keybindings/cycle_windows",             ALWAYS_VISIBLE,  0 },
 +  { "/apps/metacity/global_keybindings/cycle_windows_backward",    ALWAYS_VISIBLE,  0 },
+   { "/apps/metacity/global_keybindings/cycle_group",               ALWAYS_VISIBLE,  0 },
    { "/apps/metacity/global_keybindings/cycle_panels",              ALWAYS_VISIBLE,  0 },
 +  { "/apps/metacity/global_keybindings/cycle_panels_backward",     ALWAYS_VISIBLE,  0 },
    { "/apps/metacity/global_keybindings/show_desktop",              ALWAYS_VISIBLE,  0 },

diff --git a/control-center-capplet.patch b/control-center-capplet.patch
index ed8717f6eca2b58044d8c33eeaa9bc102ae566db..df339c9a233247baa05175c29c6b22b0aa1361fc 100644 (file)
--- a/control-center-capplet.patch
+++ b/control-center-capplet.patch
@@ -5,8 +5,8 @@ diff -aurN control-center-2.13.90.orig/capplets/about-me/gnome-about-me.desktop.
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=GNOME;GTK;Settings;
-+Categories=GTK;GNOME;Settings;X-Capplet;
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
@@ -17,8 +17,8 @@ diff -aurN control-center-2.13.90.orig/capplets/accessibility/at-properties/at-p
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=GNOME;GTK;Settings;Accessibility;
-+Categories=GTK;GNOME;Settings;Accessibility;X-Capplet;
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;Accessibility;X-Capplet;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
@@ -29,8 +29,8 @@ diff -aurN control-center-2.13.90.orig/capplets/accessibility/keyboard/accessibi
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=GNOME;GTK;Settings;Accessibility;
-+Categories=GTK;GNOME;Settings;Accessibility;X-Capplet;
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;Accessibility;X-Capplet;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
@@ -53,8 +53,8 @@ diff -aurN control-center-2.13.90.orig/capplets/default-applications/default-app
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=GNOME;GTK;Settings;
-+Categories=GTK;GNOME;Settings;X-Capplet;
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
@@ -89,8 +89,8 @@ diff -aurN control-center-2.13.90.orig/capplets/keybindings/keybinding.desktop.i
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=GNOME;GTK;Settings;
-+Categories=GTK;GNOME;Settings;X-Capplet;
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center
@@ -125,8 +125,8 @@ diff -aurN control-center-2.13.90.orig/capplets/network/gnome-network-preference
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=GNOME;GTK;Settings;
-+Categories=GTK;GNOME;Settings;X-Capplet;
+-Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;X-Capplet;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=control-center