many phone sync fixes

2 files changed, 7 insertions, 3 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
@@ -476,3 +476,3 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                                 if (ToDoVer == SonyEricsson_VToDo) {
-                                        ToDo->Priority = GSM_Priority_Low;
+                                        ToDo->Priority = GSM_Priority_Medium;
                                         if (atoi(DecodeUnicodeString(Buff))>3) ToDo->Priority = GSM_Priority_Low;
@@ -481,3 +481,3 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                                 } 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;
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
@@ -4629,2 +4629,3 @@ static void Restore(int argc, char *argv[])
         if (Backup.Calendar[0] != NULL) {
+                                DoRestore = true;
                 /* N6110 doesn't support getting calendar status */
@@ -4680,2 +4681,4 @@ static void Restore(int argc, char *argv[])
                 if (error == ERR_NONE) {
+            error == ERR_NOTSUPPORTED;
+            DoRestore = true;
                         max = 0;
@@ -4688,4 +4691,6 @@ static void Restore(int argc, char *argv[])
         if (DoRestore) {
+        if ( max > 0 ) {
                 ToDo  = *Backup.ToDo[0];
                 error = Phone->SetToDo(&s,&ToDo);
+        }
         }
@@ -8376,3 +8381,2 @@ int main(int argc, char *argv[])
 #endif
-    argc = argc-3;