diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-09-03 14:43:49 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2009-09-04 18:25:39 -0400 |
| commit | 0b86343dd080d8cc9ab8dc88f9478ebb0baeb040 (patch) | |
| tree | 209fc8535f3c825f8c83fb0b7220de3a7326f445 | |
| parent | 51f83f25e62d072f12e89a4995dc73e028e87ad1 (diff) | |
| download | mutter-0b86343dd080d8cc9ab8dc88f9478ebb0baeb040.tar.gz | |
Export a _GNOME_WM_KEYBINDINGS property
We need a way to indicate to gnome-control-center that we want the
keybindings capplet to show the Window Manager keybindings for Metacity;
do this through a _GNOME_WM_KEYBINDING property we put on the
_NET_SUPPORTING_WM_CHECK window and set to Mutter,Metacity.
See http://bugzilla.gnome.org/show_bug.cgi?id=594066 for the
gnome-control-center part of this.
http://bugzilla.gnome.org/show_bug.cgi?id=594067
| -rw-r--r-- | src/core/display.c | 7 | ||||
| -rw-r--r-- | src/include/atomnames.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/display.c b/src/core/display.c index 0f92edba0..f21e563f3 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -722,6 +722,13 @@ meta_display_open (void) the_display->leader_window, the_display->atom__NET_WM_NAME, "Mutter"); + + /* The GNOME keybindings capplet should include both the Mutter and Metacity + * keybindings */ + meta_prop_set_utf8_string_hint (the_display, + the_display->leader_window, + the_display->atom__GNOME_WM_KEYBINDINGS, + "Mutter,Metacity"); meta_prop_set_utf8_string_hint (the_display, the_display->leader_window, diff --git a/src/include/atomnames.h b/src/include/atomnames.h index 38ece9705..b5fbfb91b 100644 --- a/src/include/atomnames.h +++ b/src/include/atomnames.h @@ -58,6 +58,7 @@ item(_MUTTER_RESTART_MESSAGE) item(_MUTTER_RELOAD_THEME_MESSAGE) item(_MUTTER_SET_KEYBINDINGS_MESSAGE) item(_MUTTER_TOGGLE_VERBOSE) +item(_GNOME_WM_KEYBINDINGS) item(_GNOME_PANEL_ACTION) item(_GNOME_PANEL_ACTION_MAIN_MENU) item(_GNOME_PANEL_ACTION_RUN_DIALOG) |