metacity r3992 - in trunk: . src/core src/include

[tthurman svn gnome org]

Author: tthurman
Date: Thu Oct 23 04:27:31 2008
New Revision: 3992
URL: http://svn.gnome.org/viewvc/metacity?rev=3992&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/src/core/schema-bindings.c
   trunk/src/include/window-bindings.h

Modified: trunk/src/core/schema-bindings.c
==============================================================================
--- trunk/src/core/schema-bindings.c	(original)
+++ trunk/src/core/schema-bindings.c	Thu Oct 23 04:27:31 2008
@@ -48,21 +48,6 @@
 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 @@
 
   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",

Modified: trunk/src/include/window-bindings.h
==============================================================================
--- trunk/src/include/window-bindings.h	(original)
+++ trunk/src/include/window-bindings.h	Thu Oct 23 04:27:31 2008
@@ -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,