Diffstat (limited to 'gammu/emb/common/service/gsmpbk.c') (more/less context) (show whitespace changes)
-rw-r--r-- | gammu/emb/common/service/gsmpbk.c | 17 |
1 files changed, 9 insertions, 8 deletions
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 | |||
@@ -128,42 +128,42 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade | |||
128 | case PBK_Date : | 128 | case PBK_Date : |
129 | case PBK_Caller_Group : | 129 | case PBK_Caller_Group : |
130 | ignore = true; | 130 | ignore = true; |
131 | break; | 131 | break; |
132 | case PBK_Number_General : | 132 | case PBK_Number_General : |
133 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 133 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
134 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 134 | (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
135 | break; | 135 | break; |
136 | case PBK_Number_Mobile : | 136 | case PBK_Number_Mobile : |
137 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 137 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
138 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 138 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
139 | *Length+=sprintf(Buffer+(*Length),";CELL"); | 139 | *Length+=sprintf(Buffer+(*Length),";CELL"); |
140 | break; | 140 | break; |
141 | case PBK_Number_Work : | 141 | case PBK_Number_Work : |
142 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 142 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
143 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 143 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
144 | *Length+=sprintf(Buffer+(*Length),";WORK;VOICE"); | 144 | *Length+=sprintf(Buffer+(*Length),";WORK"); |
145 | break; | 145 | break; |
146 | case PBK_Number_Fax : | 146 | case PBK_Number_Fax : |
147 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 147 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
148 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 148 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
149 | *Length+=sprintf(Buffer+(*Length),";FAX"); | 149 | *Length+=sprintf(Buffer+(*Length),";FAX"); |
150 | break; | 150 | break; |
151 | case PBK_Number_Home : | 151 | case PBK_Number_Home : |
152 | *Length+=sprintf(Buffer+(*Length),"TEL"); | 152 | *Length+=sprintf(Buffer+(*Length),"TEL"); |
153 | if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); | 153 | //if (Number == i) (*Length)+=sprintf(Buffer+(*Length),";PREF"); |
154 | *Length+=sprintf(Buffer+(*Length),";HOME;VOICE"); | 154 | *Length+=sprintf(Buffer+(*Length),";HOME"); |
155 | break; | 155 | break; |
156 | case PBK_Text_Note : | 156 | case PBK_Text_Note : |
157 | *Length+=sprintf(Buffer+(*Length),"NOTE"); | 157 | *Length+=sprintf(Buffer+(*Length),"NOTE"); |
158 | break; | 158 | break; |
159 | case PBK_Text_Postal : | 159 | case PBK_Text_Postal : |
160 | /* Don't ask why. Nokia phones save postal address | 160 | /* Don't ask why. Nokia phones save postal address |
161 | * double - once like LABEL, second like ADR | 161 | * double - once like LABEL, second like ADR |
162 | */ | 162 | */ |
163 | SaveVCALText(Buffer, Length, pbk->Entries[i].Text, "LABEL"); | 163 | //SaveVCALText(Buffer, Length, pbk->Entries[i].Text, "LABEL"); |
164 | *Length+=sprintf(Buffer+(*Length),"ADR"); | 164 | *Length+=sprintf(Buffer+(*Length),"ADR"); |
165 | break; | 165 | break; |
166 | case PBK_Text_Email : | 166 | case PBK_Text_Email : |
167 | case PBK_Text_Email2 : | 167 | case PBK_Text_Email2 : |
168 | *Length+=sprintf(Buffer+(*Length),"EMAIL"); | 168 | *Length+=sprintf(Buffer+(*Length),"EMAIL"); |
169 | break; | 169 | break; |
@@ -176,12 +176,13 @@ void GSM_EncodeVCARD(char *Buffer, int *Length, GSM_MemoryEntry *pbk, bool heade | |||
176 | } | 176 | } |
177 | if (!ignore) { | 177 | if (!ignore) { |
178 | SaveVCALText(Buffer, Length, pbk->Entries[i].Text, ""); | 178 | SaveVCALText(Buffer, Length, pbk->Entries[i].Text, ""); |
179 | } | 179 | } |
180 | } | 180 | } |
181 | } | 181 | } |
182 | *Length+=sprintf(Buffer+(*Length), "X-KADDRESSBOOK-X-ExternalID:%d%c%c",pbk->Location,13,10); | ||
182 | if (header) *Length+=sprintf(Buffer+(*Length),"END:VCARD%c%c",13,10); | 183 | if (header) *Length+=sprintf(Buffer+(*Length),"END:VCARD%c%c",13,10); |
183 | } | 184 | } |
184 | } | 185 | } |
185 | 186 | ||
186 | GSM_Error GSM_DecodeVCARD(unsigned char *Buffer, int *Pos, GSM_MemoryEntry *Pbk, GSM_VCardVersion Version) | 187 | GSM_Error GSM_DecodeVCARD(unsigned char *Buffer, int *Pos, GSM_MemoryEntry *Pbk, GSM_VCardVersion Version) |
187 | { | 188 | { |