-rw-r--r-- | kaddressbook/kabcore.cpp | 8 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 15cab73..b7edccd 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1795,5 +1795,7 @@ void KABCore::initGUI() | |||
1795 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 1795 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
1796 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 1796 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
1797 | syncManager->setDefaultFileName( sentSyncFile()); | 1797 | QString sync_file = sentSyncFile(); |
1798 | qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); | ||
1799 | syncManager->setDefaultFileName( sync_file ); | ||
1798 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); | 1800 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); |
1799 | 1801 | ||
@@ -3007,4 +3009,6 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3007 | //pending detect, if remote file has REV field. if not switch to external sync | 3009 | //pending detect, if remote file has REV field. if not switch to external sync |
3008 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 3010 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
3011 | if ( manager != syncManager ) | ||
3012 | qDebug("KABCore::sync:: ERROR! :: manager != syncManager "); | ||
3009 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3013 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3010 | 3014 | ||
@@ -3074,4 +3078,6 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
3074 | return syncPhone(); | 3078 | return syncPhone(); |
3075 | disableBR( true ); | 3079 | disableBR( true ); |
3080 | if ( manager != syncManager ) | ||
3081 | qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager "); | ||
3076 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3082 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3077 | 3083 | ||
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index c12ba1c..7c53948 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -401,5 +401,5 @@ void KSyncManager::enableQuick( bool ask ) | |||
401 | //qDebug("port %d ", port); | 401 | //qDebug("port %d ", port); |
402 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); | 402 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); |
403 | mServerSocket->setFileName( defaultFileName() ); | 403 | mServerSocket->setFileName( defaultFileName() );//bbb |
404 | //qDebug("connected "); | 404 | //qDebug("connected "); |
405 | if ( !mServerSocket->ok() ) { | 405 | if ( !mServerSocket->ok() ) { |
@@ -1238,5 +1238,5 @@ void KServerSocket::send_file() | |||
1238 | delete mSyncActionDialog; | 1238 | delete mSyncActionDialog; |
1239 | mSyncActionDialog = 0; | 1239 | mSyncActionDialog = 0; |
1240 | qDebug("KSS::error open file "); | 1240 | qDebug("KSS::error open sync file: %s ", fileName.latin1()); |
1241 | mSocket->close(); | 1241 | mSocket->close(); |
1242 | if ( mSocket->state() == QSocket::Idle ) | 1242 | if ( mSocket->state() == QSocket::Idle ) |