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
@@ -47,48 +47,51 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr
 
                 *Text   = -1;
                 *Time   = -1;
                 *Alarm  = -1;
                 *Phone  = -1;
                 *Recurrance= -1;
                 *EndTime= -1;
                 *Location= -1;
         for (i = 0; i < entry->EntriesNum; i++) {
                 switch (entry->Entries[i].EntryType) {
                 case CAL_START_DATETIME :
                         if (*Time == -1) *Time = i;
                         break;
                 case CAL_END_DATETIME :
                         if (*EndTime == -1) *EndTime = i;
                         break;
                 case CAL_ALARM_DATETIME :
                 case CAL_SILENT_ALARM_DATETIME:
                         if (*Alarm == -1) *Alarm = i;
                         break;
                 case CAL_RECURRANCE:
                         if (*Recurrance == -1) *Recurrance = i;
                         break;
                 case CAL_TEXT:
+                    *Text = i;
+                        break;
+                case CAL_DESCRIPTION:
                         if (*Text == -1) *Text = i;
                         break;
                 case CAL_PHONE:
                         if (*Phone == -1) *Phone = i;
                         break;
                 case CAL_LOCATION:
                         if (*Location == -1) *Location = i;
                         break;
                 default:
                         break;
                 }
         }
 }
 
 GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note, bool header, GSM_VCalendarVersion Version)
 {
                 int Text, Time, Alarm, Phone, Recurrance, EndTime, Location;
                 char buffer[2000];
 
         GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(note, &Text, &Time, &Alarm, &Phone, &Recurrance, &EndTime, &Location);
 
         if (header) {
                 *Length+=sprintf(Buffer, "BEGIN:VCALENDAR%c%c",13,10);
                 *Length+=sprintf(Buffer+(*Length), "VERSION:1.0%c%c",13,10);
@@ -176,51 +179,51 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                 if (Time == -1) return ERR_UNKNOWN;
                 SaveVCALDateTime(Buffer, Length, &note->Entries[Time].Date, "DTSTART");
 
                 if (Alarm != -1) {
                         SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                 }
 
                 if (Recurrance != -1) {
                         switch(note->Entries[Recurrance].Number/24) {
                                         case 1   : *Length+=sprintf(Buffer+(*Length), "RRULE:D1%c%c",13,10);break;
                                         case 7   : *Length+=sprintf(Buffer+(*Length), "RRULE:D7%c%c",13,10);break;
                                         case 30          : *Length+=sprintf(Buffer+(*Length), "RRULE:MD1%c%c",13,10);break;
                                         case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YD1%c%c",13,10);break;
                         }
                 }
         
                 if (note->Type == GSM_CAL_CALL) {
                         buffer[0] = 0;
                         buffer[1] = 0;
                          if (Phone != -1) CopyUnicodeString(buffer,note->Entries[Phone].Text);
                         if (Text != -1)  {
                                 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:");
                 switch (note->Type) {
                 case GSM_CAL_MEETING:
                         *Length+=sprintf(Buffer+(*Length), "Meeting%c%c",13,10);
                         break;
                 case GSM_CAL_REMINDER:
                         *Length+=sprintf(Buffer+(*Length), "Date%c%c",13,10);
                         break;
                 case GSM_CAL_TRAVEL:
                         *Length+=sprintf(Buffer+(*Length), "Travel%c%c",13,10);
                         break;
                 case GSM_CAL_VACATION:
                         *Length+=sprintf(Buffer+(*Length), "Vacation%c%c",13,10);
                         break;
                 case GSM_CAL_BIRTHDAY:
                         *Length+=sprintf(Buffer+(*Length), "Anninversary%c%c",13,10);
                         break;
                 case GSM_CAL_MEMO:
                 default:
                         *Length+=sprintf(Buffer+(*Length), "Miscellaneous%c%c",13,10);
                         break;
                 }
@@ -395,53 +398,59 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
                                 Calendar->Entries[Calendar->EntriesNum].Number    = 1*24;
                                 Calendar->EntriesNum++;
                         }
                         if ((strstr(Line,"RRULE:W1")) || (strstr(Line,"RRULE:D7"))) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
                                 Calendar->Entries[Calendar->EntriesNum].Number    = 7*24;
                                 Calendar->EntriesNum++;
                         }
                         if (strstr(Line,"RRULE:W2")) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
                                 Calendar->Entries[Calendar->EntriesNum].Number    = 14*24;
                                 Calendar->EntriesNum++;
                         }
                         if (strstr(Line,"RRULE:MD1")) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
                                 Calendar->Entries[Calendar->EntriesNum].Number    = 30*24;
                                 Calendar->EntriesNum++;
                         }
                         if (strstr(Line,"RRULE:YD1")) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
                                 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);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "DTSTART", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_START_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "DTEND", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_END_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "DALARM", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_SILENT_ALARM_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "AALARM", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_ALARM_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 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
@@ -136,48 +136,49 @@ typedef enum {
         /**
          * Date and time of event start.
          */
         CAL_START_DATETIME = 1,
         /**
          * Date and time of event end.
          */
         CAL_END_DATETIME,
         /**
          * Alarm date and time.
          */
         CAL_ALARM_DATETIME,
         /**
          * Date and time of silent alarm.
          */
         CAL_SILENT_ALARM_DATETIME,
         /**
          * Recurrance.
          */
         CAL_RECURRANCE,
         /**
          * Text.
          */
         CAL_TEXT,
+        CAL_DESCRIPTION, // LR added
         /**
          * Location.
          */
         CAL_LOCATION,
         /**
          * Phone number.
          */
         CAL_PHONE,
         /**
          * Whether this entry is private.
          */
          CAL_PRIVATE,
         /**
          * Related contact id.
          */
         CAL_CONTACTID,
         /**
          * Repeat each x'th day of week.
          */
         CAL_REPEAT_DAYOFWEEK,
         /**
          * Repeat each x'th day of month.
          */
         CAL_REPEAT_DAY,