9 files changed, 106 insertions, 13 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8965d3b..307027a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -363,12 +363,13 @@ CalendarView::CalendarView( Calendar *calendar,
     mTodoEditor = 0;
     init();
 }
 
 void CalendarView::init()
 { 
+    mMultiResourceSync = false; 
     flag_blockConflict = false; 
     flag_blockScrollBar = false;
     flag_checkFileFirsttime = true;
     flag_clearallviewsEventDisplay = false;
     flag_clearallviewsupdateView = false;
     mNextAlarmDateTime = QDateTime::currentDateTime();
@@ -1549,12 +1550,13 @@ Event* CalendarView::getLastSyncEvent()
             sum = "E: ";
         lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse->setDtStart( mLastCalendarSync );
         lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         lse->setCategories( i18n("SyncEvent") );
         lse->setReadOnly( true );
+        lse->setCalID( 1 );
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
@@ -1899,22 +1901,27 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             }
             inR =  er.next();
         }
     }
     bar.hide();
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
+    if ( mMultiResourceSync ) {
+        remote->removeSyncInfo( "" ); //all
+
+    } else {
     eventLSync->setReadOnly( false );
     eventLSync->setDtStart( mLastCalendarSync );
     eventRSync->setDtStart( mLastCalendarSync );
     eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
     eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
     eventLSync->setReadOnly( true );
+    }
     qDebug("KO: Normal sync: %d ",mGlobalSyncMode ==  SYNC_MODE_NORMAL );
-    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal...
+    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop() && !mMultiResourceSync ) // kde is abnormal...
         remote->addEvent( eventRSync );
     else
         delete eventRSync;
     qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() );
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); 
@@ -2432,12 +2439,38 @@ void CalendarView::mergeFile( QString fn )
     mCalendar->mergeCalendarFile( fn ); 
     mCalendar->reInitAlarmSettings();
     setSyncEventsReadOnly();
     updateUnmanagedViews();
     updateView();
 }
+void CalendarView::mergeFileResource( QString fn ,QString resource )
+{
+
+    if ( resource == "ALL" ) {
+        mergeFile( fn );
+        return;
+    }
+
+    int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
+    if ( !exclusiveResource ) {
+        qDebug("KO: CalendarView::mergeFileResource: resource not found %s", resource.latin1() );
+        return;
+    }
+    clearAllViews();
+    mCalendar->setCalendarRemove( exclusiveResource );
+    int def = mCalendar->defaultCalendar();
+    mCalendar->setDefaultCalendar(exclusiveResource);
+    if ( !mCalendar->addCalendarFile( fn, exclusiveResource )) {
+        qDebug("KO: CalendarView::mergeFileResource: error adding file %s", fn.latin1() );
+    }
+    mCalendar->setDefaultCalendar( def );
+    mCalendar->reInitAlarmSettings();
+    setSyncEventsReadOnly();
+    updateUnmanagedViews();
+    updateView();
+}
 void CalendarView::showOpenError()
 {
    KMessageBox::error(this,i18n("Couldn't load calendar\n."));
 }
 void CalendarView::setLoadedFileVersion(QDateTime dt)
 {
@@ -2519,12 +2552,13 @@ bool CalendarView::checkFileVersion(QString fn)
     setSyncDevice("deleteaftersync" );
     mSyncManager->mAskForPreferences = true;
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
+    mMultiResourceSync = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     if ( e )
         mCalendar->deleteEvent( e );
     return true;
 }
@@ -2555,12 +2589,29 @@ bool CalendarView::saveCalendars()
         saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError;
         KMessageBox::error(this, saveError, i18n("Error saving data"));
         return false;
     }
     return true;
 }
+bool CalendarView::saveCalendarResource(QString filename, QString resource)
+{
+    if ( resource == "ALL" )
+        return saveCalendar( filename );
+    int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
+    if ( !exclusiveResource ) {
+        qDebug("KO: CalendarView::saveCalendarResource: resource not found %s", resource.latin1() );
+        return false;
+    }
+    mCalendar->setDefaultCalendar( exclusiveResource ); 
+    mCalendar->setDefaultCalendarEnabledOnly(); 
+    mCalendar->setSyncEventsEnabled();
+    bool res = saveCalendar( filename );
+    restoreCalendarSettings();
+    return res;
+    
+}
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
@@ -5029,13 +5080,17 @@ void CalendarView::slotCalendarChanged()
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug("CalendarView::keyPressEvent ");
      e->ignore();
 }
 
+void CalendarView::multiResourceSyncStart( bool start )
+{
+    mMultiResourceSync = start;
 
+}
 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" ) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index f85b6a3..60b1276 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -136,12 +136,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void addView(KOrg::BaseView *);
     void showView(KOrg::BaseView *);
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
     void checkSuspendAlarm();
     void mergeFile( QString fn );
+    void mergeFileResource( QString fn  ,QString res);
 
   signals:
     void save ();
     void saveStopTimer ();
     void tempDisableBR(bool);
     /** This todo has been modified */
@@ -198,12 +199,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void calendarViewExpanded( bool );
     void updateSearchDialog();
     void filtersUpdated();
 
 
   public slots: 
+    void multiResourceSyncStart( bool );
     void displayCalendarInfo( int id );
     void nextConflict( bool all, bool allday );
     void conflictAll();
     void conflictAllday();
     void conflictNotAll();
     void setCalReadOnly( int id, bool readO );
@@ -243,12 +245,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
     /**
       Save calendar data to file. Return true if calendar could be
       successfully saved.
     */
     bool saveCalendar(QString filename);
+    bool saveCalendarResource(QString filename, QString resource);
   
     /**
       Close calendar. Clear calendar data and reset views to display an empty
       calendar.
     */
     void closeCalendar();
@@ -536,12 +539,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
     void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
     void setScrollBarStep(int val );
 
   protected:
+    bool mMultiResourceSync;
     Event *mConflictingEvent;
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete(const QString name);
     void showEventEditor();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 66bb19b..69ccde1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -371,14 +371,16 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
-    connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
-    connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+    connect(mSyncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) );
+    connect(mSyncManager , SIGNAL( getFile( bool, const QString &)), this, SLOT(getFile( bool,const QString & ) ) );
+    connect(mSyncManager , SIGNAL( multiResourceSyncStart( bool )), mView, SLOT( multiResourceSyncStart( bool ) ) );
+
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
 
 
@@ -2701,36 +2703,36 @@ QString MainWindow::sentSyncFile()
     return  QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) );
 #else
     return QString( "/tmp/copysynccal.ics" );
 #endif 
 }
 
-void MainWindow::syncFileRequest()
+void MainWindow::syncFileRequest(const QString& resource)
 {
     while ( mSyncManager->blockSave() ) {
         qApp->processEvents(); 
     }
     mSyncManager->setBlockSave(true);
 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
 
     setCaption(i18n("Saving Data to temp file ..." ));
-    mView->saveCalendar( sentSyncFile() );
+    mView->saveCalendarResource( sentSyncFile(), resource );
     setCaption(i18n("Data saved to temp file!" ));
     mSyncManager->setBlockSave( false );
 
 }
-void MainWindow::getFile( bool success )
+void MainWindow::getFile( bool success ,const QString& resource)
 {
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    mView->mergeFile( sentSyncFile() ); 
+    mView->mergeFileResource( sentSyncFile(), resource); 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
     setCaption( i18n("Pi-Sync successful!") );
 } 
 void MainWindow::printListView()
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index d8018b6..a533d8b 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -107,14 +107,14 @@ class MainWindow : public QMainWindow
  signals:
     void selectWeek ( int ); 
   private slots:
     void slotResetFocus();
     void slotResetFocusLoop();
     void showConfigureAgenda();
-    void getFile( bool );
-    void syncFileRequest();
+    void getFile( bool ,const QString &);
+    void syncFileRequest(const QString &);
     
   protected:
     int mFocusLoop;
     void hideEvent ( QHideEvent * );
     QString sentSyncFile();
     void displayText( QString, QString);
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 4b8b3ff..0a94914 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -76,12 +76,13 @@ public:
     virtual void close() = 0;
     virtual void addCalendar( Calendar*  ) = 0;
     virtual bool addCalendarFile( QString name, int id ) = 0;
     virtual bool mergeCalendarFile( QString name ) = 0;
     virtual Incidence* incidenceForUid( const QString& uid, bool doNotCheckDuplicates  ) = 0;
     virtual void setSyncEventsReadOnly() = 0;
+    virtual void setSyncEventsEnabled() = 0;
     virtual void stopAllTodos() = 0;
     virtual void clearUndo( Incidence * newUndo );
   
     /**
       Sync changes in memory to persistant storage.
     */
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 0ddfeca..45e3128 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -170,19 +170,31 @@ bool CalendarLocal::addCalendarFile( QString name, int id )
     if ( calendar.load( name ) ) {
         addCalendar( &calendar  );
         return true;
     }
     return false;
 }
-void CalendarLocal::setSyncEventsReadOnly()
+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->setCalID( 1 );
+        }
         ev =  mEventList.next();
     } 
 }
 void CalendarLocal::addCalendar( Calendar* cal )
 {
     cal->setDontDeleteIncidencesOnClose();
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index ca0bd98..eb7bf34 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -46,12 +46,13 @@ class CalendarLocal : public Calendar
     void addCalendar( Calendar*  );
     bool addCalendarFile( QString name, int id );
     bool mergeCalendarFile( QString name );
     bool mergeCalendar( Calendar* cal );
     Incidence* incidenceForUid( const QString& uid, bool doNotCheckDuplicates  );
     void setSyncEventsReadOnly();
+    void setSyncEventsEnabled();
     void stopAllTodos();
     /**
       Loads a calendar on disk in vCalendar or iCalendar format into the current
       calendar. Any information already present is lost.
       @return true, if successfull, false on error.
       @param fileName the name of the calendar on disk.
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index a64eb34..719d80b 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -194,12 +194,13 @@ void KSyncManager::slotClearMenu( int action )
     mImplementation->removeSyncInfo( syncDevice );
 }
 void KSyncManager::slotSyncMenu( int action )
 {
     qDebug("KSM::syncaction %d ", action);
     mCurrentResourceLocal = "";
+    emit multiResourceSyncStart( false );
     if ( action == 5000 )
         return;
     mSyncWithDesktop = false;
     if ( action == 0 ) {
 
         // seems to be a Qt2 event handling bug
@@ -438,12 +439,14 @@ void KSyncManager::enableQuick( bool ask )
     mPrefs->mPassiveSyncAutoStart = autoStart;
     if ( changed ) {
         mPrefs->writeConfig();
     }
     connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
     connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
+    connect( mServerSocket, SIGNAL ( request_file(const QString &) ),this, SIGNAL  ( request_file(const QString &) ) );
+    connect( mServerSocket, SIGNAL ( file_received( bool ,const QString &) ), this,  SIGNAL  ( getFile( bool,const QString & ) ) );
 }
 void KSyncManager::displayErrorPort()
 {
     KMessageBox::information( 0, i18n("<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?").arg( mPrefs->mPassiveSyncPort) , i18n("Pi-Sync Port Error"));
 }
 void KSyncManager::syncLocalFile()
@@ -566,13 +569,13 @@ void KSyncManager::multiSync( bool askforPrefs  )
         mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 
 int KSyncManager::ringSync()
 {
-   
+    emit multiResourceSyncStart( false );
     int syncedProfiles = 0;
     unsigned int i;
     QTime timer;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     QStringList syncProfileNames = mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
@@ -1137,13 +1140,16 @@ void KSyncManager::syncPi()
     }
     mCurrentResourceLocal = "";
     mCurrentResourceRemote = "";
     if ( mSpecificResources.count() ) {
         int startLocal = 0;
         int startRemote = mSpecificResources.count()/2;
+        emit multiResourceSyncStart( true );
         while ( startLocal < mSpecificResources.count()/2 ) {
+            if (  startLocal+1 >= mSpecificResources.count()/2 )
+                emit multiResourceSyncStart( false );
             mPisyncFinished = false;
             mCurrentResourceLocal = mSpecificResources[ startLocal ];
             mCurrentResourceRemote = mSpecificResources[ startRemote ];
             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() );
@@ -1216,13 +1222,13 @@ void KSyncManager::readFileFromSocket()
     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( "",mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
+    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 {
@@ -1280,12 +1286,13 @@ void KServerSocket::readClient()
     }
     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 );
@@ -1296,23 +1303,25 @@ void KServerSocket::readClient()
                 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();
@@ -1403,12 +1412,13 @@ void KServerSocket::send_file()
             mSyncActionDialog->setFixedSize( 230, 120);
         }
     } else
         mSyncActionDialog->setFixedSize( 230, 120);
     mSyncActionDialog->show();
     mSyncActionDialog->raise();
+    emit request_file(mResource);
     emit request_file();
     qApp->processEvents();
     QString fileName = mFileName;
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         mErrorMessage = 0;
@@ -1464,12 +1474,13 @@ void KServerSocket::readBackFileFromSocket()
     QFile file ( fileName );
     if (!file.open( IO_WriteOnly ) ) {
         delete mSyncActionDialog;
         mSyncActionDialog = 0;
         qDebug("KSS:Error open read back file ");
         piFileString = "";
+        emit file_received( false, mResource);
         emit file_received( false );
         blockRC = false;
         return ;
                     
     } 
 
@@ -1480,12 +1491,13 @@ void KServerSocket::readBackFileFromSocket()
     ts << piFileString;
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( discardClient()));
     file.close(); 
     piFileString = "";
+    emit file_received( true, mResource );
     emit file_received( true );
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
     blockRC = false;
 
 }
@@ -1593,13 +1605,13 @@ void KCommandSocket::writeFileToSocket()
     mConnectProgress.setProgress( count );
     mConnectProgress.blockSignals( true );
     QTextStream ts2( &file2 );
     ts2.setEncoding( QTextStream::Latin1 );
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
-    os2 << "PUT " << mPassWord << "\r\n\r\n";;
+    os2 << "PUT " << mPassWord << mRemoteResource << "\r\n\r\n";;
     int byteCount = 0;
     int byteMax = file2.size()/53;
     while ( ! ts2.atEnd() ) {
         qApp->processEvents();
         if ( byteCount > byteMax ) {
             byteCount = 0;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index f4654ce..53c611d 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -50,21 +50,24 @@ class KServerSocket : public QServerSocket
 
     void newConnection ( int socket ) ;
     void setFileName( QString fn  ) {mFileName = fn;};
  signals:
     void file_received( bool );
     void request_file();
+    void file_received( bool, const QString &);
+    void request_file(const QString &);
     void saveFile();
     void endConnect();
     private slots:
     void discardClient();
     void deleteSocket();
     void readClient();
     void displayErrorMessage();
     void readBackFileFromSocket();
  private :
+    QString mResource;
     int mErrorMessage;
     bool blockRC;
     void send_file();
     void get_file();
     void end_connect();
     void error_connect( QString );
@@ -171,12 +174,15 @@ class KSyncManager : public QObject
     static QDateTime mRequestedSyncEvent;
 
  signals:
     void save();
     void request_file();
     void getFile( bool );
+    void getFile( bool, const QString &);
+    void request_file(const QString &);
+    void multiResourceSyncStart( bool );
 
     public slots:
     void slotSyncMenu( int );
     void slotClearMenu( int action );
     void deleteCommandSocket(KCommandSocket*s, int state);
     void readFileFromSocket();