diff options
author | Owen Taylor <otaylor@fedoraproject.org> | 2009-12-10 23:33:00 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@fedoraproject.org> | 2009-12-10 23:33:00 +0000 |
commit | 97b03230fda37fecb08ffb38d83e33d4c86aa7be (patch) | |
tree | f7068621f9cd94d5ccbf2672a0ec44133e8b85e7 /metacity-2.28-empty-keybindings.patch | |
parent | 2486a74f9da9245d4fe5cdf4a7cc880c49798fd5 (diff) | |
download | metacity-97b03230fda37fecb08ffb38d83e33d4c86aa7be.tar.gz metacity-97b03230fda37fecb08ffb38d83e33d4c86aa7be.tar.xz metacity-97b03230fda37fecb08ffb38d83e33d4c86aa7be.zip |
- Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455,metacity-2_28_0-13_fc13
Stijn Hoop)
- Add patches for GNOME bugs
445447 - Application-induced window raise fails when raise_on_click off
(rhbz 526045)
530702 - compiz doesn't start if metacity compositor is enabled (rhbz
537791)
559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz
503522)
577576 - Failed to read saved session file warning on new sessions (rhbz
493245)
598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz
530261)
599248 - Add no_focus_windows preference to list windows that shouldn't be
focused (rhbz 530262)
599261 - Add a new_windows_always_on_top preference (rhbz 530263)
599262 - Add XFCE Terminal as a terminal
604319 - XIOError unknown display (rhbz 537845)
Diffstat (limited to 'metacity-2.28-empty-keybindings.patch')
-rw-r--r-- | metacity-2.28-empty-keybindings.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/metacity-2.28-empty-keybindings.patch b/metacity-2.28-empty-keybindings.patch new file mode 100644 index 0000000..cc76a9b --- /dev/null +++ b/metacity-2.28-empty-keybindings.patch @@ -0,0 +1,39 @@ +From 599f25e51d967febddb4de3aa21db4258356a9f9 Mon Sep 17 00:00:00 2001 +From: Owen W. Taylor <otaylor@fishsoup.net> +Date: Fri, 20 Nov 2009 10:19:03 -0500 +Subject: [PATCH] Accept an empty string as well as "disabled" for keybindings + +Treat the empty string the same as "disabled" for GConf keybinding +keys. gnome-keybinding-properties was changed to write disabled +keys as the empty string a year or so ago. + +https://bugzilla.gnome.org/show_bug.cgi?id=559816 +--- + src/ui/ui.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ui/ui.c b/src/ui/ui.c +index 6df289f..1e68df0 100644 +--- a/src/ui/ui.c ++++ b/src/ui/ui.c +@@ -765,7 +765,7 @@ meta_ui_parse_accelerator (const char *accel, + *keycode = 0; + *mask = 0; + +- if (strcmp (accel, "disabled") == 0) ++ if (!accel[0] || strcmp (accel, "disabled") == 0) + return TRUE; + + meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask); +@@ -852,7 +852,7 @@ meta_ui_parse_modifier (const char *accel, + + *mask = 0; + +- if (accel == NULL || strcmp (accel, "disabled") == 0) ++ if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0) + return TRUE; + + meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask); +-- +1.6.5.2 + |