On Wed, 22 Sep 2010, Tamas TEVESZ wrote:
> now to figure out where is it getting YES from...
sir raorn owes me a bottle of hair growth tonic. big bottle. no,
bigger than that.
>From fc28e3bdf5c01a266dbc78423f6145b95fe27391 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
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 <[email protected]>
---
WPrefs.app/Configurations.c | 2 +-
WindowMaker/Defaults/WindowMaker.in | 2 +-
src/defaults.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 74ca00f..7d34e9a 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 3cbc4d7..1323b0d 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/src/defaults.c b/src/defaults.c
index 11bf651..5adb4e2 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);
--
1.7.0.4
--
[-]
mkdir /nonexistentFrom fc28e3bdf5c01a266dbc78423f6145b95fe27391 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
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 <[email protected]>
---
WPrefs.app/Configurations.c | 2 +-
WindowMaker/Defaults/WindowMaker.in | 2 +-
src/defaults.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 74ca00f..7d34e9a 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 3cbc4d7..1323b0d 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/src/defaults.c b/src/defaults.c
index 11bf651..5adb4e2 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);
--
1.7.0.4
