author | zautrix <zautrix> | 2004-10-14 06:42:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-14 06:42:01 (UTC) |
commit | a6dff815a9c6d3a91094573d23c28a8553fc7cc2 (patch) (unidiff) | |
tree | a8830e9adcd72faa8178d4ee2517bfc31cda8653 /gammu/emb/common/service | |
parent | 909d25797c50fc38c435834a68aaf60bf87e32f9 (diff) | |
download | kdepimpi-a6dff815a9c6d3a91094573d23c28a8553fc7cc2.zip kdepimpi-a6dff815a9c6d3a91094573d23c28a8553fc7cc2.tar.gz kdepimpi-a6dff815a9c6d3a91094573d23c28a8553fc7cc2.tar.bz2 |
fixes umlaute in beaming
-rw-r--r-- | gammu/emb/common/service/gsmcal.c | 15 | ||||
-rw-r--r-- | gammu/emb/common/service/gsmcal.h | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c index 0ea8e06..0375fee 100644 --- a/gammu/emb/common/service/gsmcal.c +++ b/gammu/emb/common/service/gsmcal.c | |||
@@ -67,8 +67,11 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr | |||
67 | case CAL_RECURRANCE: | 67 | case CAL_RECURRANCE: |
68 | if (*Recurrance == -1) *Recurrance = i; | 68 | if (*Recurrance == -1) *Recurrance = i; |
69 | break; | 69 | break; |
70 | case CAL_TEXT: | 70 | case CAL_TEXT: |
71 | *Text = i; | ||
72 | break; | ||
73 | case CAL_DESCRIPTION: | ||
71 | if (*Text == -1) *Text = i; | 74 | if (*Text == -1) *Text = i; |
72 | break; | 75 | break; |
73 | case CAL_PHONE: | 76 | case CAL_PHONE: |
74 | if (*Phone == -1) *Phone = i; | 77 | if (*Phone == -1) *Phone = i; |
@@ -196,11 +199,11 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note | |||
196 | if (Text != -1) { | 199 | if (Text != -1) { |
197 | if (Phone != -1) EncodeUnicode(buffer+UnicodeLength(buffer)*2," ",1); | 200 | if (Phone != -1) EncodeUnicode(buffer+UnicodeLength(buffer)*2," ",1); |
198 | CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text); | 201 | CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text); |
199 | } | 202 | } |
200 | SaveVCALText(Buffer, Length, buffer, "DESCRIPTION"); | 203 | SaveVCALText(Buffer, Length, buffer, "SUMMARY"); |
201 | } else { | 204 | } else { |
202 | SaveVCALText(Buffer, Length, note->Entries[Text].Text, "DESCRIPTION"); | 205 | SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY"); |
203 | } | 206 | } |
204 | } else if (Version == SonyEricsson_VCalendar) { | 207 | } else if (Version == SonyEricsson_VCalendar) { |
205 | *Length+=sprintf(Buffer+(*Length), "CATEGORIES:"); | 208 | *Length+=sprintf(Buffer+(*Length), "CATEGORIES:"); |
206 | switch (note->Type) { | 209 | switch (note->Type) { |
@@ -415,13 +418,19 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda | |||
415 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE; | 418 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE; |
416 | Calendar->Entries[Calendar->EntriesNum].Number = 365*24; | 419 | Calendar->Entries[Calendar->EntriesNum].Number = 365*24; |
417 | Calendar->EntriesNum++; | 420 | Calendar->EntriesNum++; |
418 | } | 421 | } |
419 | if ((ReadVCALText(Line, "SUMMARY", Buff)) || (ReadVCALText(Line, "DESCRIPTION", Buff))) { | 422 | // LR |
423 | if ((ReadVCALText(Line, "SUMMARY", Buff)) ) { | ||
420 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT; | 424 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT; |
421 | CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff); | 425 | CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff); |
422 | Calendar->EntriesNum++; | 426 | Calendar->EntriesNum++; |
423 | } | 427 | } |
428 | if (ReadVCALText(Line, "DESCRIPTION", Buff)) { | ||
429 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_DESCRIPTION; | ||
430 | CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff); | ||
431 | Calendar->EntriesNum++; | ||
432 | } | ||
424 | if (ReadVCALText(Line, "LOCATION", Buff)) { | 433 | if (ReadVCALText(Line, "LOCATION", Buff)) { |
425 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_LOCATION; | 434 | Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_LOCATION; |
426 | CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff); | 435 | CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff); |
427 | Calendar->EntriesNum++; | 436 | Calendar->EntriesNum++; |
diff --git a/gammu/emb/common/service/gsmcal.h b/gammu/emb/common/service/gsmcal.h index 0a41b7b..c69fdbe 100644 --- a/gammu/emb/common/service/gsmcal.h +++ b/gammu/emb/common/service/gsmcal.h | |||
@@ -156,8 +156,9 @@ typedef enum { | |||
156 | /** | 156 | /** |
157 | * Text. | 157 | * Text. |
158 | */ | 158 | */ |
159 | CAL_TEXT, | 159 | CAL_TEXT, |
160 | CAL_DESCRIPTION, // LR added | ||
160 | /** | 161 | /** |
161 | * Location. | 162 | * Location. |
162 | */ | 163 | */ |
163 | CAL_LOCATION, | 164 | CAL_LOCATION, |