3 files changed, 33 insertions, 13 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
@@ -465,30 +465,30 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                         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;
                 }
         }
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
@@ -4618,24 +4618,25 @@ static void Restore(int argc, char *argv[])
         }
         
         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;
                         }
@@ -4669,35 +4670,39 @@ static void Restore(int argc, char *argv[])
                         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");
@@ -8365,25 +8370,24 @@ int main(int argc, char *argv[])
     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",
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 6df639f..ef69bce 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -120,25 +120,28 @@ int PhoneFormat::initDevice(GSM_StateMachine *s)
 }
 #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 );  
@@ -245,62 +248,65 @@ ulong PhoneFormat::getCsumEvent( Event* event )
         }
         
     }
     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;
@@ -335,24 +341,26 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
         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 ) );
@@ -366,24 +374,25 @@ 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() );
+    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;
@@ -405,24 +414,25 @@ 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() );
+    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;
@@ -434,38 +444,45 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
             }
     }
     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()); 
     }
+    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...") );
@@ -497,26 +514,25 @@ bool PhoneFormat::save( Calendar *calendar)
     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;
     }