many phone sync fixes

3 files changed, 36 insertions, 16 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index ddf9790..0ea8e06 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -1,512 +1,512 @@
 /* (c) 2002-2003 by Marcin Wiacek */
 
 #include <string.h>
 
 #include "gsmcal.h"
 #include "gsmmisc.h"
 #include "../misc/coding/coding.h"
 
 bool IsCalendarNoteFromThePast(GSM_CalendarEntry *note)
 {
 	bool 		Past = true;
 	int		i;
 	GSM_DateTime	DT;
 
 	GSM_GetCurrentDateTime (&DT);
 	for (i = 0; i < note->EntriesNum; i++) {
 		switch (note->Entries[i].EntryType) {
 		case CAL_RECURRANCE:
 			Past = false;
 			break;
 		case CAL_START_DATETIME :
 			if (note->Entries[i].Date.Year > DT.Year) Past = false;
 			if (note->Entries[i].Date.Year == DT.Year &&
 			    note->Entries[i].Date.Month > DT.Month) Past = false;
 			if (note->Entries[i].Date.Year == DT.Year &&
 			    note->Entries[i].Date.Month == DT.Month &&
 			    note->Entries[i].Date.Day > DT.Day) Past = false;
 			break;
 		default:
 			break;
 		}
 		if (!Past) break;
 	}
 	switch (note->Type) {
 		case GSM_CAL_BIRTHDAY:
 			Past = false;
 			break;
 		default:
 			break;
 	}
 	return Past;
 }
 
 void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entry, int *Text, int *Time, int *Alarm, int *Phone, int *Recurrance, int *EndTime, int *Location)
 {
 	int i;
 
 	*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:
 			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);
 	}
 	*Length+=sprintf(Buffer+(*Length), "BEGIN:VEVENT%c%c",13,10);
 
 	if (Version == Nokia_VCalendar) {
 		*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);
 			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);
 				CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text);
 			}
 			SaveVCALText(Buffer, Length, buffer, "SUMMARY");
 		} else {
 			SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
 		}
 		if (note->Type == GSM_CAL_MEETING && Location != -1) {
 			SaveVCALText(Buffer, Length, note->Entries[Location].Text, "LOCATION");
 		}
 	
 		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");
 		}
 
 		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) {
 			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;
 			}
 		}
 	} 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);
 			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;
 			}
 		}
 	
 		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");
 		} else {
 			SaveVCALText(Buffer, Length, note->Entries[Text].Text, "DESCRIPTION");
 		}
 	} 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;
 		}
 		
 		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");
 		}
 
 		if (Alarm != -1) {
 			SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "AALARM");
 		}
 	
 		SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
 
 		if (Location != -1) {
 			SaveVCALText(Buffer, Length, note->Entries[Location].Text, "LOCATION");
 		}
 	}
 	
 	*Length+=sprintf(Buffer+(*Length), "X-PILOTID:%d%c%c",note->Location,13,10);
 	*Length+=sprintf(Buffer+(*Length), "END:VEVENT%c%c",13,10);
 	if (header) *Length+=sprintf(Buffer+(*Length), "END:VCALENDAR%c%c",13,10);
 
 	return ERR_NONE;
 }
 
 void GSM_ToDoFindDefaultTextTimeAlarmCompleted(GSM_ToDoEntry *entry, int *Text, int *Alarm, int *Completed, int *EndTime, int *Phone)
 {
 	int i;
 
 	*Text		= -1;
 	*EndTime	= -1;
 	*Alarm		= -1;
 	*Completed	= -1;
 	*Phone		= -1;
 	for (i = 0; i < entry->EntriesNum; i++) {
 		switch (entry->Entries[i].EntryType) {
 		case TODO_END_DATETIME :
 			if (*EndTime == -1) *EndTime = i;
 			break;
 		case TODO_ALARM_DATETIME :
 		case TODO_SILENT_ALARM_DATETIME:
 			if (*Alarm == -1) *Alarm = i;
 			break;
 		case TODO_TEXT:
 			if (*Text == -1) *Text = i;
 			break;
 		case TODO_COMPLETED:
 			if (*Completed == -1) *Completed = i;
 			break;
 		case TODO_PHONE:
 			if (*Phone == -1) *Phone = i;
 			break;
 		default:
 			break;
 		}
 	}
 }
 
 GSM_Error GSM_EncodeVTODO(char *Buffer, int *Length, GSM_ToDoEntry *note, bool header, GSM_VToDoVersion Version)
 {
  	int Text, Alarm, Completed, EndTime, Phone;
 
 	GSM_ToDoFindDefaultTextTimeAlarmCompleted(note, &Text, &Alarm, &Completed, &EndTime, &Phone);
 
 	if (header) {
 		*Length+=sprintf(Buffer, "BEGIN:VCALENDAR%c%c",13,10);
 		*Length+=sprintf(Buffer+(*Length), "VERSION:1.0%c%c",13,10);
 	}
 
 	*Length+=sprintf(Buffer+(*Length), "BEGIN:VTODO%c%c",13,10);
 
 	if (Version == Nokia_VToDo) {
 		if (Text == -1) return ERR_UNKNOWN;
 		SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
 
 		if (Completed == -1) {
 			*Length+=sprintf(Buffer+(*Length), "PERCENT-COMPLETE:0%c%c",13,10);
 		} else {
 			*Length+=sprintf(Buffer+(*Length), "PERCENT-COMPLETE:100%c%c",13,10);
 		}
 	
 		switch (note->Priority) {
 			case GSM_Priority_Low	: *Length+=sprintf(Buffer+(*Length), "PRIORITY:5%c%c",13,10); break;
 			case GSM_Priority_Medium: *Length+=sprintf(Buffer+(*Length), "PRIORITY:3%c%c",13,10); break;
 			case GSM_Priority_High	: *Length+=sprintf(Buffer+(*Length), "PRIORITY:1%c%c",13,10); break;
 		}
 
 		if (EndTime != -1) {
 			SaveVCALDateTime(Buffer, Length, &note->Entries[EndTime].Date, "DUE");
 		}
 
 		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, "AALARM");
 			}
 		}
 	} else if (Version == SonyEricsson_VToDo) {
 		if (Text == -1) return ERR_UNKNOWN;
 		SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
 
 		if (Completed == -1) {
 			*Length+=sprintf(Buffer+(*Length), "PERCENT-COMPLETE:0%c%c",13,10);
 		} else {
 			*Length+=sprintf(Buffer+(*Length), "PERCENT-COMPLETE:100%c%c",13,10);
 		}
 	
 		switch (note->Priority) {
 			case GSM_Priority_Low	: *Length+=sprintf(Buffer+(*Length), "PRIORITY:5%c%c",13,10); break;
 			case GSM_Priority_Medium: *Length+=sprintf(Buffer+(*Length), "PRIORITY:3%c%c",13,10); break;
 			case GSM_Priority_High	: *Length+=sprintf(Buffer+(*Length), "PRIORITY:1%c%c",13,10); break;
 		}
 
 		if (Alarm != -1) {
 			SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "AALARM");
 		}		
 	}
 
 	*Length+=sprintf(Buffer+(*Length), "X-PILOTID:%d%c%c",note->Location,13,10);
 	*Length+=sprintf(Buffer+(*Length), "END:VTODO%c%c",13,10);
 
 	if (header) {
 		*Length+=sprintf(Buffer+(*Length), "END:VCALENDAR%c%c",13,10);
 	}
 	return ERR_NONE;
 }
 
 GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_CalendarEntry *Calendar, GSM_ToDoEntry *ToDo, GSM_VCalendarVersion CalVer, GSM_VToDoVersion ToDoVer)
 {
 	unsigned char 	Line[2000],Buff[2000];
 	int		Level = 0;
 
 	Calendar->EntriesNum 	= 0;
 	ToDo->EntriesNum 	= 0;
 
 	while (1) {
 		MyGetLine(Buffer, Pos, Line, strlen(Buffer));
 		if (strlen(Line) == 0) break;
 		switch (Level) {
 		case 0:
 			if (strstr(Line,"BEGIN:VEVENT")) {
 				Calendar->Type 	= GSM_CAL_MEMO;
 				Level 		= 1;
 			}
 			if (strstr(Line,"BEGIN:VTODO")) {
 				ToDo->Priority 	= GSM_Priority_Medium;
 				Level 		= 2;
 			}
 			break;
 		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: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++;
 			}
 			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))) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT;
 				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++;
 			}
 			break;
 		case 2: /* ToDo note */
 			if (strstr(Line,"END:VTODO")) {
 				if (ToDo->EntriesNum == 0) return ERR_EMPTY;
 				return ERR_NONE;
 			}
 			if (ReadVCALText(Line, "DUE", Buff)) {
 				ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_END_DATETIME;
 				ReadVCALDateTime(DecodeUnicodeString(Buff), &ToDo->Entries[ToDo->EntriesNum].Date);
 				ToDo->EntriesNum++;
 			}
 			if (ReadVCALText(Line, "DALARM", Buff)) {
 				ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_SILENT_ALARM_DATETIME;
 				ReadVCALDateTime(DecodeUnicodeString(Buff), &ToDo->Entries[ToDo->EntriesNum].Date);
 				ToDo->EntriesNum++;
 			}
 			if (ReadVCALText(Line, "AALARM", Buff)) {
 				ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_ALARM_DATETIME;
 				ReadVCALDateTime(DecodeUnicodeString(Buff), &ToDo->Entries[ToDo->EntriesNum].Date);
 				ToDo->EntriesNum++;
 			}
 			if (ReadVCALText(Line, "SUMMARY", Buff)) {
 				ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_TEXT;
 				CopyUnicodeString(ToDo->Entries[ToDo->EntriesNum].Text,Buff);
 				ToDo->EntriesNum++;
 			}
 			if (ReadVCALText(Line, "PRIORITY", Buff)) {
 				if (ToDoVer == SonyEricsson_VToDo) {
-					ToDo->Priority = GSM_Priority_Low;
+					ToDo->Priority = GSM_Priority_Medium;
 					if (atoi(DecodeUnicodeString(Buff))>3) ToDo->Priority = GSM_Priority_Low;
 					if (atoi(DecodeUnicodeString(Buff))<3) ToDo->Priority = GSM_Priority_High;
 					dbgprintf("atoi is %i %s\n",atoi(DecodeUnicodeString(Buff)),DecodeUnicodeString(Buff));
 				} else if (ToDoVer == Nokia_VToDo) {
-					ToDo->Priority = GSM_Priority_Low;
+					ToDo->Priority = GSM_Priority_Medium;
 					if (atoi(DecodeUnicodeString(Buff))>3) ToDo->Priority = GSM_Priority_Low;
 					if (atoi(DecodeUnicodeString(Buff))<3) ToDo->Priority = GSM_Priority_High;
 				}
 			}
 			if (strstr(Line,"PERCENT-COMPLETE:100")) {
 				ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_COMPLETED;
 				ToDo->Entries[ToDo->EntriesNum].Number	  = 1;
 				ToDo->EntriesNum++;
 			}
 			break;
 		}
 	}
 
 	if (Calendar->EntriesNum == 0 && ToDo->EntriesNum == 0) return ERR_EMPTY;
 	return ERR_NONE;
 }
 
 GSM_Error GSM_EncodeVNTFile(unsigned char *Buffer, int *Length, GSM_NoteEntry *Note)
 {
 	*Length+=sprintf(Buffer+(*Length), "BEGIN:VNOTE%c%c",13,10);
 	*Length+=sprintf(Buffer+(*Length), "VERSION:1.1%c%c",13,10);
 	SaveVCALText(Buffer, Length, Note->Text, "BODY");
 	*Length+=sprintf(Buffer+(*Length), "END:VNOTE%c%c",13,10);
 
 	return ERR_NONE;
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index a3b93a8..997485a 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -3862,1597 +3862,1602 @@ static void SaveFile(int argc, char *argv[])
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
 		Print_Error(error);
 		i = 0;
 		while (Backup.ToDo[i]!=NULL) {
 			if (i == atoi(argv[5])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[5])-1) {
 			printmsg("ToDo note not found in file\n");
 			exit(-1);
 		}
 		j = 0;
 		GSM_EncodeVTODO(Buffer, &j, Backup.ToDo[i], true, Nokia_VToDo);
 	} else if (mystrncasecmp(argv[2],"VCARD10",0) || mystrncasecmp(argv[2],"VCARD21",0)) {
 		if (argc<6) {
 			printmsg("Where is backup filename and location and memory type ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
 		Print_Error(error);
 		i = 0;
 		if (mystrncasecmp(argv[5],"SM",0)) {
 			while (Backup.SIMPhonebook[i]!=NULL) {
 				if (i == atoi(argv[6])-1) break;
 				i++;
 			}
 			if (i != atoi(argv[6])-1) {
 				printmsg("Phonebook entry not found in file\n");
 				exit(-1);
 			}
 			pbk = Backup.SIMPhonebook[i];
 		} else if (mystrncasecmp(argv[5],"ME",0)) {
 			while (Backup.PhonePhonebook[i]!=NULL) {
 				if (i == atoi(argv[6])-1) break;
 				i++;
 			}
 			if (i != atoi(argv[6])-1) {
 				printmsg("Phonebook entry not found in file\n");
 				exit(-1);
 			}
 			pbk = Backup.PhonePhonebook[i];
 		} else {
 			printmsg("Unknown memory type: \"%s\"\n",argv[5]);
 			exit(-1);
 		}
 		j = 0;
 		if (mystrncasecmp(argv[2],"VCARD10",0)) {
 			GSM_EncodeVCARD(Buffer,&j,pbk,true,Nokia_VCard10);
 		} else {
 			GSM_EncodeVCARD(Buffer,&j,pbk,true,Nokia_VCard21);
 		}
 	} else {
 		printmsg("What format of file (\"%s\") ?\n",argv[2]);
 		exit(-1);
 	}
 
 	file = fopen(argv[3],"wb");
 	fwrite(Buffer,1,j,file);
 	fclose(file);
 }
 
 static void Backup(int argc, char *argv[])
 {
 	int			i, used;
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoEntry		ToDo;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_MemoryEntry		Pbk;
 	GSM_CalendarEntry	Note;
 	GSM_Bitmap		Bitmap;
 	GSM_WAPBookmark		Bookmark;
 	GSM_Profile		Profile;
 	GSM_MultiWAPSettings	Settings;
 	GSM_Ringtone		Ringtone;
 	GSM_SMSC		SMSC;
 	GSM_Backup		Backup;
 	GSM_Backup_Info		Info;
  	GSM_FMStation		FMStation;
  	GSM_GPRSAccessPoint	GPRSPoint;
 	bool			DoBackup;
 
 	if (argc == 4 && mystrncasecmp(argv[3],"-yes",0)) always_answer_yes = true;
 
 	GSM_ClearBackup(&Backup);
 	GSM_GetBackupFormatFeatures(argv[2],&Info);
 
 	sprintf(Backup.Creator,"Gammu %s",VERSION);
 	if (strlen(GetOS()) != 0) {
 		strcat(Backup.Creator+strlen(Backup.Creator),", ");
 		strcat(Backup.Creator+strlen(Backup.Creator),GetOS());
 	}
 	if (strlen(GetCompiler()) != 0) {
 		strcat(Backup.Creator+strlen(Backup.Creator),", ");
 		strcat(Backup.Creator+strlen(Backup.Creator),GetCompiler());
 	}
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
 	GSM_Init(true);
 
 	if (Info.UseUnicode) {
 		Info.UseUnicode=answer_yes("Use Unicode subformat of backup file");
 	}
 	if (Info.DateTime) {
 		GSM_GetCurrentDateTime (&Backup.DateTime);
 		Backup.DateTimeAvailable=true;
 	}
 	if (Info.Model) {
 		error=Phone->GetManufacturer(&s);
 		Print_Error(error);
 		sprintf(Backup.Model,"%s ",s.Phone.Data.Manufacturer);
 		if (s.Phone.Data.ModelInfo->model[0]!=0) {
 			strcat(Backup.Model,s.Phone.Data.ModelInfo->model);
 		} else {
 			strcat(Backup.Model,s.Phone.Data.Model);
 		}
 		strcat(Backup.Model," ");
 		strcat(Backup.Model,s.Phone.Data.Version);
 	}
 	if (Info.IMEI) {
 		error=Phone->GetIMEI(&s);
 		if (error != ERR_NOTSUPPORTED) {
 			strcpy(Backup.IMEI, s.Phone.Data.IMEI);
 			Print_Error(error);
 		} else {
 			Backup.IMEI[0] = 0;
 		}
 	}
 	printf("\n");
 
 	DoBackup = false;
 	if (Info.PhonePhonebook) {
 		printmsg("Checking phone phonebook\n");
 		MemStatus.MemoryType = MEM_ME;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE && MemStatus.MemoryUsed != 0) {
 			if (answer_yes("   Backup phone phonebook")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {		
 		Pbk.MemoryType  = MEM_ME;
 		i		= 1;
 		used 		= 0;
 		while (used != MemStatus.MemoryUsed) {
 			Pbk.Location = i;
 			error=Phone->GetMemory(&s, &Pbk);
 			if (error != ERR_EMPTY) {
 				Print_Error(error);
 				if (used < GSM_BACKUP_MAX_PHONEPHONEBOOK) {
 					Backup.PhonePhonebook[used] = malloc(sizeof(GSM_MemoryEntry));
 				        if (Backup.PhonePhonebook[used] == NULL) Print_Error(ERR_MOREMEMORY);
 					Backup.PhonePhonebook[used+1] = NULL;
 				} else {
 					printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_PHONEPHONEBOOK");
 					GSM_Terminate();
 					exit(-1);
 				}
 				*Backup.PhonePhonebook[used]=Pbk;
 				used++;
 			}
 			printmsgerr("%c   Reading: %i percent",13,used*100/MemStatus.MemoryUsed);
 			i++;
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.SIMPhonebook) {
 		printmsg("Checking SIM phonebook\n");
 		MemStatus.MemoryType = MEM_SM;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE && MemStatus.MemoryUsed != 0) {
 			if (answer_yes("   Backup SIM phonebook")) DoBackup=true;
 		}
 	}
 	if (DoBackup) {
 		Pbk.MemoryType 	= MEM_SM;
 		i		= 1;
 		used 		= 0;
 		while (used != MemStatus.MemoryUsed) {
 			Pbk.Location = i;
 			error=Phone->GetMemory(&s, &Pbk);
 			if (error != ERR_EMPTY) {
 				Print_Error(error);
 				if (used < GSM_BACKUP_MAX_SIMPHONEBOOK) {
 					Backup.SIMPhonebook[used] = malloc(sizeof(GSM_MemoryEntry));
 				        if (Backup.SIMPhonebook[used] == NULL) Print_Error(ERR_MOREMEMORY);
 					Backup.SIMPhonebook[used + 1] = NULL;
 				} else {
 					printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_SIMPHONEBOOK");
 					GSM_Terminate();
 					exit(-1);
 				}
 				*Backup.SIMPhonebook[used]=Pbk;
 				used++;
 			}
 			printmsgerr("%c   Reading: %i percent",13,used*100/MemStatus.MemoryUsed);
 			i++;
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.Calendar) {
 		printmsg("Checking calendar\n");
 		error=Phone->GetNextCalendar(&s,&Note,true);
 		if (error==ERR_NONE) {
 			if (answer_yes("   Backup calendar notes")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used 		= 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
 			if (used < GSM_MAXCALENDARTODONOTES) {
 				Backup.Calendar[used] = malloc(sizeof(GSM_CalendarEntry));
 			        if (Backup.Calendar[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.Calendar[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_MAXCALENDARTODONOTES");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.Calendar[used]=Note;
 			used ++;
 			error=Phone->GetNextCalendar(&s,&Note,false);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.ToDo) {
 		printmsg("Checking ToDo\n");
 		error=Phone->GetToDoStatus(&s,&ToDoStatus);
 		if (error == ERR_NONE && ToDoStatus.Used != 0) {
 			if (answer_yes("   Backup ToDo")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		error=Phone->GetNextToDo(&s,&ToDo,true);
 		while (error == ERR_NONE) {
 			if (used < GSM_MAXCALENDARTODONOTES) {
 				Backup.ToDo[used] = malloc(sizeof(GSM_ToDoEntry));
 				if (Backup.ToDo[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.ToDo[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_MAXCALENDARTODONOTES");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.ToDo[used]=ToDo;
 			used ++;
 			error=Phone->GetNextToDo(&s,&ToDo,false);
 			printmsgerr("%c   Reading: %i percent",13,used*100/ToDoStatus.Used);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.CallerLogos) {
 		printmsg("Checking caller logos\n");
 		Bitmap.Type 	= GSM_CallerGroupLogo;
 		Bitmap.Location = 1;
 		error=Phone->GetBitmap(&s,&Bitmap);
 		if (error == ERR_NONE) {
 			if (answer_yes("   Backup caller groups and logos")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		printmsgerr("   Reading : ");
 		error = ERR_NONE;
 		used  = 0;
 		while (error == ERR_NONE) {
 			if (used < GSM_BACKUP_MAX_CALLER) {
 				Backup.CallerLogos[used] = malloc(sizeof(GSM_Bitmap));
 			        if (Backup.CallerLogos[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.CallerLogos[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_CALLER");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.CallerLogos[used] = Bitmap;
 			used ++;
 			Bitmap.Location = used + 1;
 			error=Phone->GetBitmap(&s,&Bitmap);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.SMSC) {
 		printmsg("Checking SMS profiles\n");
 		if (answer_yes("   Backup SMS profiles")) DoBackup = true;
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading: ");
 		while (true) {
 			SMSC.Location = used + 1;
 			error = Phone->GetSMSC(&s,&SMSC);
 			if (error != ERR_NONE) break;
 			if (used < GSM_BACKUP_MAX_SMSC) {
 				Backup.SMSC[used] = malloc(sizeof(GSM_SMSC));
 			        if (Backup.SMSC[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.SMSC[used + 1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_SMSC");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.SMSC[used]=SMSC;
 			used++;
 			printmsgerr("*");
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.StartupLogo) {
 		printmsg("Checking startup text\n");
 		Bitmap.Type = GSM_WelcomeNote_Text;
 		error = Phone->GetBitmap(&s,&Bitmap);
 		if (error == ERR_NONE) {
 			if (answer_yes("   Backup startup logo/text")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		Backup.StartupLogo = malloc(sizeof(GSM_Bitmap));
 	        if (Backup.StartupLogo == NULL) Print_Error(ERR_MOREMEMORY);
 		*Backup.StartupLogo = Bitmap;
 		if (Bitmap.Text[0]==0 && Bitmap.Text[1]==0) {
 			Bitmap.Type = GSM_StartupLogo;
 			error = Phone->GetBitmap(&s,&Bitmap);
 			if (error == ERR_NONE) *Backup.StartupLogo = Bitmap;
 		}
 	}
 	DoBackup = false;
 	if (Info.OperatorLogo) {
 		printmsg("Checking operator logo\n");
 		Bitmap.Type = GSM_OperatorLogo;
 		error=Phone->GetBitmap(&s,&Bitmap);
 		if (error == ERR_NONE) {
 			if (strcmp(Bitmap.NetworkCode,"000 00")!=0) {
 				if (answer_yes("   Backup operator logo")) DoBackup = true;
 			}
 		}
 	}
 	if (DoBackup) {
 		Backup.OperatorLogo = malloc(sizeof(GSM_Bitmap));
 	        if (Backup.OperatorLogo == NULL) Print_Error(ERR_MOREMEMORY);
 		*Backup.OperatorLogo = Bitmap;
 	}
 	DoBackup = false;
 	if (Info.MMSSettings) {
 		printmsg("Checking MMS settings\n");
 		Settings.Location = 1;
 		error=Phone->GetMMSSettings(&s,&Settings);
 		if (error==ERR_NONE) {
 			if (answer_yes("   Backup MMS settings")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
 			if (used < GSM_BACKUP_MAX_MMSSETTINGS) {
 				Backup.MMSSettings[used] = malloc(sizeof(GSM_MultiWAPSettings));
 			        if (Backup.MMSSettings[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.MMSSettings[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_MMSSETTINGS");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.MMSSettings[used]=Settings;
 			used ++;
 			Settings.Location = used+1;
 			error=Phone->GetMMSSettings(&s,&Settings);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.WAPBookmark) {
 		printmsg("Checking WAP bookmarks\n");
 		Bookmark.Location = 1;
 		error=Phone->GetWAPBookmark(&s,&Bookmark);
 		if (error==ERR_NONE) {
 			if (answer_yes("   Backup WAP bookmarks")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
 			if (used < GSM_BACKUP_MAX_WAPBOOKMARK) {
 				Backup.WAPBookmark[used] = malloc(sizeof(GSM_WAPBookmark));
 			        if (Backup.WAPBookmark[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.WAPBookmark[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_WAPBOOKMARK");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.WAPBookmark[used]=Bookmark;
 			used ++;
 			Bookmark.Location = used+1;
 			error=Phone->GetWAPBookmark(&s,&Bookmark);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.WAPSettings) {
 		printmsg("Checking WAP settings\n");
 		Settings.Location = 1;
 		error=Phone->GetWAPSettings(&s,&Settings);
 		if (error==ERR_NONE) {
 			if (answer_yes("   Backup WAP settings")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
 			if (used < GSM_BACKUP_MAX_WAPSETTINGS) {
 				Backup.WAPSettings[used] = malloc(sizeof(GSM_MultiWAPSettings));
 			        if (Backup.WAPSettings[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.WAPSettings[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_WAPSETTINGS");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.WAPSettings[used]=Settings;
 			used ++;
 			Settings.Location = used+1;
 			error=Phone->GetWAPSettings(&s,&Settings);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.Ringtone) {
 		printmsg("Checking user ringtones\n");
 		Ringtone.Location 	= 1;
 		Ringtone.Format		= 0;
 		error=Phone->GetRingtone(&s,&Ringtone,false);
 		if (error==ERR_EMPTY || error == ERR_NONE) {
 			if (answer_yes("   Backup user ringtones")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used 	= 0;
 		i	= 1;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE || error == ERR_EMPTY) {
 			if (error == ERR_NONE) {
 				if (used < GSM_BACKUP_MAX_RINGTONES) {
 					Backup.Ringtone[used] = malloc(sizeof(GSM_Ringtone));
 				        if (Backup.Ringtone[used] == NULL) Print_Error(ERR_MOREMEMORY);
 					Backup.Ringtone[used+1] = NULL;
 				} else {
 					printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_RINGTONES");
 					GSM_Terminate();
 					exit(-1);
 				}
 				*Backup.Ringtone[used]=Ringtone;
 				used ++;
 			}
 			i++;
 			Ringtone.Location = i;
 			Ringtone.Format	  = 0;
 			error=Phone->GetRingtone(&s,&Ringtone,false);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.Profiles) {
 		printmsg("Checking phone profiles\n");
 		Profile.Location = 1;
 		error = Phone->GetProfile(&s,&Profile);
 	        if (error == ERR_NONE) {
 			if (answer_yes("   Backup phone profiles")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading: ");
 		while (true) {
 			Profile.Location = used + 1;
 			error = Phone->GetProfile(&s,&Profile);
 			if (error != ERR_NONE) break;
 			if (used < GSM_BACKUP_MAX_PROFILES) {
 				Backup.Profiles[used] = malloc(sizeof(GSM_Profile));
 				if (Backup.Profiles[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.Profiles[used + 1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_PROFILES");
 				GSM_Terminate();
 				exit(-1);
 			}
 			*Backup.Profiles[used]=Profile;
 			used++;
 			printmsgerr("*");
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
  	if (Info.FMStation) {
 		printmsg("Checking FM stations\n");
  		FMStation.Location = 1;
  		error = Phone->GetFMStation(&s,&FMStation);
  	        if (error == ERR_NONE || error == ERR_EMPTY) {
  			if (answer_yes("   Backup phone FM stations")) DoBackup=true;
 		}
 	}
 	if (DoBackup) {
 		used	= 0;
 		i	= 1;				
 		printmsgerr("   Reading: ");
 		while (error == ERR_NONE || error == ERR_EMPTY) {
 			error = Phone->GetFMStation(&s,&FMStation);
 			if (error == ERR_NONE) {
  				if (used < GSM_BACKUP_MAX_FMSTATIONS) {
  					Backup.FMStation[used] = malloc(sizeof(GSM_FMStation));
 					if (Backup.FMStation[used] == NULL) Print_Error(ERR_MOREMEMORY);
  					Backup.FMStation[used + 1] = NULL;
  				} else {
  					printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_FMSTATIONS");
 					GSM_Terminate();
  					exit(-1);
  				}
  				*Backup.FMStation[used]=FMStation;
  				used++;
  			}
  			i++;
  			FMStation.Location = i;					
  			printmsgerr("*");
  		}
  		printmsgerr("\n");
  	}
 	DoBackup = false;
  	if (Info.GPRSPoint) {
 		printmsg("Checking GPRS access points\n");
  		GPRSPoint.Location = 1;
  		error = Phone->GetGPRSAccessPoint(&s,&GPRSPoint);
  	        if (error == ERR_NONE || error == ERR_EMPTY) {
  			if (answer_yes("   Backup GPRS access points")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used	= 0;
 		i	= 1;				
 		printmsgerr("   Reading: ");
 		while (error == ERR_NONE || error == ERR_EMPTY) {
 			error = Phone->GetGPRSAccessPoint(&s,&GPRSPoint);
  			if (error == ERR_NONE) {
  				if (used < GSM_BACKUP_MAX_GPRSPOINT) {
  					Backup.GPRSPoint[used] = malloc(sizeof(GSM_GPRSAccessPoint));
 					if (Backup.GPRSPoint[used] == NULL) Print_Error(ERR_MOREMEMORY);
  					Backup.GPRSPoint[used + 1] = NULL;
  				} else {
  					printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_GPRSPOINT");
 					GSM_Terminate();
  					exit(-1);
  				}
  				*Backup.GPRSPoint[used]=GPRSPoint;
  				used++;
  			}
  			i++;
  			GPRSPoint.Location = i;					
  			printmsgerr("*");
  		}
  		printmsgerr("\n");
  	}
 
 	GSM_Terminate();
 
 	GSM_SaveBackupFile(argv[2],&Backup, Info.UseUnicode);
     	GSM_FreeBackup(&Backup);
 }
 
 static void Restore(int argc, char *argv[])
 {
 	GSM_Backup		Backup;
 	GSM_FMStation		FMStation;
 	GSM_DateTime 		date_time;
 	GSM_CalendarEntry	Calendar;
 	GSM_Bitmap		Bitmap;
 	GSM_Ringtone		Ringtone;
 	GSM_MemoryEntry		Pbk;
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoEntry		ToDo;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_Profile		Profile;
 	GSM_MultiWAPSettings	Settings;
 	GSM_GPRSAccessPoint	GPRSPoint;
 	GSM_WAPBookmark		Bookmark;
 	int			i, used, max = 0;
 	bool			Past = true;
 	bool			Found, DoRestore;
 
 	error=GSM_ReadBackupFile(argv[2],&Backup);
 	Print_Error(error);
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
 	if (Backup.DateTimeAvailable) 	printmsgerr("Time of backup : %s\n",OSDateTime(Backup.DateTime,false));
 	if (Backup.Model[0]!=0) 	printmsgerr("Phone          : %s\n",Backup.Model);
 	if (Backup.IMEI[0]!=0) 		printmsgerr("IMEI           : %s\n",Backup.IMEI);
 
 	if (Backup.MD5Calculated[0]!=0) {
 		dbgprintf("\"%s\"\n",Backup.MD5Original);
 		dbgprintf("\"%s\"\n",Backup.MD5Calculated);
 		if (strcmp(Backup.MD5Original,Backup.MD5Calculated)) {
 			if (!answer_yes("Checksum in backup file do not match. Continue")) return;			
 		}
 	}
 
 	GSM_Init(true);
 
 	DoRestore = false;
 	if (Backup.PhonePhonebook[0] != NULL) {
 		MemStatus.MemoryType = MEM_ME;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE) {
 			max = 0;
 			while (Backup.PhonePhonebook[max]!=NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 			if (answer_yes("Restore phone phonebook")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		used = 0;
 		for (i=0;i<MemStatus.MemoryUsed+MemStatus.MemoryFree;i++) {
 			Pbk.MemoryType 	= MEM_ME;
 			Pbk.Location	= i + 1;
 			Pbk.EntriesNum	= 0;
 			if (used<max) {
 				if (Backup.PhonePhonebook[used]->Location == Pbk.Location) {
 					Pbk = *Backup.PhonePhonebook[used];
 					used++;
 					dbgprintf("Location %i\n",Pbk.Location);
 					if (Pbk.EntriesNum != 0) error=Phone->SetMemory(&s, &Pbk);
 				}
 			}
 			if (Pbk.EntriesNum == 0) error=Phone->DeleteMemory(&s, &Pbk);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/(MemStatus.MemoryUsed+MemStatus.MemoryFree));
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 
 	DoRestore = false;
 	if (Backup.SIMPhonebook[0] != NULL) {
 		MemStatus.MemoryType = MEM_SM;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE) {
 			max = 0;
 			while (Backup.SIMPhonebook[max]!=NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 			if (answer_yes("Restore SIM phonebook")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		used = 0;
 		for (i=0;i<MemStatus.MemoryUsed+MemStatus.MemoryFree;i++) {
 			Pbk.MemoryType 	= MEM_SM;
 			Pbk.Location	= i + 1;
 			Pbk.EntriesNum	= 0;
 			if (used<max) {
 				if (Backup.SIMPhonebook[used]->Location == Pbk.Location) {
 					Pbk = *Backup.SIMPhonebook[used];
 					used++;
 					dbgprintf("Location %i\n",Pbk.Location);
 					if (Pbk.EntriesNum != 0) error=Phone->SetMemory(&s, &Pbk);
 				}
 			}
 			if (Pbk.EntriesNum == 0) error=Phone->DeleteMemory(&s, &Pbk);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/(MemStatus.MemoryUsed+MemStatus.MemoryFree));
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 
 	DoRestore = false;
 	if (Backup.CallerLogos[0] != NULL) {
 		Bitmap.Type 	= GSM_CallerGroupLogo;
 		Bitmap.Location = 1;
 		error=Phone->GetBitmap(&s,&Bitmap);
 		if (error == ERR_NONE) {
 			if (answer_yes("Restore caller groups and logos")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		max = 0;
 		while (Backup.CallerLogos[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			error=Phone->SetBitmap(&s,Backup.CallerLogos[i]);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	
 	if (!mystrncasecmp(s.CurrentConfig->SyncTime,"yes",0)) {
 		if (/*answer_yes("Do you want to set date/time in phone (NOTE: in some phones it's required to correctly restore calendar notes and other items)")*/ true ) {
 			GSM_GetCurrentDateTime(&date_time);
 
 			error=Phone->SetDateTime(&s, &date_time);
 			Print_Error(error);
 		}
 	}
 	DoRestore = false;
 	if (Backup.Calendar[0] != NULL) {
+				DoRestore = true;
 		/* N6110 doesn't support getting calendar status */
 		error = Phone->GetNextCalendar(&s,&Calendar,true);
 		if (error == ERR_NONE || error == ERR_INVALIDLOCATION || error == ERR_EMPTY) {
 			max = 0;
 			while (Backup.Calendar[max] != NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 				DoRestore = true;
                 /*
 			if (answer_yes("Restore calendar notes")) {
 				Past    = answer_yes("Restore notes from the past");
 				DoRestore = true;
 			}
                 */
 		}
 	}
 	if (DoRestore) {
 		printmsgerr("Deleting old notes: ");
 		error = Phone->DeleteAllCalendar(&s);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
  			while (1) {
 				error = Phone->GetNextCalendar(&s,&Calendar,true);
 				if (error != ERR_NONE) break;
 				error = Phone->DeleteCalendar(&s,&Calendar);
  				Print_Error(error);				
 				printmsgerr("*");
 			}
 			printmsgerr("\n");
 		} else {
 			printmsgerr("Done\n");
 			Print_Error(error);
 		}
 
 		for (i=0;i<max;i++) {
 			if (!Past && IsCalendarNoteFromThePast(Backup.Calendar[i])) continue;
 
 			Calendar = *Backup.Calendar[i];
 			error=Phone->AddCalendar(&s,&Calendar);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 
 	DoRestore = false;
 	if (Backup.ToDo[0] != NULL) {
 		error = Phone->GetToDoStatus(&s,&ToDoStatus);
 		if (error == ERR_NONE) {
+            error == ERR_NOTSUPPORTED;
+            DoRestore = true;
 			max = 0;
 			while (Backup.ToDo[max]!=NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 
 			/*if (answer_yes("Restore ToDo")) */DoRestore = true;
 		}
 	}
 	if (DoRestore) {
+        if ( max > 0 ) {
 		ToDo  = *Backup.ToDo[0];
 		error = Phone->SetToDo(&s,&ToDo);
+        }
 	}
 	if (DoRestore && (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED)) {
 		printmsgerr("Deleting old ToDo: ");
 		error=Phone->DeleteAllToDo(&s);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
 			while (1) {
 				error = Phone->GetNextToDo(&s,&ToDo,true);
 				if (error != ERR_NONE) break;
 				error = Phone->DeleteToDo(&s,&ToDo);
  				Print_Error(error);				
 				printmsgerr("*");
 			}
 			printmsgerr("\n");
 		} else {
 			printmsgerr("Done\n");
 			Print_Error(error);
 		}
 
 		for (i=0;i<max;i++) {
 			ToDo 		= *Backup.ToDo[i];
 			ToDo.Location 	= 0;
 			error=Phone->AddToDo(&s,&ToDo);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	} else if (DoRestore) {
 		/* At first delete entries, that were deleted */
 		used  = 0;
 		error = Phone->GetNextToDo(&s,&ToDo,true);
 		while (error == ERR_NONE) {
 			used++;
 			Found = false;
 			for (i=0;i<max;i++) {
 				if (Backup.ToDo[i]->Location == ToDo.Location) {
 					Found = true;
 					break;
 				}
 			}
 			if (!Found) {
 				error=Phone->DeleteToDo(&s,&ToDo);
 				Print_Error(error);
 			}
 			error = Phone->GetNextToDo(&s,&ToDo,false);
 			printmsgerr("%cCleaning: %i percent",13,used*100/ToDoStatus.Used);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 			
 		/* Now write modified/new entries */
 		for (i=0;i<max;i++) {
 			ToDo  = *Backup.ToDo[i];
 			error = Phone->SetToDo(&s,&ToDo);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
  	}
 
 	if (Backup.SMSC[0] != NULL && answer_yes("Restore SMSC profiles")) {
 		max = 0;
 		while (Backup.SMSC[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			error=Phone->SetSMSC(&s,Backup.SMSC[i]);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	if (Backup.StartupLogo != NULL && answer_yes("Restore startup logo/text")) {
 		error=Phone->SetBitmap(&s,Backup.StartupLogo);
 		Print_Error(error);
 	}
 	if (Backup.OperatorLogo != NULL && answer_yes("Restore operator logo")) {
 		error=Phone->SetBitmap(&s,Backup.OperatorLogo);
 		Print_Error(error);
 	}
 	DoRestore = false;
 	if (Backup.WAPBookmark[0] != NULL) {
 		Bookmark.Location = 1;
 		error = Phone->GetWAPBookmark(&s,&Bookmark);
 		if (error == ERR_NONE || error == ERR_INVALIDLOCATION) {
 			if (answer_yes("Restore WAP bookmarks")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		printmsgerr("Deleting old bookmarks: ");
 		/* One thing to explain: DCT4 phones seems to have bug here.
 		 * When delete for example first bookmark, phone change
 		 * numeration for getting frame, not for deleting. So, we try to
 		 * get 1'st bookmark. Inside frame is "correct" location. We use
 		 * it later
 		 */
 		while (error==ERR_NONE) {
 			error = Phone->DeleteWAPBookmark(&s,&Bookmark);
 			Bookmark.Location = 1;
 			error = Phone->GetWAPBookmark(&s,&Bookmark);
 			printmsgerr("*");
 		}
 		printmsgerr("\n");
 		max = 0;
 		while (Backup.WAPBookmark[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			Bookmark 	  = *Backup.WAPBookmark[i];
 			Bookmark.Location = 0;
 			error=Phone->SetWAPBookmark(&s,&Bookmark);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoRestore = false;
 	if (Backup.WAPSettings[0] != NULL) {
 		Settings.Location = 1;
 		error = Phone->GetWAPSettings(&s,&Settings);
 		if (error == ERR_NONE) {
 			if (answer_yes("Restore WAP settings")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		max = 0;
 		while (Backup.WAPSettings[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			error=Phone->SetWAPSettings(&s,Backup.WAPSettings[i]);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoRestore = false;
 	if (Backup.MMSSettings[0] != NULL) {
 		Settings.Location = 1;
 		error = Phone->GetMMSSettings(&s,&Settings);
 		if (error == ERR_NONE) {
 			if (answer_yes("Restore MMS settings")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		max = 0;
 		while (Backup.MMSSettings[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			error=Phone->SetMMSSettings(&s,Backup.MMSSettings[i]);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoRestore = false;
 	if (Backup.Ringtone[0] != NULL) {
 		Ringtone.Location 	= 1;
 		Ringtone.Format		= 0;
 		error = Phone->GetRingtone(&s,&Ringtone,false);
 		if (error == ERR_NONE || error ==ERR_EMPTY) {
 			if (Phone->DeleteUserRingtones != NOTSUPPORTED) {
 				if (answer_yes("Delete all user ringtones")) DoRestore = true;
 			}
 		}
 	}
 	if (DoRestore) {
 		printmsgerr("Deleting: ");
 		error=Phone->DeleteUserRingtones(&s);
 		Print_Error(error);
 		printmsgerr("Done\n");
 		DoRestore = false;
 		if (answer_yes("Restore user ringtones")) DoRestore = true;
 	}
 	if (DoRestore) {
 		max = 0;
 		while (Backup.Ringtone[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			error=GSM_RingtoneConvert(&Ringtone, Backup.Ringtone[i], Ringtone.Format);
 			Print_Error(error);
 			error=Phone->SetRingtone(&s,&Ringtone,&i);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoRestore = false;
 	if (Backup.Profiles[0] != NULL) {
 		Profile.Location = 1;
 		error = Phone->GetProfile(&s,&Profile);
 		if (error == ERR_NONE) {
 			if (answer_yes("Restore profiles")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		Profile.Location= 0;
 		max = 0;
 		while (Backup.Profiles[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			Profile	= *Backup.Profiles[i];
 			error=Phone->SetProfile(&s,&Profile);
 			Print_Error(error);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoRestore = false;
 	if (Backup.FMStation[0] != NULL) {
 		FMStation.Location = 1;
 		error = Phone->GetFMStation(&s,&FMStation);
 		if (error == ERR_NONE || error == ERR_EMPTY) {
 			if (answer_yes("Restore FM stations")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		printmsgerr("Deleting old FM stations: ");
 		error=Phone->ClearFMStations(&s);
 		Print_Error(error);
 		printmsgerr("Done\n");
 		max = 0;
 		while (Backup.FMStation[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			FMStation = *Backup.FMStation[i];
 			error=Phone->SetFMStation(&s,&FMStation);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoRestore = false;
 	if (Backup.GPRSPoint[0] != NULL) {
 		GPRSPoint.Location = 1;
 		error = Phone->GetGPRSAccessPoint(&s,&GPRSPoint);
 		if (error == ERR_NONE || error == ERR_EMPTY) {
 			if (answer_yes("Restore GPRS Points")) DoRestore = true;
 		}
 	}
 	if (DoRestore) {
 		max = 0;
 		while (Backup.GPRSPoint[max]!=NULL) max++;
 		for (i=0;i<max;i++) {
 			error=Phone->SetGPRSAccessPoint(&s,Backup.GPRSPoint[i]);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 
 	GSM_Terminate();
 }
 
 static void AddNew(int argc, char *argv[])
 {
 	GSM_Backup		Backup;
 	GSM_DateTime 		date_time;
 	GSM_MemoryEntry		Pbk;
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoEntry		ToDo;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_CalendarEntry	Calendar;
 	GSM_WAPBookmark		Bookmark;
 	int			i, max, j;
 
 	error=GSM_ReadBackupFile(argv[2],&Backup);
 	Print_Error(error);
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
 	if (Backup.DateTimeAvailable) 	printmsgerr("Time of backup : %s\n",OSDateTime(Backup.DateTime,false));
 	if (Backup.Model[0]!=0) 	printmsgerr("Phone          : %s\n",Backup.Model);
 	if (Backup.IMEI[0]!=0) 		printmsgerr("IMEI           : %s\n",Backup.IMEI);
 
 	GSM_Init(true);
 
 	if (Backup.PhonePhonebook[0] != NULL) {
 		MemStatus.MemoryType = MEM_ME;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE) {
 			max = 0;
 			while (Backup.PhonePhonebook[max]!=NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 			if (MemStatus.MemoryFree < max) {
 				printmsgerr("Memory has only %i free locations.Exiting\n",MemStatus.MemoryFree);
 			} else if (answer_yes("Add phone phonebook entries")) {
 				for (i=0;i<max;i++) {
 					Pbk 		= *Backup.PhonePhonebook[i];
 					Pbk.MemoryType 	= MEM_ME;
 					error=Phone->AddMemory(&s, &Pbk);
 					Print_Error(error);
 					printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 					if (gshutdown) {
 						GSM_Terminate();
 						exit(0);
 					}
 				}
 				printmsgerr("\n");
 			}
 		}
 	}
 	if (Backup.SIMPhonebook[0] != NULL) {
 		MemStatus.MemoryType = MEM_SM;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE) {
 			max = 0;
 			while (Backup.SIMPhonebook[max]!=NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 			if (MemStatus.MemoryFree < max) {
 				printmsgerr("Memory has only %i free locations.Exiting\n",MemStatus.MemoryFree);
 			} else if (answer_yes("Add SIM phonebook entries")) {
 				j = 1;
 				for (i=0;i<max;i++) {
 					Pbk 		= *Backup.SIMPhonebook[i];
 					Pbk.MemoryType 	= MEM_SM;
 					error=Phone->AddMemory(&s, &Pbk);
 					Print_Error(error);
 					printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 					if (gshutdown) {
 						GSM_Terminate();
 						exit(0);
 					}
 				}
 				printmsgerr("\n");
 			}
 		}
 	}
 
 	if (!mystrncasecmp(s.CurrentConfig->SyncTime,"yes",0)) {
 		if (answer_yes("Do you want to set date/time in phone (NOTE: in some phones it's required to correctly restore calendar notes and other items)")) {
 			GSM_GetCurrentDateTime(&date_time);
 
 			error=Phone->SetDateTime(&s, &date_time);
 			Print_Error(error);
 		}
 	}
 	if (Backup.Calendar[0] != NULL) {
 		error = Phone->GetNextCalendar(&s,&Calendar,true);
 		if (error == ERR_NONE || error == ERR_INVALIDLOCATION || error == ERR_EMPTY) {
 			if (answer_yes("Add calendar notes")) {
 				max = 0;
 				while (Backup.Calendar[max]!=NULL) max++;
 				for (i=0;i<max;i++) {
 					Calendar = *Backup.Calendar[i];
 					error=Phone->AddCalendar(&s,&Calendar);
 					Print_Error(error);
 					printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 					if (gshutdown) {
 						GSM_Terminate();
 						exit(0);
 					}
 				}
 				printmsgerr("\n");
 			}
 		}
 	}
 	if (Backup.ToDo[0] != NULL) {
 		ToDo.Location = 1;
 		error=Phone->GetToDoStatus(&s,&ToDoStatus);
 		if (error == ERR_NONE) {
 			if (answer_yes("Add ToDo")) {
 				max = 0;
 				while (Backup.ToDo[max]!=NULL) max++;
 				for (i=0;i<max;i++) {
 					ToDo  = *Backup.ToDo[i];
 					error = Phone->AddToDo(&s,&ToDo);
 					Print_Error(error);
 					printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 					if (gshutdown) {
 						GSM_Terminate();
 						exit(0);
 					}
 				}
 				printmsgerr("\n");
 			}
 		}
 	}
 	if (Backup.WAPBookmark[0] != NULL) {
 		Bookmark.Location = 1;
 		error = Phone->GetWAPBookmark(&s,&Bookmark);
 		if (error == ERR_NONE || error == ERR_INVALIDLOCATION) {
 			if (answer_yes("Add WAP bookmarks")) {
 				max = 0;
 				while (Backup.WAPBookmark[max]!=NULL) max++;
 				for (i=0;i<max;i++) {
 					Bookmark 	  = *Backup.WAPBookmark[i];
 					Bookmark.Location = 0;
 					error=Phone->SetWAPBookmark(&s,&Bookmark);
 					Print_Error(error);
 					printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 					if (gshutdown) {
 						GSM_Terminate();
 						exit(0);
 					}
 				}
 				printmsgerr("\n");
 			}
 		}
 	}
 
 	GSM_Terminate();
 }
 #endif
 
 static void ClearAll(int argc, char *argv[])
 {
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_CalendarEntry	Calendar;
 	GSM_ToDoEntry		ToDo;
 	GSM_WAPBookmark		Bookmark;
 	GSM_FMStation 		Station;
 	GSM_MemoryEntry		Pbk;
 	bool			DoClear;
 
 	GSM_Init(true);
 
 	DoClear 		= false;
 	MemStatus.MemoryType 	= MEM_ME;
 	error=Phone->GetMemoryStatus(&s, &MemStatus);
 	if (error==ERR_NONE && MemStatus.MemoryUsed !=0) {
 		if (answer_yes("Delete phone phonebook")) DoClear = true;
 	}
 	if (DoClear) {
 		error = Phone->DeleteAllMemory(&s,MEM_ME);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
 			for (i=0;i<MemStatus.MemoryUsed+MemStatus.MemoryFree;i++) {
 				Pbk.MemoryType 	= MEM_ME;
 				Pbk.Location	= i + 1;
 				Pbk.EntriesNum	= 0;
 				error=Phone->DeleteMemory(&s, &Pbk);
 				Print_Error(error);
 				printmsgerr("%cWriting: %i percent",13,(i+1)*100/(MemStatus.MemoryUsed+MemStatus.MemoryFree));
 				if (gshutdown) {
 					GSM_Terminate();
 					exit(0);
 				}
 			}
 			printmsgerr("\n");
 		} else {
 			printmsgerr("Done\n");
 			Print_Error(error);
 		}
 	}
 
 	DoClear 		= false;
 	MemStatus.MemoryType 	= MEM_SM;
 	error=Phone->GetMemoryStatus(&s, &MemStatus);
 	if (error==ERR_NONE && MemStatus.MemoryUsed !=0) {
 		if (answer_yes("Delete SIM phonebook")) DoClear = true;
 	}
 	if (DoClear) {
 		error = Phone->DeleteAllMemory(&s,MEM_SM);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
 			for (i=0;i<MemStatus.MemoryUsed+MemStatus.MemoryFree;i++) {
 				Pbk.MemoryType 	= MEM_SM;
 				Pbk.Location	= i + 1;
 				Pbk.EntriesNum	= 0;
 				error=Phone->DeleteMemory(&s, &Pbk);
 				Print_Error(error);
 				printmsgerr("%cWriting: %i percent",13,(i+1)*100/(MemStatus.MemoryUsed+MemStatus.MemoryFree));
 				if (gshutdown) {
 					GSM_Terminate();
 					exit(0);
 				}
 			}
 			printmsgerr("\n");
 		} else {
 			printmsgerr("Done\n");
 			Print_Error(error);
 		}
 	}
 
 	DoClear = false;
 	error = Phone->GetNextCalendar(&s,&Calendar,true);
 	if (error == ERR_NONE) {
  		if (answer_yes("Delete calendar notes")) DoClear = true;
 	}
 	if (DoClear) {
 		printmsgerr("Deleting: ");
 		error=Phone->DeleteAllCalendar(&s);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
  			while (1) {
 				error = Phone->GetNextCalendar(&s,&Calendar,true);
 				if (error != ERR_NONE) break;
 				error = Phone->DeleteCalendar(&s,&Calendar);
  				Print_Error(error);				
 				printmsgerr("*");
 			}
 			printmsgerr("\n");
 		} else {
 			printmsgerr("Done\n");
 			Print_Error(error);
 		}
 	}
 
 	DoClear = false;
 	error = Phone->GetToDoStatus(&s,&ToDoStatus);
 	if (error == ERR_NONE && ToDoStatus.Used != 0) {
 		if (answer_yes("Delete ToDo")) DoClear = true;
 	}
 	if (DoClear) {
 		printmsgerr("Deleting: ");
 		error=Phone->DeleteAllToDo(&s);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
  			while (1) {
 				error = Phone->GetNextToDo(&s,&ToDo,true);
 				if (error != ERR_NONE) break;
 				error = Phone->DeleteToDo(&s,&ToDo);
  				Print_Error(error);				
 				printmsgerr("*");
 			}
 			printmsgerr("\n");
 		} else {
 			printmsgerr("Done\n");
 			Print_Error(error);
 		}
 	}
 
 	Bookmark.Location = 1;
 	error = Phone->GetWAPBookmark(&s,&Bookmark);
 	if (error == ERR_NONE || error == ERR_INVALIDLOCATION) {
 		if (answer_yes("Delete WAP bookmarks")) {
 			printmsgerr("Deleting: ");
 			/* One thing to explain: DCT4 phones seems to have bug here.
 			 * When delete for example first bookmark, phone change
 			 * numeration for getting frame, not for deleting. So, we try to
 			 * get 1'st bookmark. Inside frame is "correct" location. We use
 			 * it later
 			 */
 			while (error==ERR_NONE) {
 				error = Phone->DeleteWAPBookmark(&s,&Bookmark);
 				Bookmark.Location = 1;
 				error = Phone->GetWAPBookmark(&s,&Bookmark);
 				printmsgerr("*");
 			}
 			printmsgerr("\n");
 		}
 	}
 	if (Phone->DeleteUserRingtones != NOTSUPPORTED) {
 		if (answer_yes("Delete all user ringtones")) {
 			printmsgerr("Deleting: ");
 			error=Phone->DeleteUserRingtones(&s);
 			Print_Error(error);
 			printmsgerr("Done\n");
 		}		
 	}
 	Station.Location=i;
 	error=Phone->GetFMStation(&s,&Station);
 	if (error == ERR_NONE || error == ERR_EMPTY) {
 	 	if (answer_yes("Delete all FM station")) {
  			error=Phone->ClearFMStations(&s);
  			Print_Error(error);
 		}
  	}
 
 	GSM_Terminate();
 }
 
 static void DisplayConnectionSettings(GSM_MultiWAPSettings *settings,int j)
 {
 	if (settings->Settings[j].IsContinuous) {
 		printmsg("Connection type     : Continuous\n");
 	} else {
 		printmsg("Connection type     : Temporary\n");
 	}
 	if (settings->Settings[j].IsSecurity) {
 		printmsg("Connection security : On\n");
 	} else {
 		printmsg("Connection security : Off\n");
 	}
 	printmsg("Proxy               : address \"%s\", port %i\n",DecodeUnicodeConsole(settings->Proxy),settings->ProxyPort);
 	printmsg("2'nd proxy          : address \"%s\", port %i\n",DecodeUnicodeConsole(settings->Proxy2),settings->Proxy2Port);
 	switch (settings->Settings[j].Bearer) {
 	case WAPSETTINGS_BEARER_SMS:
 		printmsg("Bearer              : SMS");
 		if (settings->ActiveBearer == WAPSETTINGS_BEARER_SMS) printf(" (active)");
 		printmsg("\nServer number       : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Server));
 		printmsg("Service number      : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Service));
 		break;
 	case WAPSETTINGS_BEARER_DATA:
 		printmsg("Bearer              : Data (CSD)");
 		if (settings->ActiveBearer == WAPSETTINGS_BEARER_DATA) printf(" (active)");
 		printmsg("\nDial-up number      : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].DialUp));
 		printmsg("IP address          : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].IPAddress));
 		if (settings->Settings[j].ManualLogin) {
 			printmsg("Login Type          : Manual\n");
 		} else {
 			printmsg("Login Type          : Automatic\n");
 		}
 		if (settings->Settings[j].IsNormalAuthentication) {
 			printmsg("Authentication type : Normal\n");
 		} else {
 			printmsg("Authentication type : Secure\n");
 		}
 		if (settings->Settings[j].IsISDNCall) {
 			printmsg("Data call type      : ISDN\n");
               	} else {
 			printmsg("Data call type      : Analogue\n");  
 		}
 		switch (settings->Settings[j].Speed) {
 			case WAPSETTINGS_SPEED_9600  : printmsg("Data call speed     : 9600\n");  break;
 			case WAPSETTINGS_SPEED_14400 : printmsg("Data call speed     : 14400\n"); break;
 			case WAPSETTINGS_SPEED_AUTO  : printmsg("Data call speed     : Auto\n");  break;
 		}
 		printmsg("User name           : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].User));
 		printmsg("Password            : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Password));
 		break;
 	case WAPSETTINGS_BEARER_USSD:
 		printmsg("Bearer              : USSD");
 		if (settings->ActiveBearer == WAPSETTINGS_BEARER_USSD) printf(" (active)");
 		printmsg("\nService code        : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Code));
 		if (settings->Settings[j].IsIP) {
 			printmsg("Address type        : IP address\nIPaddress           : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Service));
 		} else {
 			printmsg("Address type        : Service number\nService number      : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Service));	
 		}
 		break;
 	case WAPSETTINGS_BEARER_GPRS:
 		printmsg("Bearer              : GPRS");
 		if (settings->ActiveBearer == WAPSETTINGS_BEARER_GPRS) printf(" (active)");
 		if (settings->Settings[j].ManualLogin) {
 			printmsg("\nLogin Type          : Manual\n");
 		} else {
 			printmsg("\nLogin Type          : Automatic\n");
 		}
 		if (settings->Settings[j].IsNormalAuthentication) {
 			printmsg("Authentication type : Normal\n");
 		} else {
 			printmsg("Authentication type : Secure\n");
 		}
 		printmsg("Access point        : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].DialUp));
 		printmsg("IP address          : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].IPAddress));
 		printmsg("User name           : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].User));
 		printmsg("Password            : \"%s\"\n",DecodeUnicodeConsole(settings->Settings[j].Password));
 	}
 }
 
 static void GetSyncMLSettings(int argc, char *argv[])
 {
 	GSM_SyncMLSettings	settings;
 	int			start,stop,j;
 
 	GetStartStop(&start, &stop, 2, argc, argv);
 
 	GSM_Init(true);
 
 	for (i=start;i<=stop;i++) {
 		settings.Location=i;
 		error=Phone->GetSyncMLSettings(&s,&settings);
 		Print_Error(error);
 		printmsg("%i. ",i);
 		if (settings.Name[0]==0 && settings.Name[1]==0) {
 			printmsg("Set %i",i);
 		} else {
 			printmsg("%s",DecodeUnicodeConsole(settings.Name));
 		}
 		if (settings.Active) printmsg(" (active)");
 //		if (settings.ReadOnly) printmsg("\nRead only           : yes");
 		printmsg("\n");
 		printmsg("User                : \"%s\"\n",DecodeUnicodeConsole(settings.User));
 		printmsg("Password            : \"%s\"\n",DecodeUnicodeConsole(settings.Password));
 		printmsg("Phonebook database  : \"%s\"\n",DecodeUnicodeConsole(settings.PhonebookDataBase));
 		printmsg("Calendar database   : \"%s\"\n",DecodeUnicodeConsole(settings.CalendarDataBase));
 		printmsg("Server              : \"%s\"\n",DecodeUnicodeConsole(settings.Server));
 		printmsg("Sync. phonebook     : ");
 		if (settings.SyncPhonebook) printmsg("yes\n");
 		if (!settings.SyncPhonebook) printmsg("no\n");
 		printmsg("Sync. calendar      : ");
 		if (settings.SyncCalendar) printmsg("yes\n");
 		if (!settings.SyncCalendar) printmsg("no\n");
 		printmsg("\n");
 		for (j=0;j<settings.Connection.Number;j++) {
 			if (settings.Connection.Settings[j].Title[0]==0 && settings.Connection.Settings[j].Title[1]==0) {
 				printmsg("Connection set name : Set %i\n",i);
 			} else {
 				printmsg("Connection set name : %s\n",DecodeUnicodeConsole(settings.Connection.Settings[j].Title));
 			}
 			DisplayConnectionSettings(&settings.Connection,j);
 			printf("\n");
 		}
 	}
 	GSM_Terminate();
 }
 
 static void GetChatSettings(int argc, char *argv[])
 {
 	GSM_ChatSettings	settings;
 	int			start,stop,j;
 
 	GetStartStop(&start, &stop, 2, argc, argv);
 
 	GSM_Init(true);
 
 	for (i=start;i<=stop;i++) {
 		settings.Location=i;
 		error=Phone->GetChatSettings(&s,&settings);
 		Print_Error(error);
 		printmsg("%i. ",i);
 		if (settings.Name[0]==0 && settings.Name[1]==0) {
 			printmsg("Set %i",i);
 		} else {
 			printmsg("%s",DecodeUnicodeConsole(settings.Name));
 		}
 		if (settings.Active) printmsg(" (active)");
 //		if (settings.ReadOnly) printmsg("\nRead only           : yes");
 		printmsg("\n");
 		printmsg("Homepage            : \"%s\"\n",DecodeUnicodeConsole(settings.HomePage));
 		printmsg("User                : \"%s\"\n",DecodeUnicodeConsole(settings.User));
 		printmsg("Password            : \"%s\"\n",DecodeUnicodeConsole(settings.Password));
 		printmsg("\n");
 		for (j=0;j<settings.Connection.Number;j++) {
 			if (settings.Connection.Settings[j].Title[0]==0 && settings.Connection.Settings[j].Title[1]==0) {
 				printmsg("Connection set name : Set %i\n",i);
 			} else {
 				printmsg("Connection set name : %s\n",DecodeUnicodeConsole(settings.Connection.Settings[j].Title));
 			}
 			DisplayConnectionSettings(&settings.Connection,j);
 			printf("\n");
 		}
 	}
 	GSM_Terminate();
 }
 
 static void GetWAPMMSSettings(int argc, char *argv[])
 {
 	GSM_MultiWAPSettings	settings;
 	int			start,stop,j;
 
 	GetStartStop(&start, &stop, 2, argc, argv);
 
 	GSM_Init(true);
 
 	for (i=start;i<=stop;i++) {
 		settings.Location=i;
@@ -7609,820 +7614,819 @@ void SearchPhoneThread(OneDeviceInfo *Info)
 						Info->s.Phone.Data.Model);
 				} else {
 					if (SearchOutput) printf("   %s\n",print_error(error,Info->s.di.df,Info->s.msg));
 				}
 			} else {
 				if (SearchOutput) printf("   %s\n",print_error(error,Info->s.di.df,Info->s.msg));
 			}
 		} else {
 			if (SearchOutput) printf("   %s\n",print_error(error,Info->s.di.df,Info->s.msg));
 		}
 		if (error != ERR_DEVICEOPENERROR) {
 			GSM_TerminateConnection(&Info->s);
 			dbgprintf("Closing done\n");
 		}
 		if (error == ERR_DEVICEOPENERROR || error == ERR_NONE) break;
 		j++;
 	}
 	num--;
 #endif
 }
 
 //#undef HAVE_PTHREAD
 //#if 0
 #if defined(WIN32) || defined(HAVE_PTHREAD)
 #ifdef HAVE_PTHREAD
 	pthread_t Thread[100];
 #endif
 
 void MakeSearchThread(int i)
 {
 	num++;
 #ifdef HAVE_PTHREAD
 	if (pthread_create(&Thread[i],NULL,(void *)SearchPhoneThread,&SearchDevices[i])!=0) {
 		dbgprintf("Error creating thread\n");
 	}
 #else
 	if (CreateThread((LPSECURITY_ATTRIBUTES)NULL,0,
 		     (LPTHREAD_START_ROUTINE)SearchPhoneThread,&SearchDevices[i],
 		     0,NULL)==NULL) {
 		dbgprintf("Error creating thread\n");
 	}
 #endif
 }
 
 static void SearchPhone(int argc, char *argv[])
 {
 	int 	i,dev = 0, dev2 = 0;
 
 	SearchOutput = false;
 	if (argc == 3 && mystrncasecmp(argv[2], "-debug",0)) SearchOutput = true;
 
 	num = 0;
 #ifdef WIN32
 #  ifdef GSM_ENABLE_IRDADEVICE
 	sprintf(SearchDevices[dev].Device,"");		
 	sprintf(SearchDevices[dev].Connections[0].Connection,"irdaphonet");
 	SearchDevices[dev].Connections[1].Connection[0] = 0;
 	dev++;
 #  endif
 #  ifdef GSM_ENABLE_SERIALDEVICE
 	dev2 = dev;
 	for(i=0;i<10;i++) {
 		sprintf(SearchDevices[dev2].Device,"com%i:",i+1);		
 		sprintf(SearchDevices[dev2].Connections[0].Connection,"fbusdlr3");
 		sprintf(SearchDevices[dev2].Connections[1].Connection,"fbus");
 		sprintf(SearchDevices[dev2].Connections[2].Connection,"at19200");
 		sprintf(SearchDevices[dev2].Connections[3].Connection,"mbus");
 		SearchDevices[dev2].Connections[4].Connection[0] = 0;
 		dev2++;
 	}
 #  endif
 #endif
 #ifdef __linux__
 #  ifdef GSM_ENABLE_IRDADEVICE
 	for(i=0;i<6;i++) {
 		sprintf(SearchDevices[dev].Device,"/dev/ircomm%i",i);
 		sprintf(SearchDevices[dev].Connections[0].Connection,"irdaphonet");
 		sprintf(SearchDevices[dev].Connections[1].Connection,"at19200");
 		SearchDevices[dev].Connections[2].Connection[0] = 0;
 		dev++;
 	}
 #  endif
 #  ifdef GSM_ENABLE_SERIALDEVICE
 	dev2 = dev;
 	for(i=0;i<10;i++) {
 		sprintf(SearchDevices[dev2].Device,"/dev/ttyS%i",i);
 		sprintf(SearchDevices[dev2].Connections[0].Connection,"fbusdlr3");
 		sprintf(SearchDevices[dev2].Connections[1].Connection,"fbus");
 		sprintf(SearchDevices[dev2].Connections[2].Connection,"at19200");
 		sprintf(SearchDevices[dev2].Connections[3].Connection,"mbus");
 		SearchDevices[dev2].Connections[4].Connection[0] = 0;
 		dev2++;
 	}
 	for(i=0;i<8;i++) {
 		sprintf(SearchDevices[dev2].Device,"/dev/ttyD00%i",i);
 		sprintf(SearchDevices[dev2].Connections[0].Connection,"fbusdlr3");
 		sprintf(SearchDevices[dev2].Connections[1].Connection,"fbus");
 		sprintf(SearchDevices[dev2].Connections[2].Connection,"at19200");
 		sprintf(SearchDevices[dev2].Connections[3].Connection,"mbus");
 		SearchDevices[dev2].Connections[4].Connection[0] = 0;
 		dev2++;
 	}
         for(i=0;i<4;i++) {
 		sprintf(SearchDevices[dev2].Device,"/dev/usb/tts/%i",i);
 		sprintf(SearchDevices[dev2].Connections[0].Connection,"fbusdlr3");
 		sprintf(SearchDevices[dev2].Connections[1].Connection,"fbus");
 		sprintf(SearchDevices[dev2].Connections[2].Connection,"at19200");
 		sprintf(SearchDevices[dev2].Connections[3].Connection,"mbus");
 		SearchDevices[dev2].Connections[4].Connection[0] = 0;
 		dev2++;
 	}
 #  endif
 #endif
 	for(i=0;i<dev;i++) MakeSearchThread(i);
 	while (num != 0) my_sleep(5);
 	for(i=dev;i<dev2;i++) MakeSearchThread(i);
 	while (num != 0) my_sleep(5);
 }
 #endif /*Support for threads */
 // #if 0
 static void NokiaGetADC(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	DCT3GetADC(argc,argv);
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	DCT4GetADC(argc, argv);
 #endif
 
 	GSM_Terminate();
 }
 
 static void NokiaDisplayTest(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	DCT3DisplayTest(argc,argv);
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	DCT4DisplayTest(argc, argv);
 #endif
 
 	GSM_Terminate();
 }
 
 static void NokiaGetT9(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	DCT3GetT9(argc,argv);
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	DCT4GetT9(argc, argv);
 #endif
 
 	GSM_Terminate();
 }
 
 static void NokiaVibraTest(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	DCT3VibraTest(argc,argv);
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	DCT4VibraTest(argc, argv);
 #endif
 
 	GSM_Terminate();
 }
 
 static GSM_Parameters Parameters[] = {
 	{"--identify",			0, 0, Identify,			{H_Info,0},			""},
 	{"--version",			0, 0, Version,			{H_Other,0},			""},
 	{"--getdisplaystatus",		0, 0, GetDisplayStatus,		{H_Info,0},			""},	
 	{"--monitor",			0, 1, Monitor,			{H_Info,H_Network,H_Call,0},	"[times]"},
 	{"--setautonetworklogin",	0, 0, SetAutoNetworkLogin,	{H_Network,0},			""},
 	{"--listnetworks",		0, 0, ListNetworks,		{H_Network,0},			""},
 	{"--getgprspoint",		1, 2, GetGPRSPoint,		{H_Nokia,H_Network,0},		"start [stop]"},
 	{"--addfolder",			2, 2, AddFolder,		{H_Filesystem,0},		"parentfolderID name"},
 	{"--getfilesystem",		0, 1, GetFileSystem,		{H_Filesystem,0},		"[-flatall|-flat]"},
 	{"--getfilesystemstatus",	0, 0, GetFileSystemStatus,	{H_Filesystem,0},		""},
 	{"--getfiles",			1,40, GetFiles,			{H_Filesystem,0},		"ID1, ID2, ..."},
 	{"--getfilefolder",		1,40, GetFileFolder,		{H_Filesystem,0},		"ID1, ID2, ..."},
 	{"--addfile",			2, 6, AddFile,			{H_Filesystem,0},		"folderID name [-type JAR|BMP|PNG|GIF|JPG|MIDI|WBMP|AMR|3GP|NRT][-readonly][-protected][-system][-hidden][-newtime]"},
 	{"--nokiaaddfile",		2, 5, NokiaAddFile,		{H_Filesystem,H_Nokia,0},	"MMSUnreadInbox|MMSReadInbox|MMSOutbox|MMSDrafts|MMSSent file sender title"},
 	{"--nokiaaddfile",		2, 5, NokiaAddFile,		{H_Filesystem,H_Nokia,0},	"Application|Game file [-readonly]"},
 	{"--nokiaaddfile",		2, 5, NokiaAddFile,		{H_Filesystem,H_Nokia,0},	"Gallery|Tones file [-name name][-protected][-readonly][-system][-hidden][-newtime]"},
 	{"--deletefiles",		1,20, DeleteFiles,		{H_Filesystem,0},		"fileID"},
 	{"--playringtone",		1, 1, PlayRingtone, 		{H_Ringtone,0},			"file"},
 	{"--playsavedringtone",		1, 1, DCT4PlaySavedRingtone, 	{H_Ringtone,0},			""},
 	{"--getdatetime",		0, 0, GetDateTime,		{H_DateTime,0},			""},
 	{"--setdatetime",		0, 0, SetDateTime,		{H_DateTime,0},			""},
 	{"--getalarm",			0, 0, GetAlarm,			{H_DateTime,0},			""},
 	{"--setalarm",			2, 2, SetAlarm,			{H_DateTime,0},			"hour minute"},
 	{"--resetphonesettings",	1, 1, ResetPhoneSettings,	{H_Settings,0},			"PHONE|DEV|UIF|ALL|FACTORY"},
 	{"--getmemory",			2, 3, GetMemory,		{H_Memory,0},			"DC|MC|RC|ON|VM|SM|ME|FD start [stop]"},
 	{"--getallmemory",		1, 1, GetAllMemory,		{H_Memory,0},			"DC|MC|RC|ON|VM|SM|ME|FD"},
 	{"--searchmemory",		1, 1, SearchMemory,		{H_Memory,0},			"text"},
 	{"--listmemorycategory",	1, 1, ListMemoryCategory,	{H_Memory, H_Category,0},	"text|number"},
 	{"--getfmstation",		1, 2, GetFMStation,		{H_FM,0},			"start [stop]"},
 	{"--getsmsc",			1, 2, GetSMSC,			{H_SMS,0},			"start [stop]"},
 	{"--getsms",			2, 3, GetSMS,			{H_SMS,0},			"folder start [stop]"},
 	{"--deletesms",			2, 3, DeleteSMS,		{H_SMS,0},			"folder start [stop]"},
 	{"--deleteallsms",		1, 1, DeleteAllSMS,		{H_SMS,0},			"folder"},
 	{"--getsmsfolders",		0, 0, GetSMSFolders,		{H_SMS,0},			""},
 	{"--getallsms",			0, 0, GetAllSMS,		{H_SMS,0},			""},
 	{"--geteachsms",		0, 0, GetEachSMS,		{H_SMS,0},			""},
 
 #define SMS_TEXT_OPTIONS	"[-inputunicode][-16bit][-flash][-len len][-autolen len][-unicode][-enablevoice][-disablevoice][-enablefax][-disablefax][-enableemail][-disableemail][-voidsms][-replacemessages ID][-replacefile file]"
 #define SMS_PICTURE_OPTIONS	"[-text text][-unicode][-alcatelbmmi]"
 #define SMS_PROFILE_OPTIONS	"[-name name][-bitmap bitmap][-ringtone ringtone]"
 #define SMS_EMS_OPTIONS		"[-unicode][-16bit][-format lcrasbiut][-text text][-unicodefiletext file][-defsound ID][-defanimation ID][-tone10 file][-tone10long file][-tone12 file][-tone12long file][-toneSE file][-toneSElong file][-fixedbitmap file][-variablebitmap file][-variablebitmaplong file][-animation frames file1 ...][-protected number]"
 #define SMS_SMSTEMPLATE_OPTIONS	"[-unicode][-text text][-unicodefiletext file][-defsound ID][-defanimation ID][-tone10 file][-tone10long file][-tone12 file][-tone12long file][-toneSE file][-toneSElong file][-variablebitmap file][-variablebitmaplong file][-animation frames file1 ...]"
 #define SMS_ANIMATION_OPTIONS	""
 #define SMS_OPERATOR_OPTIONS	"[-netcode netcode][-biglogo]"
 #define SMS_SAVE_OPTIONS	"[-folder id][-unread][-read][-unsent][-sent][-sender number]"
 #define SMS_SEND_OPTIONS	"[-report][-validity HOUR|6HOURS|DAY|3DAYS|WEEK|MAX][-save [-folder number]]"
 #define SMS_COMMON_OPTIONS	"[-smscset number][-smscnumber number][-reply][-maxsms num]"
 
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,0},			"TEXT " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_TEXT_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Ringtone,0},		"RINGTONE file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"OPERATOR file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_OPERATOR_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"CALLER file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"PICTURE file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_PICTURE_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"ANIMATION frames file1 file2... " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_ANIMATION_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSINDICATOR URL Title Sender " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 #ifdef GSM_ENABLE_BACKUP
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"BOOKMARK file location " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"WAPSETTINGS file location DATA|GPRS " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSSETTINGS file location  " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Calendar,0},		"CALENDAR file location " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_ToDo,0},		"TODO file location " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Memory,0},		"VCARD10|VCARD21 file SM|ME location [-nokia]" SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 #endif
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Settings,0},		"PROFILE " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_PROFILE_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,0},			"EMS " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_EMS_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,0},			"SMSTEMPLATE " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_SMSTEMPLATE_OPTIONS},
 
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,0},			"TEXT destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_TEXT_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Ringtone,0},		"RINGTONE destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"OPERATOR destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_OPERATOR_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"CALLER destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"PICTURE destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_PICTURE_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"ANIMATION destination frames file1 file2... " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_ANIMATION_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSINDICATOR destination URL Title Sender " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 #ifdef GSM_ENABLE_BACKUP
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"BOOKMARK destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"WAPSETTINGS destination file location DATA|GPRS " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSSETTINGS destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Calendar,0},		"CALENDAR destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_ToDo,0},		"TODO destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Memory,0},		"VCARD10|VCARD21 destination file SM|ME location [-nokia]" SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 #endif
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Settings,0},		"PROFILE destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS ""SMS_PROFILE_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,0},			"EMS destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_EMS_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,0},			"SMSTEMPLATE destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_SMSTEMPLATE_OPTIONS},
 
 	{"--displaysms",		2,30, SendSaveDisplaySMS,	{H_SMS,0},			"... (options like in sendsms)"},
 
 	{"--addsmsfolder",		1, 1, AddSMSFolder,		{H_SMS,0},			"name"},
 #ifdef HAVE_MYSQL_MYSQL_H
 	{"--smsd",			2, 2, SMSDaemon,		{H_SMS,H_Other,0},		"MYSQL configfile"},
 #endif
 	{"--smsd",			2, 2, SMSDaemon,		{H_SMS,H_Other,0},		"FILES configfile"},
 	{"--sendsmsdsms",		2,30, SendSaveDisplaySMS,	{H_SMS,H_Other,0},		"TEXT|WAPSETTINGS|... destination FILES|MYSQL configfile ... (options like in sendsms)"},
 	{"--getringtone",		1, 2, GetRingtone,		{H_Ringtone,0},			"location [file]"},
 	{"--getphoneringtone",		1, 2, GetRingtone,		{H_Ringtone,0},			"location [file]"},
 	{"--getringtoneslist",		0, 0, GetRingtonesList,		{H_Ringtone,0},			""},
 	{"--setringtone",		1, 6, SetRingtone,		{H_Ringtone,0},			"file [-location location][-scale][-name name]"},
 	{"--nokiacomposer",		1, 1, NokiaComposer,		{H_Ringtone,H_Nokia,0},		"file"},
 	{"--copyringtone",		2, 3, CopyRingtone,		{H_Ringtone,0},			"source destination [RTTL|BINARY]"},
 	{"--getussd",			1, 1, GetUSSD,			{H_Call,0},			"code"},
 	{"--dialvoice",			1, 2, DialVoice,		{H_Call,0},			"number [show|hide]"},
 	{"--getspeeddial",		1, 2, GetSpeedDial,		{H_Call,H_Memory,0},		"start [stop]"},
 	{"--cancelcall",		0, 1, CancelCall,		{H_Call,0},			"[ID]"},
 	{"--answercall",		0, 1, AnswerCall,		{H_Call,0},			"[ID]"},
 	{"--unholdcall",		1, 1, UnholdCall,		{H_Call,0},			"ID"},
 	{"--holdcall",			1, 1, HoldCall,			{H_Call,0},			"ID"},
 	{"--conferencecall",		1, 1, ConferenceCall,		{H_Call,0},			"ID"},
 	{"--splitcall",			1, 1, SplitCall,		{H_Call,0},			"ID"},
 	{"--switchcall",		0, 1, SwitchCall,		{H_Call,0},			"[ID]"},
 	{"--transfercall",		0, 1, TransferCall,		{H_Call,0},			"[ID]"},
 	{"--divert",			3, 5, CallDivert,		{H_Call,0},			"get|set all|busy|noans|outofreach all|voice|fax|data [number timeout]"},
 	{"--canceldiverts",		0, 0, CancelAllDiverts,		{H_Call,0},			""},
 	{"--senddtmf",			1, 1, SendDTMF,			{H_Call,0},			"sequence"},
 	{"--getcalendarsettings",	0, 0, GetCalendarSettings,	{H_Calendar,H_Settings,0},	""},
 	{"--getalltodo",		0, 0, GetAllToDo,		{H_ToDo,0},			""},
 	{"--listtodocategory",		1, 1, ListToDoCategory,		{H_ToDo, H_Category,0},		"text|number"},
 	{"--gettodo",			1, 2, GetToDo,			{H_ToDo,0},			"start [stop]"},
 	{"--deletetodo",		1, 2, DeleteToDo,		{H_ToDo,0},			"start [stop]"},
 	{"--getnote",			1, 2, GetNote,			{H_Note,0},			"start [stop]"},
 	{"--deletecalendar",		1, 2, DeleteCalendar,		{H_Calendar,0},			"start [stop]"},
 	{"--getallcalendar",		0, 0, GetAllCalendar,		{H_Calendar,0},			""},
 	{"--getcalendar",		1, 2, GetCalendar,		{H_Calendar,0},			"start [stop]"},
 	{"--getcategory",       	2, 3, GetCategory,       	{H_Category,H_ToDo,H_Memory,0},	"TODO|PHONEBOOK start [stop]"},
 	{"--getallcategory",	  	1, 1, GetAllCategories,  	{H_Category,H_ToDo,H_Memory,0},	"TODO|PHONEBOOK"},
 	{"--reset",			1, 1, Reset,			{H_Other,0},			"SOFT|HARD"},
 	{"--getprofile",		1, 2, GetProfile,		{H_Settings,0},			"start [stop]"},
 	{"--getsecuritystatus",		0, 0, GetSecurityStatus,	{H_Info,0},			""},
 	{"--entersecuritycode",		2, 2, EnterSecurityCode,	{H_Other,0},			"PIN|PUK|PIN2|PUK2 code"},
 	{"--deletewapbookmark", 	1, 2, DeleteWAPBookmark, 	{H_WAP,0},			"start [stop]"},
 	{"--getwapbookmark",		1, 2, GetWAPBookmark,		{H_WAP,0},			"start [stop]"},
 	{"--getwapsettings",		1, 2, GetWAPMMSSettings,	{H_WAP,0},			"start [stop]"},
 	{"--getmmssettings",		1, 2, GetWAPMMSSettings,	{H_MMS,0},			"start [stop]"},
 	{"--getsyncmlsettings",		1, 2, GetSyncMLSettings,	{H_WAP,0},			"start [stop]"},
 	{"--getchatsettings",		1, 2, GetChatSettings,		{H_WAP,0},			"start [stop]"},
 	{"--savemmsfile",		3, 15,SaveMMSFile,		{H_MMS,0},			"file [-subject text][-text text]"},
 	{"--getbitmap",			1, 3, GetBitmap,		{H_Logo,0},			"STARTUP [file]"},
 	{"--getbitmap",			1, 3, GetBitmap,		{H_Logo,0},			"CALLER location [file]"},
 	{"--getbitmap",			1, 3, GetBitmap,		{H_Logo,0},			"OPERATOR [file]"},
 	{"--getbitmap",			1, 3, GetBitmap,		{H_Logo,0},			"PICTURE location [file]"},
 	{"--getbitmap",			1, 3, GetBitmap,		{H_Logo,0},			"TEXT"},
 	{"--getbitmap",			1, 3, GetBitmap,		{H_Logo,0},			"DEALER"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"STARTUP file|1|2|3"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"COLOURSTARTUP [fileID]"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"WALLPAPER fileID"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"CALLER location [file]"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"OPERATOR [file [netcode]]"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"COLOUROPERATOR [fileID [netcode]]"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"PICTURE file location [text]"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"TEXT text"},
 	{"--setbitmap",			1, 4, SetBitmap,		{H_Logo,0},			"DEALER text"},
 	{"--copybitmap",		1, 3, CopyBitmap,		{H_Logo,0},			"inputfile [outputfile [OPERATOR|PICTURE|STARTUP|CALLER]]"},
 	{"--presskeysequence",		1, 1, PressKeySequence,		{H_Other,0},			"mMnNpPuUdD+-123456789*0#gGrRwW"},
 #if defined(WIN32) || defined(HAVE_PTHREAD)
 	{"--searchphone",		0, 1, SearchPhone,		{H_Other,0},			"[-debug]"},
 #endif
 #ifdef GSM_ENABLE_BACKUP
 	{"--savefile",			4, 5, SaveFile,			{H_Backup,H_Calendar,0},	"CALENDAR target.vcs file location"},
 	{"--savefile",			4, 5, SaveFile,			{H_Backup,H_ToDo,0},		"TODO target.vcs file location"},
 	{"--savefile",			4, 5, SaveFile,			{H_Backup,H_Memory,0},		"VCARD10|VCARD21 target.vcf file SM|ME location"},
 	{"--savefile",			4, 5, SaveFile,			{H_Backup,H_WAP,0},		"BOOKMARK target.url file location"},
 	{"--backup",			1, 2, Backup,			{H_Backup,H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},			"file [-yes]"},
 	{"--backupsms",			1, 1, BackupSMS,		{H_Backup,H_SMS,0},		"file"},
 	{"--restore",			1, 1, Restore,			{H_Backup,H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},			"file"},
 	{"--addnew",			1, 1, AddNew,			{H_Backup,H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},			"file"},
 	{"--restoresms",		1, 1, RestoreSMS,		{H_Backup,H_SMS,0},		"file"},
 	{"--addsms",			2, 2, AddSMS,			{H_Backup,H_SMS,0},		"folder file"},
 #endif
 	{"--clearall",			0, 0, ClearAll,			{H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},	""},
 	{"--networkinfo",		0, 0, NetworkInfo,		{H_Network,0},			""},
 #ifdef GSM_ENABLE_AT	
 	{"--siemenssatnetmon",		0, 0, ATSIEMENSSATNetmon,	{H_Siemens,H_Network,0},	""},
 	{"--siemensnetmonact",		1, 1, ATSIEMENSActivateNetmon,	{H_Siemens,H_Network,0},	"netmon_type (1-full, 2-simple)"},	
 	{"--siemensnetmonitor",		1, 1, ATSIEMENSNetmonitor,	{H_Siemens,H_Network,0},	"test"},
 #endif	
 #ifdef GSM_ENABLE_NOKIA6110
 	{"--nokiagetoperatorname", 	0, 0, DCT3GetOperatorName,	{H_Nokia,H_Network,0},		""},
 	{"--nokiasetoperatorname", 	0, 2, DCT3SetOperatorName,	{H_Nokia,H_Network,0},		"[networkcode name]"},
 	{"--nokiadisplayoutput", 	0, 0, DCT3DisplayOutput,	{H_Nokia,0},			""},
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	{"--nokianetmonitor",		1, 1, DCT3netmonitor,		{H_Nokia,H_Network,0},		"test"},
 	{"--nokianetmonitor36",		0, 0, DCT3ResetTest36,		{H_Nokia,0},			""},
 	{"--nokiadebug",		1, 2, DCT3SetDebug,		{H_Nokia,H_Network,0},		"filename [[v11-22][,v33-44]...]"},
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	{"--nokiasetvibralevel",	1, 1, DCT4SetVibraLevel,	{H_Nokia,H_Other,0},		"level"},
 	{"--nokiagetvoicerecord",	1, 1, DCT4GetVoiceRecord,	{H_Nokia,H_Other,0},		"location"},
 	{"--nokiasetlights",		2, 2, DCT4SetLight,		{H_Nokia,H_Tests,0},		"keypad|display|torch on|off"},
 	{"--nokiatuneradio",		0, 0, DCT4TuneRadio,		{H_Nokia,H_FM,0},		""},
 	{"--nokiamakecamerashoot",	0, 0, DCT4MakeCameraShoot,	{H_Nokia,H_Other,0},		""},
 	{"--nokiagetscreendump",	0, 0, DCT4GetScreenDump,	{H_Nokia,H_Other,0},		""},
 #endif
 #if defined(GSM_ENABLE_NOKIA_DCT3) || defined(GSM_ENABLE_NOKIA_DCT4)
 	{"--nokiavibratest",		0, 0, NokiaVibraTest,		{H_Nokia,H_Tests,0},		""},
 	{"--nokiagett9",		0, 0, NokiaGetT9,		{H_Nokia,H_SMS,0},		""},
 	{"--nokiadisplaytest",		1, 1, NokiaDisplayTest,		{H_Nokia,H_Tests,0},		"number"},
 	{"--nokiagetadc",		0, 0, NokiaGetADC,		{H_Nokia,H_Tests,0},		""},
 	{"--nokiasecuritycode",		0, 0, NokiaSecurityCode,	{H_Nokia,H_Info,0},		""},
 	{"--nokiaselftests",		0, 0, NokiaSelfTests,		{H_Nokia,H_Tests,0},		""},
 	{"--nokiasetphonemenus",	0, 0, NokiaSetPhoneMenus,	{H_Nokia,H_Other,0},		""},
 #endif
 #ifdef DEBUG
 	{"--decodesniff",		2, 3, decodesniff,		{H_Decode,0},			"MBUS2|IRDA file [phonemodel]"},
 	{"--decodebinarydump",		1, 2, decodebinarydump,		{H_Decode,0},			"file [phonemodel]"},
 	{"--makeconverttable",		1, 1, MakeConvertTable,		{H_Decode,0},			"file"},
 #endif
 	{"",				0, 0, NULL			}
 };
 
 static HelpCategoryDescriptions HelpDescriptions[] = {
 	{H_Call,	"call",		"Calls",},
 	{H_SMS,		"sms",		"SMS and EMS"},
 	{H_Memory,	"memory",	"Memory (phonebooks and calls)"},
 	{H_Filesystem,	"filesystem",	"Filesystem"},
 	{H_Logo,	"logo",		"Logo and pictures"},
 	{H_Ringtone,	"ringtone",	"Ringtones"},
 	{H_Calendar,	"calendar",	"Calendar notes"},
 	{H_ToDo,	"todo",		"To do lists"},
 	{H_Note,	"note",		"Notes"},
 	{H_DateTime,	"datetime",	"Date, time and alarms"},
 	{H_Category,	"category",	"Categories"},
 #ifdef GSM_ENABLE_BACKUP
 	{H_Backup,	"backup",	"Backing up and restoring"},
 #endif
 #if defined(GSM_ENABLE_NOKIA_DCT3) || defined(GSM_ENABLE_NOKIA_DCT4)
 	{H_Nokia,	"nokia",	"Nokia specific"},
 #endif
 #ifdef GSM_ENABLE_AT
 	{H_Siemens,	"siemens",	"Siemens specific"},
 #endif
 	{H_Network,	"network",	"Network"},
 	{H_WAP,		"wap",		"WAP settings and bookmarks"},
 	{H_MMS,		"mms",		"MMS and MMS settings"},
 	{H_Tests,	"tests",	"Phone tests"},
 	{H_FM,		"fm",		"FM radio"},
 	{H_Info,	"info",		"Phone information"},
 	{H_Settings,	"settings",	"Phone settings"},
 #ifdef DEBUG
 	{H_Decode,	"decode",	"Dumps decoding"},
 #endif
 	{H_Other,	"other",	"Functions that don't fit elsewhere"},
 	{0,		NULL,		NULL}
 };
 	
 
 void HelpHeader(void)
 {
 	printmsg("[Gammu version %s built %s %s]\n\n",VERSION,__TIME__,__DATE__);
 }
 
 static void HelpGeneral(void)
 {
 	int	i=0;
 
 	HelpHeader();
 
  	printmsg("Usage: gammu [confign] [nothing|text|textall|binary|errors] [options]\n\n");
  	printmsg("First parameter optionally specifies which config section to use (by default are probed all).\n");
  	printmsg("Second parameter optionally controls debug level, next specify actions.\n\n");
 
 	/* We might want to put here some most used commands */
 	printmsg("For more details call help on specific topic (gammu --help topic), topics are:\n\n");
 
 	while (HelpDescriptions[i].category != 0) {
 		printf("%11s - %s\n", HelpDescriptions[i].option, HelpDescriptions[i].description);
 		i++;
 	}
 	printf("\n");
 }
 
 static void HelpSplit(int cols, int len, unsigned char *buff)
 {
 	int		l, len2, pos, split;
 	bool		in_opt,first=true;
 	char		*remain, spaces[50], buffer[500];
 
 	if (cols == 0) {
 		printf(" %s\n", buff);
 	} else {
 		printf(" ");
 		spaces[0] = 0;
 		len2 = strlen(buff);
 		if (len + len2 < cols) {
 			printf("%s\n", buff);
 		} else {
 			for(l = 0; l < len; l++) strcat(spaces, " "); 
 
 			remain = buff;
 
 			while (strlen(remain) > 0) {
 				split	= 0;
 				pos	= 0;
 				in_opt	= false;
 				if (!first) printf(spaces);
 				while (pos < cols - len && remain[pos] != 0) {
 					if (in_opt && remain[pos] == ']') {
 						in_opt = false;
 						split  = pos;
 					} else if (remain[pos] == '[') {
 						in_opt = true;
 					} else if (!in_opt && remain[pos] == ' ') {
 						split = pos - 1;
 					}
 					pos++;
 				}
 				/* Can not be split */
 				if (split == 0) {
 					printf("%s\n", remain);
 					remain += strlen(remain);
 				} else {
 					first = false;
 					split++;
 					strncpy(buffer, remain, split);
 					buffer[split] = 0;
 					printf("%s\n", buffer);
 					remain += split;
 					if (remain[0] == ' ') remain++;
 				}
 			}
 		}
 	}
 }
 
 static void Help(int argc, char *argv[])
 {
 	int				i = 0, j = 0, k, cols;
 	bool				disp;
 #ifdef TIOCGWINSZ
 	struct winsize			w;
 #endif
 #if defined(WIN32) || defined(DJGPP)
 #else
 	char				*columns;
 #endif
 
 	/* Just --help */
 	if (argc == 2) {
 		HelpGeneral();
 		return;
 	}
 
 	if (!strcmp(argv[2],"all")) {
 		HelpHeader();
 	} else {
 		while (HelpDescriptions[i].category != 0) {
 			if (strcmp(argv[2], HelpDescriptions[i].option) == 0) break;
 			i++;
 		}
 		if (HelpDescriptions[i].category == 0) {
 			HelpGeneral();
 			printmsg("Unknown help topic specified!\n");
 			return;
 		}
 		HelpHeader();
 		printmsg("Gammu parameters, topic: %s\n\n", HelpDescriptions[i].description);
 	}
 
 #if defined(WIN32) || defined(DJGPP)
 	cols = 80;
 #else
 	cols = 0;
 	/* If stdout is a tty, we will wrap to columns it has */
 	if (isatty(1)) {
 #ifdef TIOCGWINSZ
 		if (ioctl(2, TIOCGWINSZ, &w) == 0) {
 			if (w.ws_col > 0) cols = w.ws_col;
 		}
 #endif
 		if (cols == 0) {
 			columns = getenv("COLUMNS");
 			if (columns != NULL) {
 				cols = atoi(columns);
 				if (cols <= 0) cols = 0;
 			}
 		}
 		
 		if (cols == 0) {
 			/* Fallback */
 			cols = 80;
 		}
 	}
 #endif
 
 	while (Parameters[j].Function != NULL) {
 		k 	= 0;
 		disp 	= false;
 		if (!strcmp(argv[2],"all")) {
 			if (j==0) disp = true;
 			if (j!=0) {
 				if (strcmp(Parameters[j].help,Parameters[j-1].help)) {
 					disp = true;
 				} else {
 					if (strcmp(Parameters[j].parameter,Parameters[j-1].parameter)) {
 						disp = true;
 					}
 				}
 			}
 		} else {
 			while (Parameters[j].help_cat[k] != 0) {
 				if (Parameters[j].help_cat[k] == HelpDescriptions[i].category) {
 					disp = true;
 					break;
 				}
 				k++;
 			}
 		}
 		if (disp) {
 			printf("%s", Parameters[j].parameter);
 			if (Parameters[j].help[0] == 0) {
 				printf("\n");
 			} else {
 				HelpSplit(cols - 1, strlen(Parameters[j].parameter) + 1, Parameters[j].help);
 			}
 		}
 		j++;
 	}
 }
 #if 0
 #endif // 0
 int main(int argc, char *argv[])
 {
  
     //fprintf(stderr,"HIIIIIIIIIIIII  \n");
     //#if 0
 	static int 	z ,start,i;
 	static int	only_config ;
 #if !defined(WIN32) && defined(LOCALE_PATH)
 	static char	*locale, locale_file[201];
 #endif
     static 	char	*cp; 
  	static bool	count_failed;
 	z = 0;
     start=0;only_config = -1;count_failed = false;
 	s.opened 	= false;
 	s.msg	 	= NULL;
 	s.ConfigNum 	= 0;
 
 	setlocale(LC_ALL, "");
 #ifdef DEBUG
 	di.dl		= DL_TEXTALL;
 	di.df	 	= stdout;
 #endif
     //#if 0
  	/* Any parameters? */
 	if (argc == 1) {
 		HelpGeneral();
 		printmsg("Too few parameters!\n");
 		exit(1);
 	}
 
  	/* Help? */
 	if (strncmp(argv[1 + start], "--help", 6) == 0) {
 		Help(argc - start, argv + start);
 		exit(1);
 	}
 
  	/* Is first parameter numeric? If so treat it as config that should be loaded. */	
 	//if (isdigit(argv[1][0])) {
     //only_config = atoi(argv[1]);
     //if (only_config >= 0) start++; else only_config = -1;
 	//}
     only_config = 0;;
 #if 0
     GSM_ReadConfig(NULL, &s.Config[0], 0);
 	s.ConfigNum 	= 1;
     GSM_Config *con = &s.Config[0];
 
     char* tempC;
     tempC = argv[argc-1]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using model %s \n",tempC);
 		strcpy(con->Model,tempC );
      }
     tempC = argv[argc-2]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using device %s \n",tempC);
         con->Device = strdup(tempC);
 		con->DefaultDevice = false;
      }
     tempC = argv[argc-3]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using connection %s \n",tempC);
         con->Connection = strdup(tempC);
 		con->DefaultConnection = false;
      }
     argc = argc-3;
     //#if 0
     if ( ! mConnection.isEmpty() ) {
         cfg->Connection = strdup(mConnection.latin1());
 		cfg->DefaultConnection = false;
         qDebug("Connection set %s ", cfg->Connection );
 
     }
     if ( ! mDevice.isEmpty() ) {
         cfg->Device = strdup(mDevice.latin1());
 		cfg->DefaultDevice = false;
         qDebug("Device  set %s ", cfg->Device);
 
     }
     if ( ! mModel.isEmpty() ) {
 		strcpy(cfg->Model,mModel.latin1() );
 		cfg->DefaultModel = false;
         qDebug("Model  set %s ",cfg->Model );
     }
 
 #endif
 
 
 	cfg=GSM_FindGammuRC();
 	for (i = 0; i <= MAX_CONFIG_NUM; i++) {
 		if (cfg!=NULL) {
 		        cp = INI_GetValue(cfg, "gammu", "gammucoding", false);
         		if (cp) di.coding = cp;
 
 		        s.Config[i].Localize = INI_GetValue(cfg, "gammu", "gammuloc", false);
         		if (s.Config[i].Localize) {
 				s.msg=INI_ReadFile(s.Config[i].Localize, true);
 			} else {
 #if !defined(WIN32) && defined(LOCALE_PATH)
  				locale = setlocale(LC_MESSAGES, NULL);
  				if (locale != NULL) {
 					snprintf(locale_file, 200, "%s/gammu_%c%c.txt",
 							LOCALE_PATH,
 							tolower(locale[0]),
 							tolower(locale[1]));
 					s.msg = INI_ReadFile(locale_file, true);
 				}
 #endif
 			}
 		}
 
 		/* Wanted user specific configuration? */
 
 		if (only_config != -1) {
 			/* Here we get only in first for loop */
 			if (!GSM_ReadConfig(cfg, &s.Config[0], only_config)) break;
 		} else {
 			if (!GSM_ReadConfig(cfg, &s.Config[i], i) && i != 0) break;
 		}
 		s.ConfigNum++;
 
      		/* We want to use only one file descriptor for global and state machine debug output */
  	    	s.Config[i].UseGlobalDebugFile = true;
 		
 		/* It makes no sense to open several debug logs... */
 		if (i != 0) {
 			strcpy(s.Config[i].DebugLevel, s.Config[0].DebugLevel);
 			free(s.Config[i].DebugFile);
 			s.Config[i].DebugFile = strdup(s.Config[0].DebugFile);
  		} else {
 			/* Just for first config */
 			/* When user gave debug level on command line */
 			if (argc > 1 + start && GSM_SetDebugLevel(argv[1 + start], &di)) {
 				/* Debug level from command line will be used with phone too */
 				strcpy(s.Config[i].DebugLevel,argv[1 + start]);
 				start++;
 			} else {
 				/* Try to set debug level from config file */
 				GSM_SetDebugLevel(s.Config[i].DebugLevel, &di);
 			}
 			/* If user gave debug file in gammurc, we will use it */
 			error=GSM_SetDebugFile(s.Config[i].DebugFile, &di);
 			Print_Error(error);
  		}
 
  		/* We wanted to read just user specified configuration. */
  		if (only_config != -1) {break;}
  	}
 #if 0
  GSM_Config *con = &s.Config[0];
 
     char* tempC;
     tempC = argv[argc-1]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using model %s \n",tempC);
 		strcpy(con->Model,tempC );
      }
     tempC = argv[argc-2]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using device %s \n",tempC);
         con->Device = strdup(tempC);
 		con->DefaultDevice = false;
      }
     tempC = argv[argc-3]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using connection %s \n",tempC);
         con->Connection = strdup(tempC);
 		con->DefaultConnection = false;
      }
 #endif
-    argc = argc-3;
 
 
 	/* Do we have enough parameters? */
  	if (argc == 1 + start) {
  		HelpGeneral();
  		printmsg("Too few parameters!\n");
 		exit(-2);
 	}
 
 	/* Check used version vs. compiled */
 	if (!mystrncasecmp(GetGammuVersion(),VERSION,0)) {
 		printmsg("ERROR: version of installed libGammu.so (%s) is different to version of Gammu (%s)\n",
 					GetGammuVersion(),VERSION);
 		exit(-1);
 	}
 
 	/* Check parameters */
 	while (Parameters[z].Function != NULL) {
 		if (mystrncasecmp(Parameters[z].parameter,argv[1+start], 0)) {
 			if (argc-2-start >= Parameters[z].min_arg && argc-2-start <= Parameters[z].max_arg) {
                 fprintf(stderr,"Executing  \n");        
 				Parameters[z].Function(argc - start, argv + start);
  				break;
 			} else {
 				count_failed = true;
  			}
  		}
 		z++;
 	}
 
 	/* Tell user when we did nothing */
 	if (Parameters[z].Function == NULL) {
 		HelpGeneral();
 		if (count_failed) {
 			printmsg("Bad parameter count!\n");
 		} else {
 			printmsg("Bad option!\n");
  		}
  	}
 
      	/* Close debug output if opened */
      	if (di.df!=stdout) fclose(di.df);
         //#endif // 0
         fprintf(stderr,"kammu: Success. End.  \n");        
 	exit(0);
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
 
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 6df639f..ef69bce 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -1,620 +1,636 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qxml.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
 #include "calendar.h"
 #include "alarm.h"
 #include "recurrence.h"
 #include "calendarlocal.h"
 
 #include "phoneformat.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 class PhoneParser : public QObject
 {
 public:
     PhoneParser(   )  {
         ;
     }
    
     static QString dtToString( const QDateTime& dti, bool useTZ = false )
     {
         QString datestr;
         QString timestr;
         int offset =  KGlobal::locale()->localTimeOffset( dti );
         QDateTime   dt;
         if (useTZ)
             dt =  dti.addSecs ( -(offset*60));
         else
             dt =  dti;
         if(dt.date().isValid()){
             const QDate& date = dt.date();
             datestr.sprintf("%04d%02d%02d",
                             date.year(), date.month(), date.day());
         }
         if(dt.time().isValid()){
             const QTime& time = dt.time();
             timestr.sprintf("T%02d%02d%02d",
                             time.hour(), time.minute(), time.second());
         }
         return datestr + timestr;
     }
 
 
 };
 
   
 
 PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model )
 {
     mProfileName = profileName;
     mDevice = device;
     mConnection = connection;
     mModel = model; 
 }
 
 PhoneFormat::~PhoneFormat()
 {
 }
 #if 0
 int PhoneFormat::initDevice(GSM_StateMachine *s)
 {
     GSM_ReadConfig(NULL, &s->Config[0], 0);
 	s->ConfigNum 	= 1;
     GSM_Config *cfg = &s->Config[0];
     if ( ! mConnection.isEmpty() ) {
         cfg->Connection = strdup(mConnection.latin1());
 		cfg->DefaultConnection = false;
         qDebug("Connection set %s ", cfg->Connection );
 
     }
     if ( ! mDevice.isEmpty() ) {
         cfg->Device = strdup(mDevice.latin1());
 		cfg->DefaultDevice = false;
         qDebug("Device  set %s ", cfg->Device);
 
     }
     if ( ! mModel.isEmpty() ) {
 		strcpy(cfg->Model,mModel.latin1() );
 		cfg->DefaultModel = false;
         qDebug("Model  set %s ",cfg->Model );
     }
     int error=GSM_InitConnection(s,3);
     return error;
 }
 #endif
 ulong PhoneFormat::getCsumTodo( Todo* todo )
 {
     QStringList  attList;
     if ( todo->hasDueDate() )
         attList << PhoneParser::dtToString ( todo->dtDue() );
     attList << todo->summary();
     QString completedString = "no";
     if ( todo->isCompleted() )
         completedString = "yes";
     attList << completedString; 
-    attList << QString::number( todo->priority() ); 
+    int prio = todo->priority();
+    if( prio == 2 ) prio = 1;
+    if (prio == 4 ) prio = 5 ;
+    attList << QString::number( prio ); 
     QString alarmString = "na";
     Alarm *alarm;
     if (  todo->alarms().count() > 0 ) {
         alarm = todo->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number(alarm->startOffset().asSeconds()  );
         }
     }
     attList << alarmString;
     attList << todo->categoriesStr();
     attList << todo->secrecyStr(); 
     return PhoneFormat::getCsum(attList );  
 
 }
 ulong PhoneFormat::getCsumEvent( Event* event )
 {
     QStringList  attList;
     attList << PhoneParser::dtToString ( event->dtStart() );
     attList << PhoneParser::dtToString ( event->dtEnd() );
     attList <<  event->summary();
     attList <<  event->location();
     QString alarmString = "na";
     Alarm *alarm;
     if (  event->alarms().count() > 0 ) {
         alarm = event->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number( alarm->startOffset().asSeconds() );
         }
     }
     attList <<  alarmString;
     Recurrence* rec = event->recurrence();
     QStringList  list;
     bool writeEndDate = false;
     switch ( rec->doesRecur() )
         {
         case Recurrence::rDaily: // 0
             list.append( "0" );
             list.append( QString::number( rec->frequency() ));//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
         case Recurrence::rWeekly:// 1
             list.append( "1" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             {
                 int days = 0;
                 QBitArray weekDays = rec->days(); 
                 int i;
                 for( i = 1; i <= 7; ++i ) {
                     if ( weekDays[i-1] ) {
                         days += 1 << (i-1);
                     }
                 }
                 list.append( QString::number( days ) );
             }
             //pending weekdays
             writeEndDate = true;
            
             break;
         case Recurrence::rMonthlyPos:// 2
             list.append( "2" );
             list.append( QString::number( rec->frequency()) );//12
            
             writeEndDate = true; 
             {
                 int count = 1;
                 QPtrList<Recurrence::rMonthPos> rmp;
                 rmp = rec->monthPositions();
                 if ( rmp.first()->negative )
                     count = 5 - rmp.first()->rPos - 1;
                 else
                     count = rmp.first()->rPos - 1;
                 list.append( QString::number( count ) );
            
             }
 
             list.append( "0" );
             break;
         case Recurrence::rMonthlyDay:// 3
             list.append( "3" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
         case Recurrence::rYearlyMonth://4
             list.append( "4" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
        
         default:
             list.append( "255" );
             list.append( QString() );
             list.append( "0" );
             list.append( QString() );
             list.append( "0" );
             list.append( "20991231T000000" );
             break;
         }
     if  ( writeEndDate ) {
         
         if ( rec->endDate().isValid() ) { // 15 + 16
             list.append( "1" );
             list.append( PhoneParser::dtToString( rec->endDate()) );
         } else {
             list.append( "0" );
             list.append( "20991231T000000" );
         }
         
     }
     attList << list.join("");
     attList << event->categoriesStr();
     //qDebug("csum cat %s", event->categoriesStr().latin1()); 
 
     attList << event->secrecyStr();
     return PhoneFormat::getCsum(attList );  
 }
 ulong PhoneFormat::getCsum( const QStringList &  attList)
 {
-    int max = attList.count() -1;
+    int max = attList.count();
     ulong cSum = 0;
     int j,k,i;
     int add;
-    for ( i = 1; i < max ; ++i ) {
+    for ( i = 0; i < max ; ++i ) {
         QString s = attList[i];
         if ( ! s.isEmpty() ){
             j = s.length();
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
-                add = add * mul *i*i*i;
+                int ii = i+1;
+                add = add * mul *ii*ii*ii;
                 cSum += add;
             }
         }
+        if ( i == 0 )
+            qDebug("csum: i == 0 %d ", cSum); 
+            
     }
-    //QString dump = attList.join(",");
-    //qDebug("csum: %s", dump.latin1()); 
+    QString dump = attList.join(",");
+    qDebug("csum: %d %s", cSum,dump.latin1()); 
     
     return cSum;
 
 }
 //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
 #include <stdlib.h>
 #define DEBUGMODE false
 bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
 {
 
     QString fileName;
 #ifdef _WIN32_
     fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     fileName = "/tmp/kdepimtemp.vcs";
 #endif
-    QString command ="./kammu --backup " + fileName + " -yes -C" + 
-        mConnection +" -D" + mDevice +" -M" + mModel;
+    QString command ="./kammu --backup " + fileName + " -yes" ;
     int ret = system (  command.latin1() );
     if ( ret != 0 ) {
         qDebug("Error::command returned %d", ret); 
         return false;
     }
     qDebug("Command returned %d", ret); 
     VCalFormat vfload;
     vfload.setLocalTime ( true ); 
     qDebug("loading file ..."); 
 
     if ( ! vfload.load( calendar, fileName ) )
         return false;
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     qDebug("reading events... "); 
     while ( ev ) {
         QStringList cat = ev->categories();
         if ( cat.contains( "MeetingDEF" )) {
             ev->setCategories( QStringList() );
         }
         int id = ev->pilotId();
         Event *event;
         event = existingCal->event( mProfileName ,QString::number( id ) );
         if ( event ) {
             event = (Event*)event->clone();
             copyEvent( event,  ev );
             calendar->deleteEvent( ev );
             calendar->addEvent( event);
         }
         else
             event = ev;
         uint cSum;
         cSum = PhoneFormat::getCsumEvent( event );
         event->setCsum( mProfileName, QString::number( cSum ));
         event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
         event->setID( mProfileName,QString::number( id ) );
         ev =  er.next();
     }
     {
         qDebug("reading todos... "); 
         QPtrList<Todo> tr = calendar->rawTodos();
         Todo* ev = tr.first();  
         while ( ev ) {
 
             QStringList cat = ev->categories();
             if ( cat.contains( "MeetingDEF" )) {
                 ev->setCategories( QStringList() );
             }
             int id = ev->pilotId();
             Todo *event;
             event = existingCal->todo( mProfileName ,QString::number( id ) );
             if ( event ) {
+                qDebug("copy todo %s ", event->summary().latin1()); 
+
                 event = (Todo*)event->clone();
                 copyTodo( event,  ev );
                 calendar->deleteTodo( ev );
                 calendar->addTodo( event);
             }
             else
                 event = ev;
             uint cSum;
             cSum = PhoneFormat::getCsumTodo( event );
             event->setCsum( mProfileName, QString::number( cSum ));
             event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
             event->setID( mProfileName,QString::number( id ) );
             ev =  tr.next();
         }
     }
     return true;
 }
 void PhoneFormat::copyEvent( Event* to,  Event* from )
 {
     if ( from->dtStart().isValid() )
         to->setDtStart(  from->dtStart() );
     if ( from->dtEnd().isValid() )
         to->setDtEnd(  from->dtEnd() );
     if ( !from->location().isEmpty() )
         to->setLocation(  from->location() );
     if ( !from->description().isEmpty() )
         to->setDescription(  from->description() );
     if ( !from->summary().isEmpty() )
         to->setSummary(  from->summary() );
 
     QPtrListIterator<Alarm> it( from->alarms() );
-    to->clearAlarms();
+    if ( it.current() )
+        to->clearAlarms();
     const Alarm *a;
     while( (a = it.current()) ) {
         Alarm *b = new Alarm( *a );
         b->setParent( to );
         to->addAlarm( b );
         ++it;
     }
     QStringList cat = to->categories();
     QStringList catFrom = from->categories();
     QString nCat;
     int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 cat << nCat;
             }
     }
     to->setCategories( cat );
     Recurrence * r = new Recurrence( *from->recurrence(),to);
     to->setRecurrence( r ) ;
 
 
 }
 void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 {
     if ( from->dtStart().isValid() )
         to->setDtStart(  from->dtStart() );
     if ( from->dtDue().isValid() )
         to->setDtDue(  from->dtDue() );
     if ( !from->location().isEmpty() )
         to->setLocation(  from->location() );
     if ( !from->description().isEmpty() )
         to->setDescription(  from->description() );
     if ( !from->summary().isEmpty() )
         to->setSummary(  from->summary() );
 
     QPtrListIterator<Alarm> it( from->alarms() );
-    to->clearAlarms();
+    if ( it.current() )
+        to->clearAlarms();
     const Alarm *a;
     while( (a = it.current()) ) {
         Alarm *b = new Alarm( *a );
         b->setParent( to );
         to->addAlarm( b );
         ++it;
     }
     QStringList cat = to->categories();
     QStringList catFrom = from->categories();
     QString nCat;
     int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 cat << nCat;
             }
     }
     to->setCategories( cat );
     if ( from->isCompleted() ) {
         to->setCompleted( true );
         if( from->completed().isValid() )
             to->setCompleted( from->completed() );
     } else {
         // set percentcomplete only, if to->isCompleted()
         if ( to->isCompleted() )
             to->setPercentComplete(from->percentComplete()); 
     }
-    to->setPriority(from->priority());
+    if( to->priority() == 2 && from->priority() == 1 )
+        ; //skip
+    else if (to->priority() == 4 && from->priority() == 5 )
+        ;
+    else
+        to->setPriority(from->priority());
 
 }
 #include <qcstring.h>
 
 void PhoneFormat::afterSave( Incidence* inc)
 {
     uint csum;
     inc->removeID( mProfileName );
+#if 0
     if ( inc->type() == "Event")
         csum = PhoneFormat::getCsumEvent( (Event*) inc );
     else
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
+#endif
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
 }
 bool PhoneFormat::save( Calendar *calendar)
 {
     QLabel status ( i18n(" Opening device ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 230;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Writing to phone...") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     QString message;
 #ifdef _WIN32_
     QString  fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     QString  fileName = "/tmp/kdepimtemp.vcs";
 #endif
 
     // 1 remove events which should be deleted
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { 
             calendar->deleteEvent( ev );
         } else {
 
         }
         ev =  er.next();
     }
     //  2 remove todos which should be deleted
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
             calendar->deleteTodo( to );   
         } 
         to = tl.next();
     } 
     //  3 save file 
     VCalFormat vfsave;
     vfsave.setLocalTime ( true ); 
     if ( ! vfsave.save( calendar, fileName ) )
         return false;
     // 4 call kammu
-    QString command ="./kammu --restore " + fileName + "  -C" + 
-        mConnection +" -D" + mDevice +" -M" + mModel;
+    QString command ="./kammu --restore " + fileName ;
     int ret;
     while ( (ret = system (  command.latin1())) != 0 ) {
         qDebug("Error S::command returned %d. asking users", ret); 
         int retval = KMessageBox::warningContinueCancel(0,
                                                         i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel"));
         if ( retval != KMessageBox::Continue )
             return false;
     }
     if ( ret !=  0 ) {
         qDebug("Error S::command returned %d", ret); 
         return false;
     }
     // 5 reread data
     message = i18n(" Rereading all data ... ");
     status.setText ( message  );
     qApp->processEvents();
     CalendarLocal* calendarTemp = new CalendarLocal(); 
     calendarTemp->setTimeZoneId( calendar->timeZoneId());
     if ( ! load( calendarTemp,calendar) ){
         qDebug("error reloading calendar ");
         delete calendarTemp;
         return false;
     }
     // 6 compare data
 
 //algo 6 compare event
     er = calendar->rawEvents();
     ev = er.first(); 
     message = i18n(" Comparing event # ");
     QPtrList<Event> er1 = calendarTemp->rawEvents();
     Event* ev1; 
     int procCount = 0;
     while ( ev ) {
         //qDebug("event new ID %s",ev->summary().latin1()); 
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             uint csum;
             csum = PhoneFormat::getCsumEvent( ev );
             QString cSum = QString::number( csum );
             ev->setCsum( mProfileName,  cSum );
             //qDebug("Event cSum %s ", cSum.latin1());
             ev1 = er1.first(); 
             while ( ev1 ) {
                 if (  ev1->getCsum( mProfileName ) == cSum ) {
                     er1.remove( ev1 );
                     afterSave( ev );
                     ev->setID(mProfileName, ev1->getID(mProfileName) );
                     //qDebug("Event found  on phone for %s ", ev->summary().latin1());
 
                     break;
                 }
                 ev1 =  er1.next();
             } 
             if ( ! ev1 ) {
                 ev->removeID(mProfileName);
                 qDebug("ERROR: No event found  on phone for %s ", ev->summary().latin1());
             }
             
         
         ev =  er.next();
     }
     //algo 6 compare todo
     tl = calendar->rawTodos(); 
     to = tl.first();
     procCount = 0;
     QPtrList<Todo> tl1 = calendarTemp->rawTodos(); 
     Todo* to1 ;
     message = i18n(" Comparing todo # ");
     while ( to  ) {
         qDebug("todo2 %d ", procCount);
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             uint csum;
             csum = PhoneFormat::getCsumTodo( to );
             QString cSum = QString::number( csum );
             to->setCsum( mProfileName,  cSum );
             qDebug("Todo cSum %s ", cSum.latin1());
             Todo* to1 = tl1.first(); 
             while ( to1 ) {
                 if (  to1->getCsum( mProfileName ) == cSum ) {
                     tl1.remove( to1 );
                     afterSave( to );
                     to->setID(mProfileName, to1->getID(mProfileName) );
                     break;
                 }
                 to1 =  tl1.next();
             }
             if ( ! to1 ) {
                 to->removeID(mProfileName);
                 qDebug("ERROR: No todo found on phone for %s ", to->summary().latin1());
             }
         
         to = tl.next();
     }
     delete calendarTemp;
     return true;
 
 
 
 }
 
 
 QString PhoneFormat::toString( Calendar * )
 {
     return QString::null;
 }
 bool PhoneFormat::fromString( Calendar *calendar, const QString & text)
 {
     return false;
 }