author | zautrix <zautrix> | 2005-07-29 10:15:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-29 10:15:34 (UTC) |
commit | 43a46672f4212c9617c753e0aa591f781d2e5240 (patch) (unidiff) | |
tree | c91a20a73aa042735e3e7141e443ae7d2bffc148 | |
parent | 8feb7e617f1aa5cd5bb04d9a69d05409c3c4c60d (diff) | |
download | kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.zip kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.tar.gz kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.tar.bz2 |
fixx
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 8264410..fd29b51 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,10 +1,13 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.18 ************ | 3 | ********** VERSION 2.1.18 ************ |
4 | 4 | ||
5 | Pi-Sync mode: | ||
6 | The "Write back file" status dialog was updated too often such that writing back the file on the Z was very slow. Fixed. | ||
7 | |||
5 | KO/Pi: | 8 | KO/Pi: |
6 | 9 | ||
7 | 10 | ||
8 | ********** VERSION 2.1.17 ************ | 11 | ********** VERSION 2.1.17 ************ |
9 | 12 | ||
10 | KO/Pi: | 13 | KO/Pi: |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index f2ee0ab..2a75bfb 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1563,17 +1563,23 @@ void KCommandSocket::writeFileToSocket() | |||
1563 | mConnectProgress.blockSignals( true ); | 1563 | mConnectProgress.blockSignals( true ); |
1564 | QTextStream ts2( &file2 ); | 1564 | QTextStream ts2( &file2 ); |
1565 | ts2.setEncoding( QTextStream::Latin1 ); | 1565 | ts2.setEncoding( QTextStream::Latin1 ); |
1566 | QTextStream os2( mSocket ); | 1566 | QTextStream os2( mSocket ); |
1567 | os2.setEncoding( QTextStream::Latin1 ); | 1567 | os2.setEncoding( QTextStream::Latin1 ); |
1568 | os2 << "PUT " << mPassWord << "\r\n\r\n";; | 1568 | os2 << "PUT " << mPassWord << "\r\n\r\n";; |
1569 | int byteCount = 0; | ||
1570 | int byteMax = file2.size()/53; | ||
1569 | while ( ! ts2.atEnd() ) { | 1571 | while ( ! ts2.atEnd() ) { |
1570 | qApp->processEvents(); | 1572 | qApp->processEvents(); |
1571 | mConnectProgress.setProgress( count ); | 1573 | if ( byteCount > byteMax ) { |
1574 | byteCount = 0; | ||
1575 | mConnectProgress.setProgress( count ); | ||
1576 | } | ||
1572 | QString temp = ts2.readLine(); | 1577 | QString temp = ts2.readLine(); |
1573 | count += temp.length(); | 1578 | count += temp.length(); |
1579 | byteCount += temp.length(); | ||
1574 | os2 << temp << "\r\n"; | 1580 | os2 << temp << "\r\n"; |
1575 | } | 1581 | } |
1576 | file2.close(); | 1582 | file2.close(); |
1577 | mConnectProgress.hide(); | 1583 | mConnectProgress.hide(); |
1578 | mConnectCount = -1; | 1584 | mConnectCount = -1; |
1579 | os2 << "\r\n"; | 1585 | os2 << "\r\n"; |