[PATCH 1/3] wmaker: fix detection of legacy Apercu configuration keywords

As reported by Josip, the code in Window Maker to detect the use of the
legacy keyword "MiniwindowApercuBalloons" and "ApercuSize" was broken,
which means they were always seen as used even when not present.

This patch fixes the detection to only use them if they were effectively
used.

Reported-by: Josip Deanovic <[email protected]>
Signed-off-by: Christophe CURIS <[email protected]>
---
 src/defaults.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/defaults.c b/src/defaults.c
index 70fbeb5..c5a94c6 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -529,7 +529,7 @@ WDefaultEntry optionList[] = {
 	 */
 	{"MiniwindowApercuBalloons", "NO", NULL,
 	    &legacy_minipreview_config.enable, getBool, NULL, NULL, NULL},
-	{"ApercuSize", "128", NULL,
+	{"ApercuSize", "0", NULL,
 	    &legacy_minipreview_config.size, getInt, NULL, NULL, NULL},
 
 	/* style options */
@@ -1155,10 +1155,6 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
 	void *tdata;
 	WMPropList *old_dict = (w_global.domain.wmaker->dictionary != new_dict ? w_global.domain.wmaker->dictionary : NULL);
 
-	/* Backward Compatibility: init array to special value to detect if they changed */
-	legacy_minipreview_config.enable = 99;
-	legacy_minipreview_config.size   = -1;
-
 	needs_refresh = 0;
 
 	for (i = 0; i < wlengthof(optionList); i++) {
@@ -1223,11 +1219,11 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
 	 * This code should probably stay for at least 2 years, you should not consider removing
 	 * it before year 2017
 	 */
-	if (legacy_minipreview_config.enable != 99) {
+	if (legacy_minipreview_config.enable) {
 		wwarning(_("your configuration is using old syntax for Mini-Preview settings; consider running WPrefs.app to update"));
 		wPreferences.miniwin_preview_balloon = legacy_minipreview_config.enable;
 
-		if (legacy_minipreview_config.size >= 0) {
+		if (legacy_minipreview_config.size > 0) {
 			/*
 			 * the option 'ApercuSize' used to be coded as a multiple of the icon size in v0.95.6
 			 * it is now expressed directly in pixels, but to avoid breaking user's setting we check
-- 
2.1.4


-- 
To unsubscribe, send mail to [email protected].