1 files changed, 16 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 31e103d..8965d3b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1969,25 +1969,24 @@ bool CalendarView::syncCalendar(QString filename, int mode)
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
 
 void CalendarView::syncExternal( int mode  )
 {
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
-   
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
     bool loadSuccess = false;
     PhoneFormat* phoneFormat = 0;
     emit tempDisableBR(true);
 #ifndef DESKTOP_VERSION
     SharpFormat* sharpFormat = 0;
     if ( mode == 0 ) { // sharp
         sharpFormat = new SharpFormat () ;
         loadSuccess = sharpFormat->load( calendar, mCalendar ); 
@@ -5025,35 +5024,49 @@ void CalendarView::purgeCompleted()
 void CalendarView::slotCalendarChanged()
 {
    ; 
 }
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug("CalendarView::keyPressEvent ");
      e->ignore();
 }
 
 
-bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
+bool CalendarView::sync(KSyncManager* manager, QString filename, int mode,QString resource)
 {
    
     if ( manager != mSyncManager)
         qDebug("KO: Internal error-1. SyncManager mismatch ");
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
         qDebug("KO: SyncKDE request detected!");
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
-    return syncCalendar( filename, mode );
+    if ( !resource.isEmpty() ) {
+        int exclusiveSyncResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
+        qDebug( "KO: Sync request for resource: %s", resource.latin1() );
+        
+        if ( !exclusiveSyncResource ) {
+            qDebug( "KO: Requested sync resource not found: %s", resource.latin1() );
+            return false;
+        }
+        mCalendar->setDefaultCalendar( exclusiveSyncResource ); 
+        mCalendar->setDefaultCalendarEnabledOnly();
+    }
+    bool result =  syncCalendar( filename, mode );
+    if ( !resource.isEmpty() )
+         restoreCalendarSettings();
+    return result;
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
     //mSyncManager = manager;
     if ( manager != mSyncManager)
         qDebug("KO: Internal error-2. SyncManager mismatch ");
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     if ( resource == "sharp" )
         syncExternal( 0 );
     if ( resource == "phone" )
          syncExternal( 1 );