[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-268-ged840b0

[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  ed840b078e57c2c97f9b61c25b74c8b96eb41d35 (commit)
      from  49bce3c30ea16a912caec404d3e8ef3eabf75126 (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=ed840b078e57c2c97f9b61c25b74c8b96eb41d35


commit ed840b078e57c2c97f9b61c25b74c8b96eb41d35
Author: Daniele Forsi <address@hidden>
Date:   Sat Jul 9 21:41:49 2011 +0200

    Make the vcard reader handle also NICKNAME, X-SIP;POC and X-WV-ID
    
    They were written but not read from files.

diff --git a/ChangeLog b/ChangeLog
index 0307fa5..8147b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,8 +20,8 @@
     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 and ORG
-                                                    (Daniele Forsi)
+    o make the vcard reader handle also 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)
     o implement deletecalendarnote for series40 3rd+ Ed (Paweł Kot)
diff --git a/common/vcard.c b/common/vcard.c
index b91613c..e874f14 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -411,6 +411,9 @@ GNOKII_API int gn_vcardstr2phonebook(const char *vcard, 
gn_phonebook_entry *entr
 
                STORESUB("TITLE:", GN_PHONEBOOK_ENTRY_JobTitle);
                STORESUB("ORG:", GN_PHONEBOOK_ENTRY_Company);
+               STORESUB("NICKNAME:", GN_PHONEBOOK_ENTRY_Nickname);
+               STORESUB("X-SIP;POC:", GN_PHONEBOOK_ENTRY_PTTAddress);
+               STORESUB("X-WV-ID:", GN_PHONEBOOK_ENTRY_UserID);
 
 #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 */

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

Summary of changes:
 ChangeLog      |    4 ++--
 common/vcard.c |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs