| -rw-r--r-- | korganizer/koprefs.cpp | 8 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 31ef338..9147af3 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -538,2 +538,10 @@ int KOPrefs::getFuzzyCalendarID( const QString & name ) } + QString name2 = name; + name2.replace (QRegExp ("_")," " ); + kkf = mCalendars.first(); + while ( kkf ) { + if ( name2.lower() == kkf->mName.lower()) + return kkf->mCalNumber; + kkf = mCalendars.next(); + } return 0; diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 61a9899..795cd30 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1142,2 +1142,3 @@ void KSyncManager::syncPi() mCurrentResourceRemote = ""; + qDebug ( "KSM: sync pi %d",mSpecificResources.count() ); if ( mSpecificResources.count() ) { @@ -1148,2 +1149,3 @@ void KSyncManager::syncPi() --lastSyncRes; + qDebug ( "KSM: sync pi %d",ccc ); } @@ -1157,3 +1159,4 @@ void KSyncManager::syncPi() mCurrentResourceLocal = mSpecificResources[ startLocal ]; - mCurrentResourceRemote = mSpecificResources[ startRemote ]; + mCurrentResourceRemote = mSpecificResources[ startRemote ]; + qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); if ( !mCurrentResourceRemote.isEmpty() ) { @@ -1168,4 +1171,6 @@ void KSyncManager::syncPi() } + ++startRemote; ++startLocal; } + mPisyncFinished = true; } else { @@ -1518,2 +1523,4 @@ KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port mRemoteResource = "ALL"; + else + mRemoteResource.replace (QRegExp (" "),"_" ); mPassWord = password; @@ -1544,3 +1551,3 @@ void KCommandSocket::sendFileRequest() QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); - os << "GET " << mPassWord << curDt << mRemoteResource << "\r\n\r\n"; + os << "GET " << mPassWord << curDt << " " << mRemoteResource << "\r\n\r\n"; } @@ -1619,3 +1626,3 @@ void KCommandSocket::writeFileToSocket() os2.setEncoding( QTextStream::Latin1 ); - os2 << "PUT " << mPassWord << mRemoteResource << "\r\n\r\n";; + os2 << "PUT " << mPassWord << " " << mRemoteResource << "\r\n\r\n";; int byteCount = 0; |