aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-04-11 06:25:35 +0200
committerMattias Andrée <maandree@kth.se>2021-04-11 06:25:35 +0200
commitf9f37dcae886fcab8b162620a4ec5652ab2a5ead (patch)
tree9bd150d3f2fb9b8f7c44d3b62b175f2ae79c06ec
parentReorder things in libcontacts_same_number and fix an error (diff)
downloadlibcontacts-f9f37dcae886fcab8b162620a4ec5652ab2a5ead.tar.gz
libcontacts-f9f37dcae886fcab8b162620a4ec5652ab2a5ead.tar.bz2
libcontacts-f9f37dcae886fcab8b162620a4ec5652ab2a5ead.tar.xz
Fix birthday formatting and parsing
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--libcontacts_format_contact.c8
-rw-r--r--libcontacts_parse_contact.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/libcontacts_format_contact.c b/libcontacts_format_contact.c
index 002dd4a..81a06e4 100644
--- a/libcontacts_format_contact.c
+++ b/libcontacts_format_contact.c
@@ -188,13 +188,13 @@ libcontacts_format_contact(const struct libcontacts_contact *contact, char **dat
if (contact->birthday) {
fprintf(fp, "BIRTH:\n");
if (contact->birthday->year)
- fprintf(fp, "YEAR %u\n", contact->birthday->year);
+ fprintf(fp, "\tYEAR %u\n", contact->birthday->year);
if (contact->birthday->month)
- fprintf(fp, "MONTH %u\n", (unsigned int)contact->birthday->month);
+ fprintf(fp, "\tMONTH %u\n", (unsigned int)contact->birthday->month);
if (contact->birthday->day)
- fprintf(fp, "DAY %u\n", (unsigned int)contact->birthday->day);
+ fprintf(fp, "\tDAY %u\n", (unsigned int)contact->birthday->day);
if (contact->birthday->before_on_common)
- fprintf(fp, "EARLY\n");
+ fprintf(fp, "\tEARLY\n");
if ((list = contact->birthday->unrecognised_data))
for (; *list; list++)
fprintf(fp, "\t%s\n", *list);
diff --git a/libcontacts_parse_contact.c b/libcontacts_parse_contact.c
index 8970afd..e0091f8 100644
--- a/libcontacts_parse_contact.c
+++ b/libcontacts_parse_contact.c
@@ -438,7 +438,7 @@ libcontacts_parse_contact(char *data, struct libcontacts_contact *contact)
contact->birthday->month = uc;
} else if (TEST(unindent(p), "DAY") && !contact->birthday->day && (uc = getposuchar(p))) {
contact->birthday->day = uc;
- } else if (!strcmp(p, "EARLY")) {
+ } else if (!strcmp(unindent(p), "EARLY")) {
contact->birthday->before_on_common = 1;
} else {
if (addstr(&contact->birthday->unrecognised_data, unindent(p)))