[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-270-gdbe9467

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  dbe94675e873fa142938970f8caac4662308c04f (commit)
      from  19eea1eef23aa2d7703ade8a4b2edfff38f510f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=dbe94675e873fa142938970f8caac4662308c04f


commit dbe94675e873fa142938970f8caac4662308c04f
Author: Daniele Forsi <address@hidden>
Date:   Sat Jul 9 22:06:52 2011 +0200

    Make the vcard reader handle also BDAY
    
    It was written but not read from files.

diff --git a/ChangeLog b/ChangeLog
index 8147b44..734811e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,7 @@
     o add id for Nokia 3109c to misc.c only; use model=series40
                                                (Alexandre A. Alves)
     o fix gn_sms_send() so the message could be resent  (Paweł Kot)
-    o make the vcard reader handle also TITLE, NICKNAME, ORG,
+    o make the vcard reader handle also BDAY, TITLE, NICKNAME, ORG,
       X-SIP;POC and X-WV-ID                         (Daniele Forsi)
  * nk6510 driver updates
     o fix calendar handling issues (few off-by-ones)    (Paweł Kot)
diff --git a/common/vcard.c b/common/vcard.c
index 934f94d..3192bb5 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -255,6 +255,19 @@ GNOKII_API int gn_phonebook2vcard(FILE *f, 
gn_phonebook_entry *entry, char *loca
                                
entry->subentries[entry->subentries_count].entry_type = 
GN_PHONEBOOK_ENTRY_Number; \
                                
entry->subentries[entry->subentries_count].number_type = c);
 #define STOREMEMTYPE(a, memory_type) if (BEGINS(a)) { STRIP(a, memory_name); 
memory_type = gn_str2memory_type(memory_name); }
+#define STOREDATE(a, c) if (BEGINS(a)) { \
+                               if (entry->subentries_count == 
GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER) return -1; \
+                               
memset(&entry->subentries[entry->subentries_count].data.date, 0, 
sizeof(entry->subentries[entry->subentries_count].data.date)); \
+                               sscanf(buf+strlen(a), "%4u%2u%2uT%2u%2u%2u", \
+                                       
&entry->subentries[entry->subentries_count].data.date.year, \
+                                       
&entry->subentries[entry->subentries_count].data.date.month, \
+                                       
&entry->subentries[entry->subentries_count].data.date.day, \
+                                       
&entry->subentries[entry->subentries_count].data.date.hour, \
+                                       
&entry->subentries[entry->subentries_count].data.date.minute, \
+                                       
&entry->subentries[entry->subentries_count].data.date.second); \
+                               
entry->subentries[entry->subentries_count].entry_type = c; \
+                               entry->subentries_count++; \
+                       } while (0)
 
 #undef ERROR
 #define ERROR(a) fprintf(stderr, "%s\n", a)
@@ -415,6 +428,8 @@ GNOKII_API int gn_vcardstr2phonebook(const char *vcard, 
gn_phonebook_entry *entr
                STORESUB("X-SIP;POC:", GN_PHONEBOOK_ENTRY_PTTAddress);
                STORESUB("X-WV-ID:", GN_PHONEBOOK_ENTRY_UserID);
 
+               STOREDATE("BDAY:", GN_PHONEBOOK_ENTRY_Birthday);
+
 #if 1
                /* libgnokii 0.6.25 deprecates X_GSM_STORE_AT in favour of 
X-GSM-MEMORY and X-GSM-LOCATION and X_GSM_CALLERGROUP in favour of 
X-GSM-CALLERGROUP */
                STORE3("X_GSM_STORE_AT:", memloc);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    2 +-
 common/vcard.c |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs