fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix data type of "general.firstdayofweek"

Browse Source 
This option wasn't converted to a proper data type when it was renamed
from "week_begins_on_monday" to "general.firstdayofweek". Convert the
boolean option into an enumeration type that can take the values
"monday" and "sunday". Also, update the documentation, add a conversion
rule to the upgrade script and convert the configuration file used in
the test suite.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2012-05-17 21:59:49 +02:00
parent dec97c7c81
commit 6c11b8985c
5 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/config.c
View File

@@ -204,16 +204,14 @@ config_parse_calendar_view (void *dummy, const char *val)
static int
config_parse_first_day_of_week (void *dummy, const char *val)
{
unsigned tmp;
if (config_parse_bool (&tmp, val)) {
if (tmp)
calendar_set_first_day_of_week (MONDAY);
else
calendar_set_first_day_of_week (SUNDAY);
return 1;
}
if (!strcmp (val, "monday"))
calendar_set_first_day_of_week (MONDAY);
else if (!strcmp (val, "sunday"))
calendar_set_first_day_of_week (SUNDAY);
else
return 0;
return 1;
}
static int
@@ -381,8 +379,12 @@ config_serialize_calendar_view (char *buf, void *dummy)
static int
config_serialize_first_day_of_week (char *buf, void *dummy)
{
unsigned tmp = calendar_week_begins_on_monday ();
return config_serialize_bool (buf, &tmp);
if (calendar_week_begins_on_monday ())
strcpy(buf, "monday");
else
strcpy(buf, "sunday");
return 1;
}
static int