2 files changed, 6 insertions, 10 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 326db88..6e61351 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -927,7 +927,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastCalendarSync = QDateTime::currentDateTime();
-    if ( mSyncKDE ) {
+    if ( mSyncManager->syncWithDesktop() ) {
         remote->resetPilotStat(1);
         if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
             mLastCalendarSync = KSyncManager::mRequestedSyncEvent;
@@ -944,7 +944,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         remote->deleteEvent(eventR );
 
     } else {
-        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncKDE) {
+        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) {
             eventRSync = (Event*)eventLSync->clone();
         } else {
             fullDateRange = true;
@@ -967,7 +967,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             fullDateRange = true;
         } 
     }
-    if ( mSyncKDE ) {
+    if ( mSyncManager->syncWithDesktop() ) {
         fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); 
     }
     if ( fullDateRange )
@@ -1027,7 +1027,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                             inR->setIDStr( idS );
                         remote->addIncidence(  inR );
-                        if ( mSyncKDE )
+                        if ( mSyncManager->syncWithDesktop() )
                             inR->setPilotId( 2 );
                         ++changedRemote;
                     } else {
@@ -1035,7 +1035,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         int pid = inL->pilotId();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
-                        if ( mSyncKDE )
+                        if ( mSyncManager->syncWithDesktop() )
                             inL->setPilotId( pid  );
                         inL->setIDStr( idS );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
@@ -1183,7 +1183,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
     eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
     eventLSync->setReadOnly( true );
-    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncKDE) // kde is abnormal...
+    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal...
         remote->addEvent( eventRSync );
     else
         delete eventRSync;
@@ -3745,10 +3745,8 @@ void CalendarView::keyPressEvent ( QKeyEvent *e)
 bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 {
     // mSyncManager = manager;
-    mSyncKDE = false;
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
         qDebug("SyncKDE request detected!");
-        mSyncKDE = true;
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
@@ -3756,7 +3754,6 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
-    mSyncKDE = false;
     //mSyncManager = manager;
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index acc20d6..437a51c 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -489,7 +489,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     Todo *selectedTodo();
 
   private:
-    bool mSyncKDE;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;