summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJody Goldberg <jody@gnome.org>2002-08-15 21:59:36 +0000
committerJody Goldberg <jody@src.gnome.org>2002-08-15 21:59:36 +0000
commit368721557cd37aea6c1e95ff861d9fe2a679f762 (patch)
tree9e5ae0fca84d99ee8196c2006bc89e6444617e15
parent4d0044cf19a6039ef9a3502bbf1732e37c14fdd6 (diff)
downloadgnome-control-center-368721557cd37aea6c1e95ff861d9fe2a679f762.tar.gz
Add a pile of missing metacity bindings.
2002-08-15 Jody Goldberg <jody@gnome.org> * gnome-keybinding-properties.c : Add a pile of missing metacity bindings.
-rw-r--r--capplets/keybindings/ChangeLog4
-rw-r--r--capplets/keybindings/gnome-keybinding-properties.c18
-rw-r--r--gnome-settings-daemon/gnome-settings-wm.c3
3 files changed, 24 insertions, 1 deletions
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 71ff7f238..ec43edd44 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-15 Jody Goldberg <jody@gnome.org>
+
+ * gnome-keybinding-properties.c : Add a pile of missing metacity
+ bindings.
2002-08-10 Jody Goldberg <jody@gnome.org>
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 4bb1eb0e1..9a3441029 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -49,8 +49,14 @@ const KeyListEntry metacity_key_list[] =
{ "/apps/metacity/window_keybindings/toggle_maximized", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/window_keybindings/toggle_shaded", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/window_keybindings/close", ALWAYS_VISIBLE, 0 },
+ { "/apps/metacity/window_keybindings/minimize", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/window_keybindings/begin_move", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/window_keybindings/begin_resize", ALWAYS_VISIBLE, 0 },
+ { "/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 },
+ { "/apps/metacity/window_keybindings/cycle_windows", ALWAYS_VISIBLE, 0 },
+ { "/apps/metacity/window_keybindings/cycle_panels", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/window_keybindings/toggle_on_all_workspaces", N_WORKSPACES_GT, 1 },
{ "/apps/metacity/window_keybindings/move_to_workspace_1", N_WORKSPACES_GT, 1 },
{ "/apps/metacity/window_keybindings/move_to_workspace_2", N_WORKSPACES_GT, 1 },
@@ -88,6 +94,18 @@ const KeyListEntry metacity_key_list[] =
{ "/apps/metacity/global_keybindings/switch_to_workspace_right", N_WORKSPACES_GT, 1 },
{ "/apps/metacity/global_keybindings/switch_to_workspace_up", N_WORKSPACES_GT, 1 },
{ "/apps/metacity/global_keybindings/switch_to_workspace_down", N_WORKSPACES_GT, 1 },
+ { "/apps/metacity/global_keybindings/run_command_1", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_2", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_3", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_4", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_5", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_6", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_7", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_8", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_9", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_10", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_11", ALWAYS_VISIBLE, 1 },
+ { "/apps/metacity/global_keybindings/run_command_12", ALWAYS_VISIBLE, 1 },
{ NULL }
};
diff --git a/gnome-settings-daemon/gnome-settings-wm.c b/gnome-settings-daemon/gnome-settings-wm.c
index c26a498ed..8d80a5a38 100644
--- a/gnome-settings-daemon/gnome-settings-wm.c
+++ b/gnome-settings-daemon/gnome-settings-wm.c
@@ -100,6 +100,7 @@ gnome_settings_wm_init (GConfClient *client)
void
gnome_settings_wm_load (GConfClient *client)
{
-
+ set_number_of_workspaces (gconf_client_get_int (client, "/desktop/gnome/applications/window_manager/number_of_workspaces", NULL));
+ set_workspace_names (gconf_client_get_list (client, "/desktop/gnome/applications/window_manager/workspace_names", GCONF_VALUE_LIST, NULL));
}