1 files changed, 13 insertions, 7 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 0375fee..7310755 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -102,25 +102,25 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                 *Length+=sprintf(Buffer+(*Length), "CATEGORIES:");
                 switch (note->Type) {
                 case GSM_CAL_REMINDER:
                         *Length+=sprintf(Buffer+(*Length), "Reminder%c%c",13,10);
                         break;
                 case GSM_CAL_MEMO:
                         *Length+=sprintf(Buffer+(*Length), "Miscellaneous%c%c",13,10);
                         break;
                 case GSM_CAL_CALL:
                         *Length+=sprintf(Buffer+(*Length), "Phone Call%c%c",13,10);
                         break;
                 case GSM_CAL_BIRTHDAY:
-                        *Length+=sprintf(Buffer+(*Length), "Special Occasion%c%c",13,10);
+                        *Length+=sprintf(Buffer+(*Length), "Birthday%c%c",13,10);
                         break;
                 case GSM_CAL_MEETING:
                 default:
                         *Length+=sprintf(Buffer+(*Length), "MeetingDEF%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);
@@ -141,63 +141,63 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                         SaveVCALDateTime(Buffer, Length, &note->Entries[EndTime].Date, "DTEND");
                 }
 
                 if (Alarm != -1) {
                         if (note->Entries[Alarm].EntryType == CAL_SILENT_ALARM_DATETIME) {
                                 SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                         } else {
                                 SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                         }
                 }
 
                 /* Birthday is known to be recurranced */
-                if (Recurrance != -1 && note->Type != GSM_CAL_BIRTHDAY) {
+                if (Recurrance != -1 ) {
                         switch(note->Entries[Recurrance].Number/24) {
                                         case 1   : *Length+=sprintf(Buffer+(*Length), "RRULE:D1 #0%c%c",13,10); break;
                                         case 7   : *Length+=sprintf(Buffer+(*Length), "RRULE:W1 #0%c%c",13,10); break;
                                         case 14          : *Length+=sprintf(Buffer+(*Length), "RRULE:W2 #0%c%c",13,10); break;
-                                case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YD1 #0%c%c",13,10); break;
+                                case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YM1 #0%c%c",13,10); break;
                         }
                 }
         } else if (Version == Siemens_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_CALL:
                         *Length+=sprintf(Buffer+(*Length), "Phone Call%c%c",13,10);
                         break;
                 case GSM_CAL_BIRTHDAY:
-                        *Length+=sprintf(Buffer+(*Length), "Anniversary%c%c",13,10);
+                        *Length+=sprintf(Buffer+(*Length), "Birthday%c%c",13,10);
                         break;
                 case GSM_CAL_MEMO:
                 default:
                         *Length+=sprintf(Buffer+(*Length), "Miscellaneous%c%c",13,10);
                         break;
                 }
                 
                 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;
+                                        case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YM1%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, "SUMMARY");
@@ -211,25 +211,25 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                         *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);
+                        *Length+=sprintf(Buffer+(*Length), "Birthday%c%c",13,10);
                         break;
                 case GSM_CAL_MEMO:
                 default:
                         *Length+=sprintf(Buffer+(*Length), "Miscellaneous%c%c",13,10);
                         break;
                 }
                 
                 if (Time == -1) return ERR_UNKNOWN;
                 SaveVCALDateTime(Buffer, Length, &note->Entries[Time].Date, "DTSTART");
 
                 if (EndTime != -1) {
                         SaveVCALDateTime(Buffer, Length, &note->Entries[EndTime].Date, "DTEND");
@@ -381,26 +381,26 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                 case 1: /* Calendar note */
                         if (strstr(Line,"END:VEVENT")) {
                                 if (Calendar->EntriesNum == 0) return ERR_EMPTY;
                                 return ERR_NONE;
                                 }
             Calendar->Type = GSM_CAL_MEETING;
                                 if (strstr(Line,"CATEGORIES:Reminder")) Calendar->Type = GSM_CAL_REMINDER;
                                 if (strstr(Line,"CATEGORIES:Date"))      Calendar->Type = GSM_CAL_REMINDER;//SE
                                 if (strstr(Line,"CATEGORIES:Travel"))    Calendar->Type = GSM_CAL_TRAVEL;  //SE
                                 if (strstr(Line,"CATEGORIES:Vacation"))          Calendar->Type = GSM_CAL_VACATION;//SE
                                 if (strstr(Line,"CATEGORIES:Miscellaneous")) Calendar->Type = GSM_CAL_MEMO;
                                 if (strstr(Line,"CATEGORIES:Phone Call")) Calendar->Type = GSM_CAL_CALL;
-                        if (strstr(Line,"CATEGORIES:Special Occasion")) Calendar->Type = GSM_CAL_BIRTHDAY;
                                 if (strstr(Line,"CATEGORIES:Anniversary")) Calendar->Type = GSM_CAL_BIRTHDAY;
+                                if (strstr(Line,"CATEGORIES:Birthday")) Calendar->Type = GSM_CAL_BIRTHDAY;
                                 if (strstr(Line,"CATEGORIES:Meeting"))          Calendar->Type = GSM_CAL_MEETING;
                                 if (strstr(Line,"CATEGORIES:Appointment")) Calendar->Type = GSM_CAL_MEETING;
                         if (strstr(Line,"RRULE:D1")) {
                                 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++;
                         }
@@ -411,24 +411,30 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                         }
                         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++;
                         }
             // LR 
+                        if (strstr(Line,"RRULE:YM1")) {
+                                Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
+                                Calendar->Entries[Calendar->EntriesNum].Number    = 365*24;
+                                Calendar->EntriesNum++;
+                        }
+            // 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;