diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-10-23 04:27:31 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-10-23 04:27:31 +0000 |
| commit | bb539466d534366137af9f5a27f01f5aa3b12a11 (patch) | |
| tree | f95142d6282f02a9953641b6942f8aee925a8194 | |
| parent | ab9bdf228b25a0b7f8b53d716f27f18830caaacb (diff) | |
| download | metacity-bb539466d534366137af9f5a27f01f5aa3b12a11.tar.gz | |
fix stupid thinko which caused defaults to be incorrect "space" needs to
2008-10-23 Thomas Thurman <tthurman@gnome.org>
* src/core/schema-bindings.c: fix stupid thinko which
caused defaults to be incorrect
* src/include/window-bindings.h: "space" needs to be
lowercase
svn path=/trunk/; revision=3992
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/core/schema-bindings.c | 17 | ||||
| -rw-r--r-- | src/include/window-bindings.h | 2 |
3 files changed, 9 insertions, 17 deletions
@@ -1,5 +1,12 @@ 2008-10-23 Thomas Thurman <tthurman@gnome.org> + * src/core/schema-bindings.c: fix stupid thinko which + caused defaults to be incorrect + * src/include/window-bindings.h: "space" needs to be + lowercase + +2008-10-23 Thomas Thurman <tthurman@gnome.org> + Support _NET_WM_STATE_STICKY (i.e. allow third-party apps to decide whether a window is on all workspaces). Bug found by Ka-Hing Cheung. Closes #557536. diff --git a/src/core/schema-bindings.c b/src/core/schema-bindings.c index e283a9f3..09869bcd 100644 --- a/src/core/schema-bindings.c +++ b/src/core/schema-bindings.c @@ -48,21 +48,6 @@ char *about_keybindings, *about_reversible_keybindings; char *source_filename, *target_filename; FILE *source_file, *target_file; -const char* window_string = \ - " <schema>\n" \ - " <key>/schemas/apps/metacity/%s_keybindings/%s%s</key>\n" \ - " <applyto>/apps/metacity/%s_keybindings/%s%s</applyto>\n" \ - " <owner>metacity</owner>\n" \ - " <type>string</type>\n" \ - " <default>%s</default>\n" \ - " <locale name=\"C\">\n" \ - " <short>%s</short>\n" \ - " <long>\n" \ - " %s %s\n" \ - " </long>\n" \ - " </locale>\n" \ - " </schema>\n\n\n"; - static void single_stanza (gboolean is_window, const char *name, const char *default_value, @@ -77,7 +62,7 @@ single_stanza (gboolean is_window, const char *name, escaped_description = g_markup_escape_text (description, -1); escaped_default_value = default_value==NULL? "disabled": - g_markup_escape_text (description, -1); + g_markup_escape_text (default_value, -1); fprintf (target_file, " <schema>\n"); fprintf (target_file, " <key>/schemas/apps/metacity/%s_keybindings/%s</key>\n", diff --git a/src/include/window-bindings.h b/src/include/window-bindings.h index ba02c63b..a75d5825 100644 --- a/src/include/window-bindings.h +++ b/src/include/window-bindings.h @@ -44,7 +44,7 @@ keybind (activate_window_menu, handle_activate_window_menu, 0, - BINDING_PER_WINDOW, "<Alt>Space", + BINDING_PER_WINDOW, "<Alt>space", _("Activate the window menu")) keybind (toggle_fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW, NULL, |