sync

6 files changed, 17 insertions, 9 deletions

diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index b1806ee..8535191 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -127,397 +127,397 @@ void Calendar::clearUndo( Incidence * newUndo )
     }
     mUndoIncidence =  newUndo;
     if ( mUndoIncidence ) {
         mUndoIncidence->clearRelations();
     }
     
 }   
 
 void Calendar::setDontDeleteIncidencesOnClose ()
 {
     mDeleteIncidencesOnClose = false;
 }
 void Calendar::setDefaultCalendar( int d )
 {
     mDefaultCalendar = d;
 }
 int Calendar::defaultCalendar()
 {
     return mDefaultCalendar;
 }
 const QString &Calendar::getOwner() const
 {
   return mOwner;
 }
 
 bool Calendar::undoDeleteIncidence()
 {
     if (!mUndoIncidence)
         return false;
     addIncidence(mUndoIncidence);
     mUndoIncidence = 0;
     return true;
 }
 void Calendar::setOwner(const QString &os)
 {
   int i;
   mOwner = os;
   i = mOwner.find(',');
   if (i != -1)
     mOwner = mOwner.left(i);
 
   setModified( true );
 }
 
 void Calendar::setTimeZone(const QString & tz)
 {
   bool neg = FALSE;
   int hours, minutes;
   QString tmpStr(tz);
 
   if (tmpStr.left(1) == "-")
     neg = TRUE;
   if (tmpStr.left(1) == "-" || tmpStr.left(1) == "+")
     tmpStr.remove(0, 1);
   hours = tmpStr.left(2).toInt();
   if (tmpStr.length() > 2)
     minutes = tmpStr.right(2).toInt();
   else
     minutes = 0;
   mTimeZone = (60*hours+minutes);
   if (neg)
     mTimeZone = -mTimeZone;
   mLocalTime = false;
 
   setModified( true );
 }
 
 QString Calendar::getTimeZoneStr() const
 {
   if (mLocalTime)
     return "";
   QString tmpStr;
   int hours = abs(mTimeZone / 60);
   int minutes = abs(mTimeZone % 60);
   bool neg = mTimeZone < 0;
 
   tmpStr.sprintf("%c%.2d%.2d",
                  (neg ? '-' : '+'),
                  hours, minutes);
   return tmpStr;
 }
 
 void Calendar::setTimeZone(int tz)
 {
   mTimeZone = tz;
   mLocalTime = false;
 
   setModified( true );
 }
 
 int Calendar::getTimeZone() const
 {
   return mTimeZone;
 }
 
 void Calendar::setTimeZoneId(const QString &id)
 { 
     mTimeZoneId = id;
     mLocalTime = false;
     mTimeZone  = KGlobal::locale()->timezoneOffset(mTimeZoneId);
     if ( mTimeZone > 1000)
          setLocalTime();
     //qDebug("Calendar::setTimeZoneOffset %s %d ",mTimeZoneId.latin1(), mTimeZone);
     setModified( true );
 }
 
 QString Calendar::timeZoneId() const
 {
   return mTimeZoneId;
 }
 
 void Calendar::setLocalTime()
 { 
     //qDebug("Calendar::setLocalTime() ");
     mLocalTime = true;
     mTimeZone = 0;
     mTimeZoneId = "";
 
   setModified( true );
 }
 
 bool Calendar::isLocalTime() const
 {
   return mLocalTime;
 }
 
 const QString &Calendar::getEmail()
 {
   return mOwnerEmail;
 }
 
 void Calendar::setEmail(const QString &e)
 {
   mOwnerEmail = e;
 
   setModified( true );
 }
 
 void Calendar::setFilter(CalFilter *filter)
 {
   mFilter = filter;
 }
 
 CalFilter *Calendar::filter()
 {
   return mFilter;
 }
 
 QPtrList<Incidence> Calendar::incidences()
 {
   QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = events();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
   QPtrList<Todo> t = todos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
 void Calendar::resetPilotStat(int id )
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setPilotId( id );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setPilotId( id );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setPilotId( id );
 }
 void Calendar::resetTempSyncStat()
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 }
 QPtrList<Incidence> Calendar::rawIncidences()
 {
   QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
 QPtrList<Event> Calendar::events( const QDate &date, bool sorted )
 {
   QPtrList<Event> el = rawEventsForDate(date,sorted);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events( const QDateTime &qdt )
 {
   QPtrList<Event> el = rawEventsForDate(qdt);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events( const QDate &start, const QDate &end,
                                   bool inclusive)
 {
   QPtrList<Event> el = rawEvents(start,end,inclusive);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events()
 {
   QPtrList<Event> el = rawEvents();
   mFilter->apply(&el);
   return el;
 }
 void Calendar::addIncidenceBranch(Incidence *i)
 {
     addIncidence( i );
     Incidence * inc;
     QPtrList<Incidence> Relations = i->relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
        addIncidenceBranch( inc );
     } 
 }
 
 bool Calendar::addIncidence(Incidence *i)
 {
   Incidence::AddVisitor<Calendar> v(this);
   if ( i->calID() == 0 )
-      i->setCalID( mDefaultCalendar );
+      i->setCalID_block( mDefaultCalendar );
   i->setCalEnabled( true );
   return i->accept(v);
 }
 void Calendar::deleteIncidence(Incidence *in)
 {
     if ( in->typeID() == eventID )
         deleteEvent( (Event*) in );
     else if ( in->typeID() == todoID )
         deleteTodo( (Todo*) in);
     else if ( in->typeID() == journalID )
         deleteJournal( (Journal*) in );
 }
 
 Incidence* Calendar::incidence( const QString& uid )
 {
   Incidence* i;
 
   if( (i = todo( uid )) != 0 )
     return i;
   if( (i = event( uid )) != 0 )
     return i;
   if( (i = journal( uid )) != 0 )
       return i;
 
   return 0;
 }
 
 QPtrList<Todo> Calendar::todos()
 {
   QPtrList<Todo> tl = rawTodos();
   mFilter->apply( &tl );
   return tl;
 }
 
 // When this is called, the todo have already been added to the calendar.
 // This method is only about linking related todos
 void Calendar::setupRelations( Incidence *incidence )
 {
   QString uid = incidence->uid();
   //qDebug("Calendar::setupRelations ");
   // First, go over the list of orphans and see if this is their parent
   while( Incidence* i = mOrphans[ uid ] ) {
     mOrphans.remove( uid );
     i->setRelatedTo( incidence );
     incidence->addRelation( i );
     mOrphanUids.remove( i->uid() );
   }
 
   // Now see about this incidences parent
   if( !incidence->relatedTo() && !incidence->relatedToUid().isEmpty() ) {
     // This incidence has a uid it is related to, but is not registered to it yet
     // Try to find it
     Incidence* parent = this->incidence( incidence->relatedToUid() );
     if( parent ) {
       // Found it
       incidence->setRelatedTo( parent );
       parent->addRelation( incidence );
     } else {
       // Not found, put this in the mOrphans list
       mOrphans.insert( incidence->relatedToUid(), incidence );
       mOrphanUids.insert( incidence->uid(), incidence );
     }
   }
 }
 
 // If a task with subtasks is deleted, move it's subtasks to the orphans list
 void Calendar::removeRelations( Incidence *incidence )
 {
     // qDebug("Calendar::removeRelations ");
     QString uid = incidence->uid();
 
     QPtrList<Incidence> relations = incidence->relations();
     for( Incidence* i = relations.first(); i; i = relations.next() )
         if( !mOrphanUids.find( i->uid() ) ) {
             mOrphans.insert( uid, i );
             mOrphanUids.insert( i->uid(), i );
             i->setRelatedTo( 0 );
             i->setRelatedToUid( uid );
         }
 
     // If this incidence is related to something else, tell that about it
     if( incidence->relatedTo() )
         incidence->relatedTo()->removeRelation( incidence );
 
     // Remove this one from the orphans list
     if( mOrphanUids.remove( uid ) ) {
         QString r2uid = incidence->relatedToUid();
         QPtrList<Incidence> tempList;
         while( Incidence* i = mOrphans[ r2uid ] ) {
             mOrphans.remove( r2uid );
             if ( i != incidence ) tempList.append( i );
         }
         Incidence* inc = tempList.first();
         while ( inc ) {
             mOrphans.insert( r2uid, inc );
             inc = tempList.next();
         }
     }
     // LR: and another big bad bug found
 #if 0
         // This incidence is located in the orphans list - it should be removed
         if( !( incidence->relatedTo() != 0 && mOrphans.remove( incidence->relatedTo()->uid() ) ) ) {
             // Removing wasn't that easy
             for( QDictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
                 if( it.current()->uid() == uid ) {
                     mOrphans.remove( it.currentKey() );
                     break;
                 }
             }
         }
 #endif
 }
 
 void Calendar::registerObserver( Observer *observer )
 {
   mObserver = observer;
   mNewObserver = true;
 }
 
 void Calendar::setModified( bool modified )
 {
     if ( mObserver ) mObserver->calendarModified( modified, this );
   if ( modified != mModified || mNewObserver ) {
     mNewObserver = false;
     // if ( mObserver ) mObserver->calendarModified( modified, this );
     mModified = modified;
   }
 }
 
 void Calendar::setLoadedProductId( const QString &id )
 {
   mLoadedProductId = id;
 }
 
 QString Calendar::loadedProductId()
 {
   return mLoadedProductId;
 }
 
 //#include "calendar.moc"
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c82ea92..b02f706 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -1,655 +1,655 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@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 <qptrlist.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
 #include "icalformat.h"
 #include "exceptions.h"
 #include "incidence.h"
 #include "journal.h"
 #include "filestorage.h"
 #include "calfilter.h"
 
 #include "calendarlocal.h"
 
 // #ifndef DESKTOP_VERSION
 // #include <qtopia/alarmserver.h> 
 // #endif
 using namespace KCal;
 
 CalendarLocal::CalendarLocal()
   : Calendar()
 {
   init();
 }
 
 CalendarLocal::CalendarLocal(const QString &timeZoneId)
   : Calendar(timeZoneId)
 {
   init();
 }
 
 void CalendarLocal::init()
 {
     mNextAlarmIncidence = 0;
 }
 
 
 CalendarLocal::~CalendarLocal()
 {
     registerObserver( 0 );
     if ( mDeleteIncidencesOnClose )
         close();
 }
 bool CalendarLocal::mergeCalendarFile( QString name )
 {
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( 1 );
     if ( calendar.load( name ) ) {
         mergeCalendar( &calendar  );
         return true;
     }
     return false;
 }
  
 Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates) 
 {
     Todo *todo;;
     Incidence *retVal = 0;
     for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
         if ( todo->uid() == uid ) {
             if ( doNotCheckDuplicates ) return todo;
             if ( retVal ) {
                 if ( retVal->calID() > todo->calID() ) {
                     retVal = todo;
                 }
             } else {
                 retVal = todo;
             }
         } 
     }
     if ( retVal ) return retVal;
     Event *event;
     for ( event = mEventList.first(); event; event = mEventList.next() ) {
         if (  event->uid() == uid ) {
             if ( doNotCheckDuplicates ) return event;
             if ( retVal ) {
                 if ( retVal->calID() > event->calID() ) {
                     retVal = event;
                 }
             } else {
                 retVal = event;
             }
         }
     }
     if ( retVal ) return retVal;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->uid() == uid ) {
             if ( doNotCheckDuplicates ) return it;
             if ( retVal ) {
                 if ( retVal->calID() > it->calID() ) {
                     retVal = it;
                 }
             } else {
                 retVal = it;
             }
         }
     return retVal;
 }
 
 bool CalendarLocal::mergeCalendar( Calendar* remote  )
 {
     // 1 look for raw inc in local
     //   if inc not in remote, delete in local
     // 2 look for raw inc in remote
     //   if inc in local, replace it
     //   if not in local, add it to default calendar
     QPtrList<Incidence> localInc = rawIncidences(); 
     Incidence* inL = localInc.first(); 
     while ( inL ) {
         if ( ! inL->isReadOnly () )
             if ( !remote->incidenceForUid( inL->uid(), true ))
                 deleteIncidence( inL );
         inL = localInc.next();
     }
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     while ( inR ) {
         inL = incidenceForUid( inR->uid(),false );
         if ( inL ) {
             if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) {
                 int calID = inL->calID();
                 deleteIncidence( inL );
                 inL = inR->clone();
-                inL->setCalID( calID );
+                inL->setCalID_block( calID );
                 addIncidence( inL );
             }
         } else {
             inL = inR->clone();
-            inL->setCalID( 0 );// add to default cal
+            inL->setCalID_block( 0 );// add to default cal
             addIncidence( inL );
         }
         inR = er.next();
     }
     return true;
 }
 
 
 bool CalendarLocal::addCalendarFile( QString name, int id )
 {
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( id );
     if ( calendar.load( name ) ) {
         addCalendar( &calendar  );
         return true;
     }
     return false;
 }
 void CalendarLocal::setSyncEventsEnabled()
 {
     Event * ev;
     ev = mEventList.first();
     while ( ev ) {
         if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setCalEnabled( true );
         ev =  mEventList.next();
     } 
 }
 void CalendarLocal::setSyncEventsReadOnly()
 {
     Event * ev;
     ev = mEventList.first();
     while ( ev ) {
         if ( ev->uid().left(15) == QString("last-syncEvent-") ) {
             ev->setReadOnly( true ); 
         }
         ev =  mEventList.next();
     } 
 }
 
 void CalendarLocal::addCalendar( Calendar* cal )
 {
     cal->setDontDeleteIncidencesOnClose();
     setSyncEventsEnabled();
     {
         QPtrList<Event> EventList = cal->rawEvents();
         QPtrList<Event> el;
         Event * ev = EventList.first();
         while ( ev ) {
             if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) {
                 Event * se = event( ev->uid() );
                 if ( se )
                     el.append( se );    
-                ev->setCalID( 1 );
+                ev->setCalID_block( 1 );
             }
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mEventList.append( ev );
             ev = EventList.next();
         }
          for ( ev = el.first(); ev; ev = el.next() ) {
            deleteIncidence ( ev );
         }
     }
     {
 
         QPtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
         while ( ev ) {
             QString rel = ev->relatedToUid();
             if ( !rel.isEmpty() ){
                 ev->setRelatedTo ( 0 );
                 ev->setRelatedToUid( rel );
             }
             ev = TodoList.next();
         }
         //TodoList = cal->rawTodos();
         ev = TodoList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mTodoList.append( ev );
             setupRelations( ev );
             ev = TodoList.next();
         }
     }
     {
         QPtrList<Journal> JournalList = cal->journals();
         Journal * ev = JournalList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mJournalList.append( ev );
             ev = JournalList.next();
         }
     }
     setModified( true );
 }
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
   FileStorage storage( this, fileName, format );
   return storage.save();
 }
 
 void CalendarLocal::stopAllTodos()
 {
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setRunning( false );
 
 }
 void CalendarLocal::close()
 {
 
   Todo * i;
   for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false);
 
   mEventList.setAutoDelete( true );
   mTodoList.setAutoDelete( true );
   mJournalList.setAutoDelete( true );
 
   mEventList.clear();
   mTodoList.clear();
   mJournalList.clear();
 
   mEventList.setAutoDelete( false );
   mTodoList.setAutoDelete( false );
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
 
 bool CalendarLocal::addAnniversaryNoDup( Event *event )
 {
     QString cat;
     bool isBirthday = true;
     if(  event->categoriesStr() == i18n( "Anniversary" ) ) {
         isBirthday = false;
         cat = i18n( "Anniversary" );
     } else if(  event->categoriesStr() == i18n( "Birthday" ) ) {
         isBirthday = true;
         cat = i18n( "Birthday" );
     } else {
         qDebug("addAnniversaryNoDup called without fitting category! ");
         return false;
     }
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( !(eve->categories().contains( cat ) ))
             continue;
         // now we have an event with fitting category
         if ( eve->dtStart().date() != event->dtStart().date() )
             continue;
         // now we have an event with fitting category+date
         if ( eve->summary() != event->summary() )
             continue;
         // now we have an event with fitting category+date+summary
         return false;
     }
     return addEvent( event );
 
 }
 bool CalendarLocal::addEventNoDup( Event *event )
 {
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( *eve == *event ) {
             //qDebug("CalendarLocal::Duplicate event found! Not inserted! ");
             return false;
         }
     }
     return addEvent( event );
 }
 
 bool CalendarLocal::addEvent( Event *event )
 {
   insertEvent( event );
 
   event->registerObserver( this );
 
   setModified( true );
   if ( event->calID() == 0 )
-      event->setCalID( mDefaultCalendar );
+      event->setCalID_block( mDefaultCalendar );
   event->setCalEnabled( true );
 
   return true;
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
     clearUndo(event);
     if ( mEventList.removeRef( event ) ) {
         setModified( true );
     }
 }
 
 
 Event *CalendarLocal::event( const QString &uid )
 {
     Event *event;
     Event *retVal = 0;
     for ( event = mEventList.first(); event; event = mEventList.next() ) {
         if ( event->calEnabled() && event->uid() == uid ) {
             if ( retVal ) {
                 if ( retVal->calID() > event->calID() ) {
                     retVal = event;
                 }
             } else {
                 retVal = event;
             }
         }
     }
   return retVal;
 }
 bool CalendarLocal::addTodoNoDup( Todo *todo )
 {
   Todo * eve;
     for ( eve = mTodoList.first(); eve ; eve = mTodoList.next() ) {
         if ( *eve == *todo ) {
             //qDebug("duplicate todo found! not inserted! ");
             return false;
         }
     }
     return addTodo( todo );
 }
 bool CalendarLocal::addTodo( Todo *todo )
 {
   mTodoList.append( todo );
 
   todo->registerObserver( this );
 
   // Set up subtask relations
   setupRelations( todo );
 
   setModified( true );
   if ( todo->calID() == 0 )
-  todo->setCalID( mDefaultCalendar );
+  todo->setCalID_block( mDefaultCalendar );
   todo->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
     removeRelations( todo );
     clearUndo(todo);
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
   }
 }
 
 QPtrList<Todo> CalendarLocal::rawTodos()
 {
     QPtrList<Todo> el;
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 Todo *CalendarLocal::todo( QString syncProf, QString id )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 void CalendarLocal::removeSyncInfo( QString syncProfile)
 {
     QPtrList<Incidence> all = rawIncidences() ;
     Incidence *inc;
     for ( inc = all.first(); inc; inc = all.next() ) {
         inc->removeID( syncProfile );
     }
     if ( syncProfile.isEmpty() ) {
         QPtrList<Event> el;
         Event *todo;
         for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
             if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
                     el.append( todo );
         }
         for ( todo = el.first(); todo; todo = el.next() ) {
            deleteIncidence ( todo );
         }
     } else {
         Event *lse = event( "last-syncEvent-"+ syncProfile);
         if ( lse )
             deleteIncidence ( lse );
     }
 }
 QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
 {
     QPtrList<Event> el;
     Event *todo;
     for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
         if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
             if ( todo->summary().left(3) == "E: " )
                 el.append( todo );
     }
 
     return el;
 
 }
 Event *CalendarLocal::event( QString syncProf,  QString id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 Todo *CalendarLocal::todo( const QString &uid )
 {
   Todo *todo;
   Todo *retVal = 0;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( todo->calEnabled() && todo->uid() == uid ) {
           if ( retVal ) {
                 if ( retVal->calID() > todo->calID() ) {
                     retVal = todo;
                 }
             } else {
                 retVal = todo;
             }
       } 
   }
   return retVal;
 }
 void CalendarLocal::getIncidenceCount( int calId, int& events, int & todos, int & journals)
 {
     events = 0;
     todos = 0;
     journals = 0;
     {
         Todo *todo;
         for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
             if ( todo->calID() == calId )
                 ++todos;
         } 
     }
     {
         Event *todo;
         for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
             if ( todo->calID() == calId )
                 ++events;
 
         }
     }
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == calId ) ++journals;
 
 }
 QString CalendarLocal::nextSummary() const
 {
     return mNextSummary;
 }
 QDateTime CalendarLocal::nextAlarmEventDateTime()  const
 {
     return mNextAlarmEventDateTime;
 }
 void  CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted)
 {
     //mNextAlarmIncidence
     //mNextAlarmDateTime
     //return mNextSummary;
     //return mNextAlarmEventDateTime;
     bool newNextAlarm = false; 
     bool computeNextAlarm = false;
     bool ok;
     int offset;
     QDateTime nextA;
     // QString nextSum;
     //QDateTime nextEvent;
     if ( mNextAlarmIncidence == 0 || incidence == 0 ) {
         computeNextAlarm = true;
     } else {
         if ( ! deleted ) {
             nextA = incidence->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
             if ( ok ) {
                 if ( nextA < mNextAlarmDateTime  ) {
                     deRegisterAlarm();
                     mNextAlarmDateTime = nextA;
                     mNextSummary  = incidence->summary();
                     mNextAlarmEventDateTime = nextA.addSecs(offset ) ; 
                     mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
                     newNextAlarm = true;
                     mNextAlarmIncidence = incidence;
                 } else {
                     if ( incidence == mNextAlarmIncidence ) {
                         computeNextAlarm = true;
                     }
                 }
             } else {
                 if ( mNextAlarmIncidence == incidence ) {
                     computeNextAlarm = true;
                 }
             }
         } else { // deleted
             if ( incidence == mNextAlarmIncidence ) {
                 computeNextAlarm = true;
             }
         }
     }
     if ( computeNextAlarm ) {
         deRegisterAlarm();
         nextA = nextAlarm( 1000 );  
         if (! mNextAlarmIncidence ) {
             return;
         }
         newNextAlarm = true;
     }
     if ( newNextAlarm )
         registerAlarm();
 }
 QString CalendarLocal:: getAlarmNotification()
 { 
     QString ret;
     // this should not happen
     if (! mNextAlarmIncidence ) 
             return "cal_alarm"+ mNextSummary.left( 25 )+"\n"+mNextAlarmEventDateTimeString;
     Alarm* alarm =  mNextAlarmIncidence->alarms().first();
     if ( alarm->type() == Alarm::Procedure ) {
         ret = "proc_alarm" + alarm->programFile()+"+++";
     } else {
         ret = "audio_alarm" +alarm->audioFile() +"+++";
     }
     ret += "cal_alarm"+ mNextSummary.left( 25 );
     if ( mNextSummary.length() > 25 )
         ret += "\n" + mNextSummary.mid(25, 25 );
     ret+= "\n"+mNextAlarmEventDateTimeString;
     return ret;
 }
 void CalendarLocal::registerAlarm()
 {
     mLastAlarmNotificationString = getAlarmNotification();
     // qDebug("++ register Alarm %s %s",mNextAlarmDateTime.toString().latin1(), mLastAlarmNotificationString.latin1() );
     emit addAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::addAlarm ( mNextAlarmDateTime,"koalarm", mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 void CalendarLocal::deRegisterAlarm()
 {
     if ( mLastAlarmNotificationString.isNull() )
         return;
     //qDebug("-- deregister Alarm %s ", mLastAlarmNotificationString.latin1() );
 
     emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
     mNextAlarmEventDateTime = QDateTime();
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 
 QPtrList<Todo> CalendarLocal::todos( const QDate &date )
 {
   QPtrList<Todo> todos;
 
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( !todo->calEnabled() ) continue; 
     if ( todo->hasDueDate() && todo->dtDue().date() == date ) {
       todos.append( todo );
     }
   }
 
  filter()->apply( &todos );
   return todos;
 }
 void CalendarLocal::reInitAlarmSettings()
 {
     if ( !mNextAlarmIncidence  ) {
         nextAlarm( 1000 );
     }
     deRegisterAlarm();
     mNextAlarmIncidence = 0;
     checkAlarmForIncidence( 0, false );
     
 }
 
 
 
 QDateTime  CalendarLocal::nextAlarm( int daysTo )
 {
   QDateTime nextA = QDateTime::currentDateTime().addDays( daysTo );
     QDateTime start = QDateTime::currentDateTime().addSecs( 30 );
     QDateTime next;
     Event *e;
     bool ok;
     bool found = false;
     int offset;
@@ -671,410 +671,410 @@ QDateTime  CalendarLocal::nextAlarm( int daysTo )
     for( t = mTodoList.first(); t; t = mTodoList.next() ) {
       if ( !t->calEnabled() ) continue; 
         next = t->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
         if ( ok ) {
             if (  next < nextA ) {
                 nextA = next;
                 found = true;
                 mNextSummary = t->summary();
                 mNextAlarmEventDateTime = next.addSecs(offset ); 
                 mNextAlarmIncidence = (Incidence *) t;
             }
         }
     } 
     if ( mNextAlarmIncidence  ) {
         mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
         mNextAlarmDateTime = nextA;
     }
     return nextA;
 }
 Alarm::List CalendarLocal::alarmsTo( const QDateTime &to )
 {
   return alarms( QDateTime( QDate( 1900, 1, 1 ) ), to );
 }
 
 Alarm::List CalendarLocal::alarms( const QDateTime &from, const QDateTime &to )
 {
  
   Alarm::List alarms;
 
   Event *e;
 
   for( e = mEventList.first(); e; e = mEventList.next() ) {
       if ( !e->calEnabled() ) continue;
     if ( e->doesRecur() ) appendRecurringAlarms( alarms, e, from, to );
     else appendAlarms( alarms, e, from, to );
   }
 
   Todo *t;
   for( t = mTodoList.first(); t; t = mTodoList.next() ) {
       if ( !t->calEnabled() ) continue; 
       appendAlarms( alarms, t, from, to );
   }
 
   return alarms;
 }
 
 void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
                                   const QDateTime &from, const QDateTime &to )
 {
   QPtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
 //    kdDebug(5800) << "CalendarLocal::appendAlarms() '" << alarm->text()
 //                  << "': " << alarm->time().toString() << " - " << alarm->enabled() << endl;
     if ( alarm->enabled() ) {
       if ( alarm->time() >= from && alarm->time() <= to ) {
         alarms.append( alarm );
       }
     }
   }
 }
 
 void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
                                            Incidence *incidence,
                                            const QDateTime &from,
                                            const QDateTime &to )
 {
  
   QPtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   QDateTime qdt;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
     if (incidence->recursOn(from.date())) {
       qdt.setTime(alarm->time().time());
       qdt.setDate(from.date());
     }
     else qdt = alarm->time();
     // qDebug("1 %s %s %s", qdt.toString().latin1(),  from.toString().latin1(), to.toString().latin1());
     if ( alarm->enabled() ) {
       if ( qdt >= from && qdt <= to ) {
         alarms.append( alarm );
       }
     }
   }
 }
 
 
 /****************************** PROTECTED METHODS ****************************/
 
 // after changes are made to an event, this should be called.
 void CalendarLocal::update( IncidenceBase *incidence )
 {
   incidence->setSyncStatus( Event::SYNCMOD );
   incidence->setLastModified( QDateTime::currentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
 
   setModified( true );
 }
 
 void CalendarLocal::insertEvent( Event *event )
 {
   if ( mEventList.findRef( event ) < 0 ) mEventList.append( event );
 }
 
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 {
   QPtrList<Event> eventList;
 
   Event *event;
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       if ( event->isMultiDay() ) {
         int extraDays = event->dtStart().date().daysTo( event->dtEnd().date() );
         int i;
         for ( i = 0; i <= extraDays; i++ ) {
             if ( event->recursOn( qd.addDays( -i ) ) ) {
                 eventList.append( event );
                 break;
             }
         }
       } else {
         if ( event->recursOn( qd ) )
           eventList.append( event );
       }
     } else {
       if ( event->dtStart().date() <= qd && event->dtEnd().date() >= qd ) {
         eventList.append( event );
       }
     }
   }
 
   if ( !sorted ) {
     return eventList;
   }
 
   //  kdDebug(5800) << "Sorting events for date\n" << endl;
   // now, we have to sort it based on dtStart.time()
   QPtrList<Event> eventListSorted;
   Event *sortEvent;
   for ( event = eventList.first(); event; event = eventList.next() ) {
     sortEvent = eventListSorted.first();
     int i = 0;
     while ( sortEvent && event->dtStart().time()>=sortEvent->dtStart().time() )
     {
       i++;
       sortEvent = eventListSorted.next();
     }
     eventListSorted.insert( i, event );
   }
   return eventListSorted;
 }
 
 
 QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
                                           bool inclusive )
 {
   Event *event = 0;
 
   QPtrList<Event> eventList;
 
   // Get non-recurring events
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       QDate rStart = event->dtStart().date();
       bool found = false;
       if ( inclusive ) {
         if ( rStart >= start && rStart <= end ) {
           // Start date of event is in range. Now check for end date.
           // if duration is negative, event recurs forever, so do not include it.
           if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else if ( event->recurrence()->duration() > 0 ) {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now exclude all events with a duration.
           }
         }
       } else {
           bool founOne;
           QDate next = event->getNextOccurence( start, &founOne ).date();
           if ( founOne ) {
               if ( next <= end ) {
                   found = true;
               }
           }
           
           /*
           // crap !!!
         if ( rStart <= end ) {  // Start date not after range
           if ( rStart >= start ) {  // Start date within range
             found = true;
           } else if ( event->recurrence()->duration() == -1 ) {  // Recurs forever
             found = true;
           } else if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now include all events with a duration.
             found = true;
           }
         }
           */
 
       }
 
       if ( found ) eventList.append( event );
     } else {
       QDate s = event->dtStart().date();
       QDate e = event->dtEnd().date();
 
       if ( inclusive ) {
         if ( s >= start && e <= end ) {
           eventList.append( event );
         }
       } else {
         if ( ( e >= start && s <= end ) ) {
           eventList.append( event );
         }
       }
     }
   }
 
   return eventList;
 }
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
   return rawEventsForDate( qdt.date() );
 }
 
 QPtrList<Event> CalendarLocal::rawEvents()
 {
     QPtrList<Event> el;
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 
 bool CalendarLocal::addJournal(Journal *journal)
 {
     mJournalList.append(journal);
 
   journal->registerObserver( this );
 
   setModified( true );
   if ( journal->calID() == 0 )
-      journal->setCalID( mDefaultCalendar );
+      journal->setCalID_block( mDefaultCalendar );
   journal->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteJournal( Journal *journal )
 {
     clearUndo(journal);
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
 
 QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
 {
     QPtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() && it->dtStart().date() == date) el.append( it );
     return el;
 }
 Journal *CalendarLocal::journal( const QDate &date )
 {
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
 
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
       if ( it->calEnabled() && it->dtStart().date() == date )
       return it;
 
   return 0;
 }
 
 Journal *CalendarLocal::journal( const QString &uid )
 {
     Journal * retVal = 0;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() && it->uid() == uid ) {
             if ( retVal ) {
                 if ( retVal->calID() > it->calID() ) {
                     retVal = it;
                 }
             } else {
                 retVal = it;
             }
         }
     return retVal;
 }
 
 QPtrList<Journal> CalendarLocal::journals()
 {
     QPtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 void CalendarLocal::setCalendarRemove( int id )
 {
    
     {
         QPtrList<Event> EventList = mEventList;
         Event * ev = EventList.first();
         while ( ev ) {
             if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") )
                 deleteEvent( ev );
             ev = EventList.next();
         }
     }
     {
 
         QPtrList<Todo> TodoList = mTodoList;
         Todo * ev = TodoList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteTodo( ev );
             ev = TodoList.next();
         }
     }
     {
         QPtrList<Journal> JournalList = mJournalList;
         Journal * ev = JournalList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteJournal( ev );
             ev = JournalList.next();
         }
     }
 
     clearUndo(0);
 
 }
 
 void CalendarLocal::setAllCalendarEnabled( bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         it->setCalEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         it->setCalEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setCalEnabled( enable );
 
 
 }
 void CalendarLocal::setCalendarEnabled( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
 }
 
 void CalendarLocal::setReadOnly( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setReadOnly( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setReadOnly( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setReadOnly( enable );
 
 }
 
 void CalendarLocal::setAlarmEnabled( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
     reInitAlarmSettings();
 
 }
 void CalendarLocal::setDefaultCalendarEnabledOnly()
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar);
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar);
 
 }
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index cfef973..56c0560 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -1,410 +1,417 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@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 <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kidmanager.h>
 
 #include "calformat.h"
 #include "syncdefines.h"
 
 #include "incidencebase.h"
 
 using namespace KCal;
 
 IncidenceBase::IncidenceBase() :
   mReadOnly(false), mFloats(true), mDuration(0), mHasDuration(false),
   mPilotId(0), mSyncStatus(SYNCMOD)
 {
   blockLastModified = false;
   setUid(CalFormat::createUniqueId());
   mOrganizer = "";
   mFloats = false;
   mDuration = 0;
   mHasDuration = false;
   mPilotId = 0;
   mExternalId = ":";
   mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
   mSyncStatus = 0;
   mAttendees.setAutoDelete( true );
   mCalEnabled = true;
   mAlarmEnabled = true;
   mCalID = 0;
 }
 
 IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   CustomProperties( i )
 {
 
   blockLastModified = false;
   mReadOnly = i.mReadOnly;
   mDtStart = i.mDtStart;
   mDuration = i.mDuration;
   mHasDuration = i.mHasDuration;
   mOrganizer = i.mOrganizer;
   mUid = i.mUid;
   mCalEnabled = i.mCalEnabled;
   mAlarmEnabled = i.mAlarmEnabled;
   mCalID = i.mCalID;
   QPtrList<Attendee> attendees = i.attendees();
   for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
     mAttendees.append( new Attendee( *a ) );
   }
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
   mTempSyncStat = i.mTempSyncStat;
   mSyncStatus = i.mSyncStatus;
   mExternalId = i.mExternalId;
   // The copied object is a new one, so it isn't observed by the observer
   // of the original object.
   mObservers.clear();
   
   mAttendees.setAutoDelete( true );
 }
 
 IncidenceBase::~IncidenceBase()
 {
 }
 
 
 bool KCal::operator==( const IncidenceBase& i1, const IncidenceBase& i2 )
 {
     // do not compare mSyncStatus and mExternalId 
     if( i1.attendees().count() != i2.attendees().count() ) {
         return false; // no need to check further
     }
     if ( i1.attendees().count() > 0 ) {
         Attendee * a1 = i1.attendees().first(), *a2 =i2.attendees().first() ;
         while ( a1 ) {
             if ( !( (*a1) == (*a2)) ) 
                 {
                     //qDebug("Attendee not equal ");
                     return false;
                 }
             a1 = i1.attendees().next();
             a2 = i2.attendees().next();
         }
     }
     //if ( i1.dtStart() != i2.dtStart() )
     //  return false;
 #if 0
     qDebug("1 %d ",i1.doesFloat() == i2.doesFloat() );
     qDebug("1 %d ",i1.duration() == i2.duration() );
     qDebug("3 %d ",i1.hasDuration() == i2.hasDuration() );
     qDebug("1 %d ",i1.pilotId() == i2.pilotId() );
     qDebug("1 %d %d %d",i1.syncStatus() == i2.syncStatus() , i1.syncStatus(),i2.syncStatus() );
     qDebug("6 %d ",i1.organizer() == i2.organizer() );
   
 #endif
     if ( i1.hasDuration() == i2.hasDuration() ) {
         if ( i1.hasDuration() ) {
             if ( i1.duration() != i2.duration() )
                 return false;
         }
     } else {
         return false;
     }
 
     return ( i1.organizer() == i2.organizer() &&
              // i1.uid() == i2.uid() &&
              // Don't compare lastModified, otherwise the operator is not
              // of much use. We are not comparing for identity, after all.
              i1.doesFloat() == i2.doesFloat() &&
              i1.pilotId() == i2.pilotId() );// &&  i1.syncStatus() == i2.syncStatus() );
     // no need to compare mObserver
 }
 
   
 QDateTime IncidenceBase::getEvenTime( QDateTime dt )
 {
     QTime t =  dt.time();
     dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
     return dt;
 }     
 
 bool IncidenceBase::isTagged() const
 {
     return mIsTagged;
 }
 void IncidenceBase::setTagged( bool b)
 {
     mIsTagged = b;
 }
 void IncidenceBase::setCalID( int id )
 {
     if ( mCalID > 0 ) {
+        updated();
+    }
+    mCalID = id;
+}
+void IncidenceBase::setCalID_block( int id )
+{
+    if ( mCalID > 0 ) {
         blockLastModified = true;
         updated();
         blockLastModified = false;
     }
     mCalID = id;
 }
 int IncidenceBase::calID() const
 {
     return mCalID;
 }
 void IncidenceBase::setCalEnabled( bool b )
 {
     mCalEnabled = b;
 }
 bool IncidenceBase::calEnabled() const
 {
     return mCalEnabled;
 }
 
 void IncidenceBase::setAlarmEnabled( bool b )
 {
     mAlarmEnabled = b;
 }
 bool IncidenceBase::alarmEnabled() const
 {
     return mAlarmEnabled;
 }
 
 
 void IncidenceBase::setUid(const QString &uid)
 {
   mUid = uid;
   updated();
 }
 
 QString IncidenceBase::uid() const
 {
   return mUid;
 }
 void IncidenceBase::setLastModifiedSubInvalid()
 {
     // virtual method
 }
 void IncidenceBase::setLastModified(const QDateTime &lm)
 {
     if ( blockLastModified ) return;
   // DON'T! updated() because we call this from
   // Calendar::updateEvent().
   mLastModified = getEvenTime(lm);
   mLastModifiedKey.sprintf("%04d%02d%02d%02d%02d%02d",
                            mLastModified.date().year(),
                            mLastModified.date().month(),
                            mLastModified.date().day(),
                            mLastModified.time().hour(),
                            mLastModified.time().minute(),
                            mLastModified.time().second() );
   setLastModifiedSubInvalid();
   //qDebug("IncidenceBase::setLastModified %s ",lm.toString().latin1());
 }
 QString IncidenceBase::lastModifiedSortKey() const
 {  
     return mLastModifiedKey;
 }
 
 QDateTime IncidenceBase::lastModified() const
 {
   return mLastModified;
 }
 
 void IncidenceBase::setOrganizer(const QString &o)
 {
   // we don't check for readonly here, because it is
   // possible that by setting the organizer we are changing
   // the event's readonly status...
   mOrganizer = o;
   if (mOrganizer.left(7).upper() == "MAILTO:")
     mOrganizer = mOrganizer.remove(0,7);
 
   updated();
 }
 
 QString IncidenceBase::organizer() const
 {
   return mOrganizer;
 }
 
 void IncidenceBase::setReadOnly( bool readOnly )
 {
   mReadOnly = readOnly;
 }
 
 void IncidenceBase::setDtStart(const QDateTime &dtStart)
 {
 //  if (mReadOnly) return;
   mDtStart = getEvenTime(dtStart);
   updated();
 }
 
 
 QDateTime IncidenceBase::dtStart() const
 {
   return mDtStart;
 }
 
 QString IncidenceBase::dtStartTimeStr() const
 {
   return KGlobal::locale()->formatTime(dtStart().time());
 }
 
 QString IncidenceBase::dtStartDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
 }
 
 QString IncidenceBase::dtStartStr(bool shortfmt) const
 {
     if ( doesFloat() )
         return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
     return KGlobal::locale()->formatDateTime(dtStart(), shortfmt);
 }
 
 
 bool IncidenceBase::doesFloat() const
 {
   return mFloats;
 }
 
 void IncidenceBase::setFloats(bool f)
 {
   if (mReadOnly) return;
   mFloats = f;
   updated();
 }
 
 
 bool IncidenceBase::addAttendee(Attendee *a, bool doupdate)
 {
   if (mReadOnly) return false;
   if (a->name().left(7).upper() == "MAILTO:")
     a->setName(a->name().remove(0,7));
 
   QPtrListIterator<Attendee> qli(mAttendees);
   
   qli.toFirst();
   while (qli) {
       if (*qli.current() == *a)
           return false;
       ++qli;
   }
   mAttendees.append(a);
   if (doupdate) updated();
   return true;
 }
 
 #if 0
 void IncidenceBase::removeAttendee(Attendee *a)
 {
   if (mReadOnly) return;
   mAttendees.removeRef(a);
   updated();
 }
 
 void IncidenceBase::removeAttendee(const char *n)
 {
   Attendee *a;
 
   if (mReadOnly) return;
   for (a = mAttendees.first(); a; a = mAttendees.next())
     if (a->getName() == n) {
       mAttendees.remove();
       break;
     }
 }
 #endif
 
 void IncidenceBase::clearAttendees()
 {
   if (mReadOnly) return;
   mAttendees.clear();
 }
 
 #if 0
 Attendee *IncidenceBase::getAttendee(const char *n) const
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
     if (qli.current()->getName() == n)
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 #endif
 
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
       if (qli.current()->email().lower() == email.lower())
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 
 Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QString& email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   QStringList mails = emails;
   if (!email.isEmpty()) {
     mails.append(email);
   }
   qli.toFirst();
   while (qli) {
     for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) {
         if (qli.current()->email().lower() == (*it).lower())
         return qli.current();
      }
 
     ++qli;
   }
   return 0L;
 }
 
 void IncidenceBase::setDuration(int seconds)
 {
   mDuration = seconds;
   setHasDuration(true);
 }
 
 int IncidenceBase::duration() const
 {
   return mDuration;
 }
 
 void IncidenceBase::setHasDuration(bool b)
 {
   mHasDuration = b;
 }
 
 bool IncidenceBase::hasDuration() const
 {
   return mHasDuration;
 }
 
 void IncidenceBase::setSyncStatus(int stat)
 {
   if (mReadOnly) return;
   mSyncStatus = stat;
 }
 
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 444d4c4..3edc03b 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -1,189 +1,190 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@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.
 */
 #ifndef KCAL_INCIDENCEBASE_H
 #define KCAL_INCIDENCEBASE_H
 //
 // Incidence - base class of calendaring components
 //
 
 #include <qdatetime.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 #include <qptrlist.h>
 
 #include "customproperties.h"
 #include "attendee.h"
 
 namespace KCal {
 
 typedef QValueList<QDate> DateList;
  enum IncTypeID { eventID,todoID,journalID,freebusyID };
 
 /**
   This class provides the base class common to all calendar components.
 */
 class IncidenceBase : public CustomProperties
 {
   public:
     class Observer {
       public:
         virtual void incidenceUpdated( IncidenceBase * ) = 0;
     };
 
     IncidenceBase();
     IncidenceBase(const IncidenceBase &);
     virtual ~IncidenceBase();
 
     virtual QCString type() const = 0;
     virtual  IncTypeID typeID() const = 0;
 
     /** Set the unique id for the event */
     void setUid(const QString &);
     /** Return the unique id for the event */
     QString uid() const;
 
     /** Sets the time the incidence was last modified. */
     void setLastModified(const QDateTime &lm);
     /** Return the time the incidence was last modified. */
     QDateTime lastModified() const;
     QString lastModifiedSortKey() const;
 
     /** sets the organizer for the event */
     void setOrganizer(const QString &o);
     QString organizer() const;
 
     /** Set readonly status. */
     virtual void setReadOnly( bool );
     /** Return if the object is read-only. */
     bool isReadOnly() const { return mReadOnly; }
 
     /** for setting the event's starting date/time with a QDateTime. */
     virtual void setDtStart(const QDateTime &dtStart);
     /** returns an event's starting date/time as a QDateTime. */
     virtual QDateTime dtStart() const;
     /** returns an event's starting time as a string formatted according to the
      users locale settings */
     QString dtStartTimeStr() const;
     /** returns an event's starting date as a string formatted according to the
      users locale settings */
     QString dtStartDateStr(bool shortfmt=true) const;
     /** returns an event's starting date and time as a string formatted according
      to the users locale settings */
     QString dtStartStr(bool shortfmt=true) const;
 
     virtual void setDuration(int seconds);
     int duration() const;
     void setHasDuration(bool);
     bool hasDuration() const;
 
     /** Return true or false depending on whether the incidence "floats,"
      * i.e. has a date but no time attached to it. */
     bool doesFloat() const;
     /** Set whether the incidence floats, i.e. has a date but no time attached to it. */
     void setFloats(bool f);
 
     /**
       Add Attendee to this incidence. IncidenceBase takes ownership of the
       Attendee object.
     */
     bool addAttendee(Attendee *a, bool doupdate=true );
 //    void removeAttendee(Attendee *a);
 //    void removeAttendee(const char *n);
     /** Remove all Attendees. */
     void clearAttendees();
     /** Return list of attendees. */
     QPtrList<Attendee> attendees() const { return mAttendees; };
     /** Return number of attendees. */
     int attendeeCount() const { return mAttendees.count(); };
     /** Return the Attendee with this email */
     Attendee* attendeeByMail(const QString &);
     /** Return first Attendee with one of this emails */
     Attendee* attendeeByMails(const QStringList &, const QString& email = QString::null);
 
     /** pilot syncronization states */
     enum { SYNCNONE = 0, SYNCMOD = 1, SYNCDEL = 3 };
     /** Set synchronisation satus. */
     void setSyncStatus(int stat);
     /** Return synchronisation status. */
     int syncStatus() const;
 
     /** Set Pilot Id. */
     void setPilotId(int id);
     /** Return Pilot Id. */
     int pilotId() const;
 
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
     QString IDStr() const;
     void setID( const QString &, const QString & );
     QString  getID( const QString & );
     void setCsum( const QString &, const QString & );
     QString getCsum( const QString & );
     void removeID(const QString &);
 
     void registerObserver( Observer * );
     void unRegisterObserver( Observer * );
     void updated();
     void setCalID( int id );
+    void setCalID_block( int id );
     int calID() const;
     void setCalEnabled( bool );
     bool calEnabled() const; 
     void setAlarmEnabled( bool );
     bool alarmEnabled() const;
     bool isTagged() const;
     void setTagged( bool );
     virtual void setLastModifiedSubInvalid();
   protected:
     bool blockLastModified;
     bool mIsTagged;
     QDateTime mDtStart;
     bool mReadOnly;
     QDateTime getEvenTime( QDateTime );
 
   private:
     // base components
     QString mOrganizer;
     QString mLastModifiedKey;
     QString mUid;
     int mCalID;
     bool mCalEnabled;
     bool mAlarmEnabled;
     QDateTime mLastModified;
     QPtrList<Attendee> mAttendees;
 
     bool mFloats;
 
     int mDuration;
     bool mHasDuration;
     QString  mExternalId;
     int mTempSyncStat;
 
     // PILOT SYNCHRONIZATION STUFF
     int mPilotId;                         // unique id for pilot sync
     int mSyncStatus;                      // status (for sync)
 
     QPtrList<Observer> mObservers;
 };
 
 bool operator==( const IncidenceBase&, const IncidenceBase& );
 }
 
 #endif
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index fa7804e..0109c02 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -927,513 +927,513 @@ void KSyncManager::confSync()
     int ii;
     for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) {
         if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) )
             mImplementation->removeSyncInfo( oldSyncProfileNames[ii]  );
     }
     QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
 }
 void KSyncManager::syncKDE()
 {
     mSyncWithDesktop = true;
     emit save();
     switch(mTargetApp)
         {
         case (KAPI):
             {
 #ifdef DESKTOP_VERSION
                 QString command = "kdeabdump33";  
                 QString commandfile = "kdeabdump33";  
                 QString commandpath = qApp->applicationDirPath () + "/";
 #else
                 QString command = "kdeabdump33";  
                 QString commandfile = "kdeabdump33";  
                 QString commandpath =  QDir::homeDirPath ()+"/";
 #endif
                 if ( ! QFile::exists ( commandpath+commandfile ) )
                     command = commandfile;
                 else
                     command  = commandpath+commandfile;
                
                 QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf";
                 int result = system (  command.latin1());
                 qDebug("AB dump 33 command call result: %d ", result);
                 if ( result != 0 ) {
                     qDebug("Calling AB dump version 33 failed. Trying 34... ");
                     commandfile = "kdeabdump34";  
                     if ( ! QFile::exists ( commandpath+commandfile ) )
                         command = commandfile;
                     else
                         command  = commandpath+commandfile;
                     result = system (  command.latin1());
                     qDebug("AB dump 34 command call result: %d ", result);
                     if ( result != 0 ) {
                         KMessageBox::error( 0, i18n("Error accessing KDE addressbook data.\nMake sure the file\n%1kdeabdump3x\nexists ( x = 3 or 4 ).\nSupported KDE versions are 3.3 and 3.4.\nUsed version should be auto detected.\n").arg( commandpath ));
                         return;
                     }
                 }
                 if ( syncWithFile( fileName,true ) ) {
                     if ( mWriteBackFile ) {
                         command += " --read";
                         system (  command.latin1());
                     }
                 }
                 
             }
             break;
         case (KOPI):
             {
 #ifdef DESKTOP_VERSION
                 QString command = "kdecaldump33";  
                 QString commandfile = "kdecaldump33";  
                 QString commandpath = qApp->applicationDirPath () + "/";
 #else
                 QString command = "kdecaldump33";  
                 QString commandfile = "kdecaldump33";  
                 QString commandpath =  QDir::homeDirPath ()+"/";
 #endif
                 if ( ! QFile::exists ( commandpath+commandfile ) )
                     command = commandfile;
                 else
                     command  = commandpath+commandfile;
 
                 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
                 int result = system (  command.latin1());
                 qDebug("Cal dump 33 command call result result: %d ", result);
                 if ( result != 0 ) {
                     qDebug("Calling CAL dump version 33 failed. Trying 34... ");
                     commandfile = "kdecaldump34";  
                     if ( ! QFile::exists ( commandpath+commandfile ) )
                         command = commandfile;
                     else
                         command  = commandpath+commandfile;
                     result = system (  command.latin1());
                     qDebug("Cal dump 34 command call result result: %d ", result);
                     if ( result != 0 ) {
                         KMessageBox::error( 0, i18n("Error accessing KDE calendar data.\nMake sure the file\n%1kdecaldump3x\nexists ( x = 3 or 4 ).\nSupported KDE versions are 3.3 and 3.4.\nUsed version should be auto detected.\n").arg( commandpath ));
                         return;
                     }
                 }
                 if ( syncWithFile( fileName,true ) ) {
                     if ( mWriteBackFile ) {
                         command += " --read";
                         system (  command.latin1());
                     }
                 }
                 
             }
             break;
         case (PWMPI):
 
             break;
         default:
             qDebug("KSM::slotSyncMenu: invalid apptype selected");
             break;
               
         }
 }
 
 void KSyncManager::syncSharp()
 {
 
     if ( ! syncExternalApplication("sharp") )
         qDebug("KSM::ERROR sync sharp  ");
 }
 
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
    
     emit save();
 
     if ( mAskForPreferences )  
         if ( !edit_sync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
             return false;
         }
 
     qDebug("KSM::Sync extern %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
 
     return syncOK;
 
 }
 
 void KSyncManager::syncPhone()
 {
 
     syncExternalApplication("phone");
 
 }
 
 void KSyncManager::showProgressBar(int percentage, QString caption, int total)
 {
     if (!bar->isVisible())
         {
             int w = 300;
             if ( QApplication::desktop()->width() < 320 )
                 w = 220;
             int h = bar->sizeHint().height() ;
             int dw = QApplication::desktop()->width();
             int dh = QApplication::desktop()->height();
             bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
             bar->setCaption (caption); 
             bar->setTotalSteps (  total  ) ;
             bar->show();
         }
     bar->raise();
     bar->setProgress( percentage );
     qApp->processEvents();
 }
 
 void KSyncManager::hideProgressBar()
 {
     bar->hide();
     qApp->processEvents();
 }
 
 bool KSyncManager::isProgressBarCanceled()
 {
     return !bar->isVisible();
 }
 
 QString KSyncManager::syncFileName()
 {
 
     QString fn = "tempfile";
     switch(mTargetApp)
         {
         case (KAPI):
             fn = "tempsyncab.vcf";
             break;
         case (KOPI):
             fn = "tempsynccal.ics";
             break;
         case (PWMPI):
             fn = "tempsyncpw.pwm";
             break;
         default:
             break;
         }
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", fn );
 #else
     return (QString( "/tmp/" )+ fn );
 #endif
 }
 
 void KSyncManager::syncPi()
 {
     mIsKapiFile = true; 
     mPisyncFinished = false;
     qApp->processEvents();
     if ( mAskForPreferences )
         if ( !edit_pisync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
             mPisyncFinished = true;
             return;
         }
     bool ok;
     Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         mPisyncFinished = true;
         return;
     }
     mCurrentResourceLocal = "";
     mCurrentResourceRemote = "";
     if ( mSpecificResources.count() ) {
         int lastSyncRes = mSpecificResources.count()/2;
         int ccc = mSpecificResources.count()-1;
         while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) {
             --ccc;
             --lastSyncRes;
             //qDebug ( "KSM: sync pi %d",ccc  );
         }
         int startLocal = 0;
         int startRemote = mSpecificResources.count()/2;
         emit multiResourceSyncStart( true );
         while ( startLocal < mSpecificResources.count()/2 ) {
             if (  startLocal+1 >= lastSyncRes )
                 emit multiResourceSyncStart( false );
             mPisyncFinished = false;
             mCurrentResourceLocal = mSpecificResources[ startLocal ];
             mCurrentResourceRemote = mSpecificResources[ startRemote ]; 
             //qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
             if ( !mCurrentResourceRemote.isEmpty() ) {
                 qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
                
                 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
                 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
                 commandSocket->readFile(  syncFileName() ); 
                 mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) );
                 while ( !mPisyncFinished ) {
                     //qDebug("waiting ");
                     qApp->processEvents();
                 }
                 if (  startLocal+1 < mSpecificResources.count()/2  ) { 
                     mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") );
                     QTime timer;
                     timer.start(); 
                     while ( timer.elapsed () < 2000 ) {
                         qApp->processEvents();
                     }
                 }
             }
             ++startRemote;
             ++startLocal; 
-           
+            mAskForPreferences = false;
         }
         mPisyncFinished = true;
     } else {
         KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
         connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
         commandSocket->readFile(  syncFileName() );
     }
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     //enum { success, errorW, errorR, quiet };
 
 
 
     if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
          state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
         if ( state == KCommandSocket::errorPW )
             mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
             mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorCA )
             mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
         else if ( state == KCommandSocket::errorFI )
             mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
         else if ( state == KCommandSocket::errorED )
             mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") );
         else if ( state == KCommandSocket::errorUN )
             mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") );
         delete s;
         if ( state == KCommandSocket::errorR ) {
             KCommandSocket* commandSocket = new KCommandSocket( "",mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
             connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
             commandSocket->sendStop();
         }
         mPisyncFinished = true;
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
         mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
         mPisyncFinished = true;
 
     } else  if ( state == KCommandSocket::successR ) {
         QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
 
     } else  if ( state == KCommandSocket::successW ) {
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
         mPisyncFinished = true;
     } else  if ( state == KCommandSocket::quiet ){
         qDebug("KSS: quiet ");
         mPisyncFinished = true;
     } else {
         qDebug("KSS: Error: unknown state: %d ", state);
         mPisyncFinished = true;
     }
 
     delete s;
 }
 
 void KSyncManager::readFileFromSocket()
 {
     QString fileName = syncFileName();
     bool syncOK = true;
     mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
         syncOK = false;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote,mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
     if ( mWriteBackFile && syncOK  ) {
         mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") );
         commandSocket->writeFile(  fileName );
     }
     else {
         commandSocket->sendStop();
         if ( syncOK ) 
             mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
         mPisyncFinished = true;
     }
 }
 
 KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
 {
     mPendingConnect = 0;
     mPassWord = pw;
     mSocket = 0;
     mSyncActionDialog = 0;
     blockRC = false;
     mErrorMessage = 0;
 }
 void KServerSocket::waitForSocketFinish()
 {
     if (  mSocket ) {
         //qDebug("KSS:: waiting for finish operation");
         QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
         return;
     }
     mSocket = new QSocket( this );
     connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
     connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
     mSocket->setSocket( mPendingConnect );
     mPendingConnect = 0;
 }
 void KServerSocket::newConnection ( int socket ) 
 {
     // qDebug("KServerSocket:New connection %d ", socket); 
     if ( mPendingConnect ) {
         qDebug("KSS::Error : new Connection");
         return;
     }
     if ( mSocket ) {
         mPendingConnect = socket;
         QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
         return;
         qDebug("KSS::newConnection Socket deleted! ");
         delete mSocket;
         mSocket = 0;
     }
     mPendingConnect = 0;
     mSocket = new QSocket( this );
     connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
     connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
     mSocket->setSocket( socket );
 }
 
 void KServerSocket::discardClient()
 {
     QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
 }
 void KServerSocket::deleteSocket()
 {
     qDebug("KSS::deleteSocket");
     if ( mSocket ) {
         delete mSocket;
         mSocket = 0;
     }
     if ( mErrorMessage )
         QTimer::singleShot( 10, this , SLOT ( displayErrorMessage()));
 }
 void KServerSocket::readClient()
 {
     if ( blockRC )
         return;
     if ( mSocket == 0 ) {
         qDebug("ERROR::KSS::readClient(): mSocket == 0  ");
         return;
     }
     if ( mErrorMessage ) {
         mErrorMessage = 999;
         error_connect("ERROR_ED\r\n\r\n");
         return;
     }
     mResource = "";
     mErrorMessage = 0;
     //qDebug("KServerSocket::readClient()");
     if ( mSocket->canReadLine() ) {
         QString line = mSocket->readLine();
         //qDebug("KServerSocket readline: %s ", line.latin1());
         QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
         if ( tokens[0] == "GET" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit sendFile( mSocket );
                 bool ok = false;
                 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
                 if ( ok ) {
                     KSyncManager::mRequestedSyncEvent = dt; 
                 }
                 else
                     KSyncManager::mRequestedSyncEvent = QDateTime();
                 mResource =tokens[3];
                 send_file();
             }
             else {
                 mErrorMessage = 1;
                 error_connect("ERROR_PW\r\n\r\n");
             }
         } 
         if ( tokens[0] == "PUT" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit getFile( mSocket );
                 blockRC = true;
                 mResource =tokens[2];
                 get_file();
             }
             else {
                 mErrorMessage = 2;
                 error_connect("ERROR_PW\r\n\r\n");
                 end_connect();
             }
         } 
         if ( tokens[0] == "STOP" ) {
             //emit endConnect();
             end_connect();
         }
     }
 }
 void KServerSocket::displayErrorMessage()
 {
     if ( mErrorMessage == 1 ) {
         KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"), i18n("Pi-Sync Error"));
         mErrorMessage = 0;
     }
     else if ( mErrorMessage == 2 ) {
         KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"), i18n("Pi-Sync Error"));
         mErrorMessage = 0;
     }
 }
 void KServerSocket::error_connect( QString errmess )
 {
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
     os << errmess ;
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle ) {
         QTimer::singleShot( 0, this , SLOT ( discardClient()));
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
     //qDebug("MainWindow::sendFile(QSocket* s) ");
     if ( mSyncActionDialog )
         delete mSyncActionDialog;
     mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
     mSyncActionDialog->setCaption(i18n("Received sync request"));
     QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); 
     label->setAlignment ( Qt::AlignHCenter );
     QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
     lay->addWidget( label);
     lay->setMargin(7);
     lay->setSpacing(7);
     if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
         int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
         //secs = 333;
         if ( secs < 0 )
              secs = secs * (-1);
         if ( secs > 30 ) 
             //if ( true ) 
             {
                 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
                 QLabel* label = new QLabel( warning, mSyncActionDialog ); 
                 label->setAlignment ( Qt::AlignHCenter );
                 lay->addWidget( label);
                 if ( secs > 180 )
                     {
                         if ( secs > 300 ) {
                             if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
                                 qDebug("KSS::Sync cancelled ,cs"); 
                                 mErrorMessage = 0;
                                 end_connect();
                                 error_connect("ERROR_CA\r\n\r\n");
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 744a914..1f9afcb 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -116,513 +116,513 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
    mMyMachineName = new QLineEdit(topFrame);
    lab = new QLabel(mMyMachineName, i18n("Local device name:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mMyMachineName,iii,1);
    ++iii;
   
    QHBox* buttonbox = new QHBox( topFrame);
    topLayout->addMultiCellWidget(buttonbox, iii,iii,0,1);
    ++iii;
    button = new QPushButton( i18n("New profile"), buttonbox );
    connect ( button, SIGNAL( clicked()), this, SLOT (newProfile() ) ); 
 
    button = new QPushButton( i18n("Clone profile"), buttonbox );
    connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) );
 
    button = new QPushButton( i18n("Delete profile"), buttonbox );
    connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) );
 
    mProfileBox = new QComboBox(topFrame);
    mProfileBox->setEditable ( true ); 
    mProfileBox->setInsertionPolicy(QComboBox::NoInsertion);
    connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) );
    connect ( mProfileBox, SIGNAL(  textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) );
   
    lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mProfileBox, iii,1); 
    ++iii;
 
 
 
    QHGroupBox *iims = new QHGroupBox( i18n("Multiple Sync options"), topFrame);
    new QLabel( i18n("Include in multiple "), iims );
    mIncludeInRing = new QCheckBox( i18n("calendar  "), iims  );
    mIncludeInRingAB = new QCheckBox( i18n("addressbook  "), iims  );
    mIncludeInRingPWM = new QCheckBox( i18n("pwmanager"), iims   );
    new QLabel( i18n(" sync"), iims );
    topLayout->addMultiCellWidget(iims, iii,iii,0,1);
    ++iii;
    QVGroupBox* gb0 = new QVGroupBox( i18n("Sync algo options"), topFrame);
    topLayout->addMultiCellWidget(gb0, iii,iii,0,1);
    ++iii;
    QButtonGroup* gr;
    {
        QVGroupBox* topFrame = gb0;
 
        
 
        mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
        //topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
        //++iii;
        gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), topFrame);
        //topLayout->addMultiCellWidget(gr, iii,iii,0,1);
        //++iii;
        loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
        rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
        newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
        ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
        f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr );
        f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr );
        // both = new QRadioButton ( i18n("Take both on conflict"), gr );
 
        mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), topFrame   );
        //topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
        //++iii;  
 
 #if 0
        QHGroupBox* gb51 = new QHGroupBox( i18n("Local resources to sync with:"), topFrame); 
        {
            QVBox * fibo2 = new QVBox ( gb51 );
            new QLabel ( i18n("Calendar resources:"), fibo2 );
            //mFilterInCal = new QComboBox( fibo2 );
            fibo2 = new QVBox ( gb51 );
            new QLabel ( i18n("Addressbook resources:"), fibo2 );
            //mFilterInAB = new QComboBox( fibo2 ); 
        }
 #endif
        QHGroupBox* gb5 = new QHGroupBox( i18n("Apply filter when adding data to local:"), topFrame);
        QVBox * fibo2 = new QVBox ( gb5 );
        new QLabel ( i18n("Incoming calendar filter:"), fibo2 );
        mFilterInCal = new QComboBox( fibo2 );
        fibo2 = new QVBox ( gb5 );
        new QLabel ( i18n("Incoming addressbook filter:"), fibo2 );
        mFilterInAB = new QComboBox( fibo2 );
 
        mWriteBackFile = new QCheckBox( i18n("Write back synced data"), topFrame   );
        // topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
        // ++iii;
    
        QVGroupBox* gb2 = new QVGroupBox( i18n("Write back options"), topFrame);
        //topLayout->addMultiCellWidget(gb2, iii,iii,0,1);
        //++iii;
        {
            QVGroupBox*topFrame = gb2; 
            mWriteBackExisting= new QCheckBox( i18n("Write back (on remote) existing entries only"), topFrame   );
            QHGroupBox* gb4 = new QHGroupBox( i18n("Apply filter when adding data to remote:"), topFrame);
            QVBox * fibo = new QVBox ( gb4 );
            new QLabel ( i18n("Outgoing calendar filter:"), fibo );
            mFilterOutCal = new QComboBox( fibo );
            fibo = new QVBox ( gb4 );
            new QLabel ( i18n("Outgoing addressbook filter:"), fibo );
            mFilterOutAB = new QComboBox( fibo );
            //topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
            //++iii;
            mWriteBackFuture= new QCheckBox( i18n("Write back (calendar) entries for time period only"), topFrame   );
            //topLayout->addMultiCellWidget(mWriteBackFuture, iii,iii,0,1);
            //++iii;
            QHGroupBox* gb3 = new QHGroupBox( i18n("Time period"), topFrame);
            connect ( mWriteBackFuture, SIGNAL( toggled ( bool ) ), gb3, SLOT ( setEnabled ( bool )  ) );
            new QLabel( i18n("From ") , gb3  );
            mWriteBackPastWeeks= new QSpinBox(1,104, 1, gb3);
            new QLabel( i18n(" weeks in the past to ") , gb3  );
            mWriteBackFutureWeeks= new QSpinBox(1,104, 1, gb3);
            new QLabel( i18n(" weeks in the future ") , gb3  );
            //topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
            //++iii;
            gb3->setEnabled( false ); 
            connect ( mWriteBackExisting, SIGNAL( toggled ( bool ) ), gb4, SLOT ( setDisabled ( bool )  ) );
        }
        connect ( mWriteBackFile, SIGNAL( toggled ( bool ) ), gb2, SLOT ( setEnabled ( bool )  ) );
 
    }
    proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), topFrame);
    gr = proGr;
    topLayout->addMultiCellWidget(gr, iii,iii,0,1);
    ++iii;
    mIsLocal = new QRadioButton ( i18n("Local file"), gr );
    mIsPi = new QRadioButton ( i18n("Pi-Sync - all resources ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsPiSpecific = new QRadioButton ( i18n("Pi-Sync - selected resources ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPiSpecific, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
    connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
    connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );  
 
    QVGroupBox* gb1 = new QVGroupBox( i18n("Profile kind specific settings"), topFrame);
    topLayout->addMultiCellWidget(gb1, iii,iii,0,1);
    ++iii;
 
    // ******************************************
    // Profile kind specific settings
    {
        // *** phone *******************************
        QVGroupBox* topFrame = gb1;
        phoneWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
        //++iii; 
        mWriteContactToSIM = 0;//new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
        QHBox* temphb = new QHBox( phoneWidget );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) );
 
 
        temphb = new QHBox( phoneWidget );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) );
 
 
        temphb = new QHBox( phoneWidget );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpModel() ) );
 
        // *** local*******************************
        localFileWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
        //++iii;
        temphb = new QHBox( localFileWidget );
 
        lab = new QLabel( i18n("Local file Cal:"), temphb );
        lab = new QLabel( i18n("Local file ABook:"), temphb );
        lab = new QLabel( i18n("Local file PWMgr:"), temphb );
        temphb = new QHBox( localFileWidget );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFilePWM() ) );
        temphb = new QHBox( localFileWidget );
 
        mRemoteFile = new QLineEdit( temphb);
        mRemoteFileAB = new QLineEdit( temphb);
        mRemoteFilePWM = new QLineEdit( temphb);
        mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget );
 
 
        // *** remote*******************************
        remoteFileWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
        //++iii;
        temphb = new QHBox( remoteFileWidget );
        new QLabel( i18n("Calendar:"), temphb);
        new QLabel( i18n("AddressBook:"), temphb);
        new QLabel( i18n("PWManager:"), temphb);
 
        lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        mRemotePrecommand = new QLineEdit(temphb);
        mRemotePrecommandAB = new QLineEdit(temphb);
        mRemotePrecommandPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        mLocalTempFile = new QLineEdit(temphb);
        mLocalTempFileAB = new QLineEdit(temphb);
        mLocalTempFilePWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        mRemotePostcommand = new QLineEdit(temphb );
        mRemotePostcommandAB = new QLineEdit(temphb );
        mRemotePostcommandPWM = new QLineEdit(temphb );
        mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget );
        lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        button = new QPushButton( i18n("ssh/scp"), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
        button = new QPushButton( i18n("ftp"), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
        lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
 
        // *** pi-sync*******************************
        piWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
        //++iii;
        temphb = new QHBox( piWidget );
        new QLabel( i18n("Calendar:"), temphb);
        new QLabel( i18n("AddressBook:"), temphb);
        new QLabel( i18n("PWManager:"), temphb);
 
        lab = new QLabel( i18n("Password for remote access: (could be the same for each)"), piWidget);
        temphb = new QHBox( piWidget );
        mRemotePw = new QLineEdit(temphb);
        mRemotePwAB = new QLineEdit(temphb);
        mRemotePwPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Remote IP address: (could be the same for each)"), piWidget);
        temphb = new QHBox( piWidget );
        mRemoteIP = new QLineEdit(temphb);
        mRemoteIPAB = new QLineEdit(temphb);
        mRemoteIPPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Remote port number: (should be different for each)"), piWidget);
        temphb = new QHBox( piWidget );
        mRemotePort = new QLineEdit(temphb);
        mRemotePortAB = new QLineEdit(temphb);
        mRemotePortPWM = new QLineEdit(temphb);
 
-       lab = new QLabel( i18n("Local/remote Resource sync partners"), piWidget);
+       lab = new QLabel( i18n("Local/remote Resource sync partners (Leave empty to not sync)"), piWidget);
        mTableBox = new QHBox( piWidget );
        mResTableKopi = new QTable( 1, 1, mTableBox );
        mResTableKapi = new QTable( 1, 1, mTableBox );
        mResTablePwmpi = new QTable( 1, 1, mTableBox );
        mResTableKopi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTableKapi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTablePwmpi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTableKopi->setLeftMargin( 80 );
    } 
    // ******************************************
    // Profile kind specific settings END
  
 }
 
 void KSyncPrefsDialog::readResources()
 {
     mResourcesKopi.clear();
     mResourcesKapi.clear();
     KConfig fc(locateLocal("config","kopicalendarrc"));
     fc.setGroup("CC");
     int numCals = fc.readNumEntry("NumberCalendars",0 );
     int curCal = 1;
     while ( curCal <= numCals ) {
         QString prefix = "Cal_" +QString::number( curCal );
         QString name =  fc.readEntry( prefix+"_Name", "Calendar");
         mResourcesKopi.append( name );
         ++curCal;
     }
     mResTableKopi->setNumRows( mResourcesKopi.count() );
     int i;
     for ( i = 0;i < mResourcesKopi.count(); ++i ) {
         mResTableKopi->verticalHeader ()->setLabel( i, mResourcesKopi[i] );
     }
 }
 void KSyncPrefsDialog::readFilter()
 {
     mFilterKapi.clear();
     mFilterKopi.clear();
     KConfig cfgko(locateLocal("config","korganizerrc"));
     KConfig cfgka(locateLocal("config","kaddressbookrc"));
     cfgko.setGroup("General");
     mFilterKopi =  cfgko.readListEntry("CalendarFilters");
     cfgka.setGroup("Filter");
     int count = cfgka.readNumEntry( "Count", 0 );
     for ( int i = 0; i < count; i++ ) {
         cfgka.setGroup("Filter_"+QString::number( i ) );  
         mFilterKapi.append( cfgka.readEntry("Name", "internal error") );  
     }
     mFilterOutCal->clear();
     mFilterInCal->clear();
     mFilterOutAB->clear();
     mFilterInAB->clear();
     QStringList temp = mFilterKopi;
     temp.prepend(i18n("No Filter") );
     mFilterOutCal->insertStringList( temp );
     mFilterInCal->insertStringList( temp );
     temp = mFilterKapi;
     temp.prepend(i18n("No Filter") );
     mFilterOutAB->insertStringList( temp );
     mFilterInAB->insertStringList( temp );
 }
 
 void KSyncPrefsDialog::slotOK()
 {
     if ( mMyMachineName->text() == "undefined" ) {
         KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
         return;
     }
     int i;
     for (i = 0; i < mSyncProfileNames.count(); ++ i) {
         if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1  ) {
             KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
             return;
         }
     }
     usrWriteConfig();
     QDialog::accept();
 }
 void KSyncPrefsDialog::accept()
 {
     slotOK();
 }
 void KSyncPrefsDialog::chooseFile()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     mRemoteFile->setText( fn );
 }
 
 void KSyncPrefsDialog::chooseFileAB()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.vcf)"), this );
     if ( fn == "" )
         return;
     mRemoteFileAB->setText( fn );
 }
 
 void KSyncPrefsDialog::chooseFilePWM()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.pwm)"), this );
     if ( fn == "" )
         return;
     mRemoteFilePWM->setText( fn );
 }
 
 void KSyncPrefsDialog::textChanged( const QString &  s )
 {
     if ( mProfileBox->count() == 0 )
         return;
     if ( currentSelection < 3 ) {
         //KMessageBox::error(this,i18n("This profil name\ncannot be edited!\n"),i18n("KO/Pi config error"));
         mProfileBox->blockSignals( true );
         mProfileBox->setCurrentItem(mProfileBox-> currentItem ());
         mProfileBox->blockSignals( false );
         return;
     }
     //qDebug("cur i %d ",mProfileBox-> currentItem () );
     mProfileBox->changeItem ( s, mProfileBox-> currentItem () ) ;
     KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
     prof->setName( s );
     mSyncProfileNames[mProfileBox-> currentItem ()] = s;
 }
 void KSyncPrefsDialog::profileChanged( int item )
 {
   //qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() ); 
     KSyncProfile* prof;
     saveProfile();
     readFilter();
     readResources();
     currentSelection = item;
     prof = mSyncProfiles.at(item) ;
 
     mRemotePw->setText(prof->getRemotePw());
     mRemoteIP->setText(prof->getRemoteIP());
     mRemotePort->setText(prof->getRemotePort());
     
     mRemotePwAB->setText(prof->getRemotePwAB());
     mRemoteIPAB->setText(prof->getRemoteIPAB());
     mRemotePortAB->setText(prof->getRemotePortAB());
     
     mRemotePwPWM->setText(prof->getRemotePwPWM());
     mRemoteIPPWM->setText(prof->getRemoteIPPWM());
     mRemotePortPWM->setText(prof->getRemotePortPWM());
 
     mRemotePrecommand->setText(prof->getPreSyncCommand());
     mRemotePostcommand->setText(prof->getPostSyncCommand());
     mLocalTempFile->setText(prof->getLocalTempFile());
     mRemoteFile->setText(prof->getRemoteFileName()) ;
 
     mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
     mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
     mLocalTempFileAB->setText(prof->getLocalTempFileAB());
     mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
 
     mRemotePrecommandPWM->setText(prof->getPreSyncCommandPWM());
     mRemotePostcommandPWM->setText(prof->getPostSyncCommandPWM());
     mLocalTempFilePWM->setText(prof->getLocalTempFilePWM());
     mRemoteFilePWM->setText(prof->getRemoteFileNamePWM()) ;
 
     if ( mWriteContactToSIM )
         mWriteContactToSIM->setChecked( prof->getWriteContactToSIM());
     mPhoneDevice->setText(prof->getPhoneDevice());
     mPhoneConnection->setText(prof->getPhoneConnection());
     mPhoneModel->setText(prof->getPhoneModel());
 
     mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
     mAskForPreferences->setChecked( prof->getAskForPreferences());
     mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
     mWriteBackFile->setChecked( prof->getWriteBackFile());
     mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
     mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
     mIncludeInRingPWM->setChecked( prof->getIncludeInRingSyncPWM() );
     mWriteBackFuture->setChecked( prof->getWriteBackFuture());
     mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
     mWriteBackPastWeeks->setValue( prof->getWriteBackPastWeeks() );
 
     mFilterInCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterInCal () ) + 1 );
     mFilterOutCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterOutCal () ) + 1 );
     mFilterInAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterInAB () ) + 1 );
     mFilterOutAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterOutAB () ) + 1 );
     
     switch ( prof->getSyncPrefs() ) {
     case 0:
         loc->setChecked( true);
         break;
     case 1:
         rem->setChecked( true );
         break;
     case 2:
         newest->setChecked( true);
         break;
     case 3:
         ask->setChecked( true);
         break;
     case 4:
         f_loc->setChecked( true);
         break;
     case 5:
         f_rem->setChecked( true);
         break;
     case 6:
         //both->setChecked( true);
         break; 
     default:
         break;
     }
     mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
     mIsPhone->setChecked(prof->getIsPhoneSync()) ;
     mIsPi->setChecked(prof->getIsPiSync()) ;
     mIsPiSpecific->setChecked(prof->getIsPiSyncSpec()) ;
     mIsKapiFileL->setChecked(prof->getIsKapiFile()) ;
     mIsKapiFileR->setChecked(prof->getIsKapiFile()) ;
 
 
     QStringList res = QStringList::split( ":",prof->getResSpecKopi(), true );
     int add = res.count()/2;
     int i;
     for ( i = 0;i < add ; ++i ) {
         mResTableKopi->setText( i, 0, res[i+add] );
     } 
     res = QStringList::split( ":",prof->getResSpecKapi(), true);
     add = res.count()/2;
     for ( i = 0;i <  add; ++i ) {
         mResTableKapi->setText( i, 0, res[i+add] );
     }
     mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec());
     proGr->setEnabled( item > 2 );
     if ( item < 3 ) {
         localFileWidget->hide();
         remoteFileWidget->hide();
         phoneWidget->hide();
         piWidget->hide();
 
     } else
         kindChanged( prof->getIsLocalFileSync() );
 }
 
 void KSyncPrefsDialog::fillSSH()
 {
     mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
     mLocalTempFile->setText("/tmp/mycalendar.ics" );
     mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
     mRemotePrecommandAB->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
     mLocalTempFileAB->setText("/tmp/std.vcf" );
     mRemotePostcommandAB->setText("scp /tmp/std.vcf zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf" );
     mRemotePrecommandPWM->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" );
     mLocalTempFilePWM->setText("/tmp/passwords.pwm" );
     mRemotePostcommandPWM->setText("scp /tmp/passwords.pwm zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/pwmanager.pwm" );
 }