many phone AB sync fixes

2 files changed, 11 insertions, 10 deletions

diff --git a/gammu/emb/common/service/gsmmisc.c b/gammu/emb/common/service/gsmmisc.c
index 6959a22..1c6ec8b 100644
--- a/gammu/emb/common/service/gsmmisc.c
+++ b/gammu/emb/common/service/gsmmisc.c
@@ -202,11 +202,11 @@ void SaveVCALText(char *Buffer, int *Length, char *Text, char *Start)
         char buffer[1000];
 
         if (UnicodeLength(Text) != 0) {
-                EncodeUTF8QuotedPrintable(buffer,Text);
+                EncodeUTF8(buffer,Text);
                 if (UnicodeLength(Text)==strlen(buffer)) {
                         *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,DecodeUnicodeString(Text),13,10);
                 } else {
-                        *Length+=sprintf(Buffer+(*Length), "%s;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:%s%c%c",Start,buffer,13,10);
+                        *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,buffer,13,10);
                 }
                 }    
 }
diff --git a/gammu/emb/common/service/gsmpbk.c b/gammu/emb/common/service/gsmpbk.c
index 05e5cb9..f7cf7d7 100644
--- a/gammu/emb/common/service/gsmpbk.c
+++ b/gammu/emb/common/service/gsmpbk.c
@@ -131,27 +131,27 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade
                                         break;
                                 case PBK_Number_General :
                                         *Length+=sprintf(Buffer+(*Length),"TEL");
-                                        if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
+                                        (*Length)+=sprintf(Buffer+(*Length),";PREF");
                                         break;
                                 case PBK_Number_Mobile  :
                                         *Length+=sprintf(Buffer+(*Length),"TEL");
-                                        if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
+                                        //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
                                         *Length+=sprintf(Buffer+(*Length),";CELL");
                                         break;
                                 case PBK_Number_Work    :
                                         *Length+=sprintf(Buffer+(*Length),"TEL");
-                                        if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
-                                        *Length+=sprintf(Buffer+(*Length),";WORK;VOICE");
+                                        //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
+                                        *Length+=sprintf(Buffer+(*Length),";WORK");
                                         break;
                                 case PBK_Number_Fax     :
                                         *Length+=sprintf(Buffer+(*Length),"TEL");
-                                        if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
+                                        //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
                                         *Length+=sprintf(Buffer+(*Length),";FAX");
                                         break;
                                 case PBK_Number_Home    :
                                         *Length+=sprintf(Buffer+(*Length),"TEL");
-                                        if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
-                                        *Length+=sprintf(Buffer+(*Length),";HOME;VOICE");
+                                        //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF");
+                                        *Length+=sprintf(Buffer+(*Length),";HOME");
                                         break;
                                 case PBK_Text_Note      :
                                         *Length+=sprintf(Buffer+(*Length),"NOTE");
@@ -160,7 +160,7 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade
                                         /* Don't ask why. Nokia phones save postal address
                                          * double - once like LABEL, second like ADR
                                          */
-                                        SaveVCALText(Buffer, Length, pbk->Entries[i].Text, "LABEL");
+                                        //SaveVCALText(Buffer, Length, pbk->Entries[i].Text, "LABEL");
                                         *Length+=sprintf(Buffer+(*Length),"ADR");
                                         break;
                                 case PBK_Text_Email     :
@@ -179,6 +179,7 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade
                                 }
                         }
                 }
+                *Length+=sprintf(Buffer+(*Length), "X-KADDRESSBOOK-X-ExternalID:%d%c%c",pbk->Location,13,10);
                 if (header) *Length+=sprintf(Buffer+(*Length),"END:VCARD%c%c",13,10);
         }
 }