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
@@ -108,13 +108,13 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                         *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;
                 }
@@ -147,31 +147,31 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                         } 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;
                 }
@@ -185,13 +185,13 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 
                 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;
@@ -217,13 +217,13 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                         *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;
                 }
@@ -387,14 +387,14 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                                 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++;
@@ -417,12 +417,18 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                         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)) {