From bb539466d534366137af9f5a27f01f5aa3b12a11 Mon Sep 17 00:00:00 2001
From: Thomas Thurman <tthurman@gnome.org>
Date: Thu, 23 Oct 2008 04:27:31 +0000
Subject: [PATCH] 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
---
 ChangeLog                     |  7 +++++++
 src/core/schema-bindings.c    | 17 +----------------
 src/include/window-bindings.h |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4bed9dc63..b4a887f3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/src/core/schema-bindings.c b/src/core/schema-bindings.c
index e283a9f38..09869bcd6 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 ba02c63b8..a75d5825a 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,