From f206c15fea5bcbde9aabc430d539d1286afffe94 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <ice@extreme.hu>
Date: Fri, 24 Sep 2010 01:56:07 +0200
Subject: [PATCH] Repair defaults for new titlebar button style

Originally missed in 17cc7c3c

Signed-off-by: Tamas TEVESZ <ice@extreme.hu>
---
 WPrefs.app/Configurations.c         | 2 +-
 WindowMaker/Defaults/WindowMaker.in | 2 +-
 WindowMaker/Themes/OpenStep.style   | 2 +-
 debian/WindowMaker.default          | 2 +-
 src/defaults.c                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 74ca00fa..7d34e9a2 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -81,7 +81,7 @@ static void showData(_Panel *panel)
 	WMPerformButtonClick(panel->icoB[GetSpeedForKey("IconSlideSpeed")]);
 	WMPerformButtonClick(panel->shaB[GetSpeedForKey("ShadeSpeed")]);
 
-	str = GetStringForKey("Newstyle");
+	str = GetStringForKey("NewStyle");
 	if (str && strcasecmp(str, "next") == 0) {
 		WMPerformButtonClick(panel->nextB);
 	} else if (str && strcasecmp(str, "old") == 0) {
diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index 3cbc4d7f..1323b0d5 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -38,7 +38,7 @@
   ColormapSize = 4;
   DisableDithering = NO;
   ModifierKey = Mod1;
-  NewStyle = YES;
+  NewStyle = "new";
   DisableDock = NO;
   DisableClip = NO;
   Superfluous = YES;
diff --git a/WindowMaker/Themes/OpenStep.style b/WindowMaker/Themes/OpenStep.style
index 2e7e5f38..8ad408ca 100644
--- a/WindowMaker/Themes/OpenStep.style
+++ b/WindowMaker/Themes/OpenStep.style
@@ -1,5 +1,5 @@
 {
-  NewStyle = YES;
+  NewStyle = new;
   TitleJustify = left;
   WindowTitleFont = "Trebuchet MS,sans serif:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,sans serif:bold:pixelsize=12";
diff --git a/debian/WindowMaker.default b/debian/WindowMaker.default
index 9475891f..0b727818 100644
--- a/debian/WindowMaker.default
+++ b/debian/WindowMaker.default
@@ -41,7 +41,7 @@
   ColormapSize = 4;
   DisableDithering = NO;
   ModifierKey = Mod1;
-  NewStyle = YES;
+  NewStyle = new;
   DisableDock = NO;
   DisableClip = NO;
   Superfluous = NO;
diff --git a/src/defaults.c b/src/defaults.c
index 11bf6510..5adb4e2e 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -1210,7 +1210,7 @@ static int string2index(WMPropList * key, WMPropList * val, char *def, WOptionEn
 				sizeof(buffer)-strlen(buffer)-1, "\"%s\"", v->string);
 		}
 	}
-	wwarning(_("wrong option value for key \"%s\". Got \"%s\", should be one of %s"),
+	wwarning(_("wrong option value for key \"%s\"; got \"%s\", should be one of %s."),
 		WMGetFromPLString(key),
 		WMIsPLString(val) ? WMGetFromPLString(val) : "(unknown)",
 		buffer);