gammu fixes

2 files changed, 2 insertions, 2 deletions

diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index f49ae36..c436b90 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -4682,193 +4682,193 @@ static void Restore(int argc, char *argv[])
         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)")) {
+                if ( true /*LRanswer_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);
                 }
         }
         DoRestore = false;
         if (Backup.Calendar[0] != NULL) {
                 /* 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);
             // LR
                         //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) {
                         max = 0;
                         while (Backup.ToDo[max]!=NULL) max++;
                         printmsgerr("%i entries in backup file\n",max);
 
                         //LR if (answer_yes("Restore ToDo")) 
             DoRestore = true;
                 }
         }
         if (DoRestore) {
                 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);
                         }
@@ -5113,193 +5113,193 @@ static void Restore(int argc, char *argv[])
         }
         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_MemoryStatusMemStatus;
                 GSM_ToDoEntry   ToDo;
                 GSM_ToDoStatus  ToDoStatus;
                 GSM_CalendarEntryCalendar;
                 GSM_WAPBookmark         Bookmark;
                 int             i, max, j;
 
         error=GSM_ReadBackupFile(argv[2],&Backup);
         if (error!=ERR_NOTIMPLEMENTED) 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)")) {
+                if (true /*LRanswer_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_MemoryStatusMemStatus;
                 GSM_ToDoStatus  ToDoStatus;
                 GSM_CalendarEntryCalendar;
                 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) {
diff --git a/gammu/gammu.tar.bz2 b/gammu/gammu.tar.bz2
deleted file mode 100644
index 7c921a7..0000000
--- a/gammu/gammu.tar.bz2
+++ b/dev/null