fixes

5 files changed, 33 insertions, 8 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 65bb075..6ccf763 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,5 +1,14 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.0.6 ************
+
+Two bugfixes in the pi-sync mode.
+KO/Pi:
+Made the todolist using alternate background.
+
+Other minor fixes in KO/Pi.
+
+
 ********** VERSION 2.0.5 ************
 
 Bugfixes in KO/Pi.
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 468fd5b..18a4b12 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -265,7 +265,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
-    mSyncManager->setDefaultFileName( defaultFileName()); 
+    mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
@@ -1992,13 +1992,25 @@ void MainWindow::exportVCalendar()
     }
 
 }
+QString MainWindow::sentSyncFile()
+{
+#ifdef DESKTOP_VERSION
+    return  locateLocal( "tmp", "copysynccal.ics" );
+#else
+    return QString( "/tmp/copysynccal.ics" );
+#endif 
+}
 
 void MainWindow::syncFileRequest()
 {
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
-    save();
+
+    setCaption(i18n("Saving Data to temp file ..." ));
+    mView->saveCalendar( sentSyncFile() );
+    setCaption(i18n("Data saved to temp file!" ));
+
 }
 void MainWindow::getFile( bool success )
 {
@@ -2006,7 +2018,7 @@ void MainWindow::getFile( bool success )
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    mView->openCalendar( defaultFileName() ); 
+    mView->openCalendar( sentSyncFile() ); 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 5b9f903..5808700 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -103,6 +103,7 @@ class MainWindow : public QMainWindow
     void syncFileRequest();
     
   protected:
+    QString sentSyncFile();
     void displayText( QString, QString);
     void enableIncidenceActions( bool );
     
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 9177f63..c8d0e0d 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -72,8 +72,6 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
-    if ( mPrefs->mPassiveSyncAutoStart )
-      enableQuick( false );
 
 }
 
@@ -82,6 +80,12 @@ KSyncManager::~KSyncManager()
     delete bar;
 }
 
+void KSyncManager::setDefaultFileName( QString s)
+{
+    mDefFileName = s ;
+    if ( mPrefs->mPassiveSyncAutoStart )
+      enableQuick( false );
+}
 
 void KSyncManager::fillSyncMenu()
 {
@@ -412,7 +416,6 @@ void KSyncManager::enableQuick( bool ask )
     //qDebug("port %d ", port);
     mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
     mServerSocket->setFileName( defaultFileName() );//bbb
-    //qDebug("connected ");
     if ( !mServerSocket->ok() ) {
         KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!"));
         delete mServerSocket;
@@ -1117,7 +1120,7 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject
     mSocket = 0;
     mSyncActionDialog = 0;
     blockRC = false;
-};
+}
 
 void KServerSocket::newConnection ( int socket ) 
 {
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9a3066e..09bd1c1 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -121,7 +121,7 @@ class KSyncManager : public QObject
     void multiSync( bool askforPrefs  );
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
-    void setDefaultFileName( QString s) { mDefFileName = s ;}
+    void setDefaultFileName( QString s) ;
     QString defaultFileName() { return mDefFileName ;}
     QString syncFileName();
     void enableQuick( bool ask = true);