From a6dff815a9c6d3a91094573d23c28a8553fc7cc2 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Thu, 14 Oct 2004 06:42:01 +0000
Subject: fixes umlaute in beaming

---
(limited to 'gammu')

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
@@ -68,6 +68,9 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr
 			if (*Recurrance == -1) *Recurrance = i;
 			break;
 		case CAL_TEXT:
+		    *Text = i;
+			break;
+		case CAL_DESCRIPTION:
 			if (*Text == -1) *Text = i;
 			break;
 		case CAL_PHONE:
@@ -197,9 +200,9 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 				if (Phone != -1) EncodeUnicode(buffer+UnicodeLength(buffer)*2," ",1);
 				CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text);
 			}
-			SaveVCALText(Buffer, Length, buffer, "DESCRIPTION");
+			SaveVCALText(Buffer, Length, buffer, "SUMMARY");
 		} else {
-			SaveVCALText(Buffer, Length, note->Entries[Text].Text, "DESCRIPTION");
+			SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
 		}
 	} else if (Version == SonyEricsson_VCalendar) {
 		*Length+=sprintf(Buffer+(*Length), "CATEGORIES:");
@@ -416,11 +419,17 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
 				Calendar->Entries[Calendar->EntriesNum].Number    = 365*24;
 				Calendar->EntriesNum++;
 			}
-			if ((ReadVCALText(Line, "SUMMARY", Buff)) || (ReadVCALText(Line, "DESCRIPTION", Buff))) {
+            // LR 
+			if ((ReadVCALText(Line, "SUMMARY", Buff)) ) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT;
 				CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
 				Calendar->EntriesNum++;
 			}
+			if (ReadVCALText(Line, "DESCRIPTION", Buff)) {
+				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_DESCRIPTION;
+				CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
+				Calendar->EntriesNum++;
+			}
 			if (ReadVCALText(Line, "LOCATION", Buff)) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_LOCATION;
 				CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
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
@@ -157,6 +157,7 @@ typedef enum {
 	 * Text.
 	 */
 	CAL_TEXT,
+	CAL_DESCRIPTION, // LR added
 	/**
 	 * Location.
 	 */
--
cgit v0.9.0.2