author | zautrix <zautrix> | 2004-10-28 12:14:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-28 12:14:23 (UTC) |
commit | 2a5dfaf6f91534043ab9baa172b077c5ccef63ae (patch) (unidiff) | |
tree | ad8a5a7dfb9c67707d255d97a063e006958b6796 | |
parent | af21c3d45173ece8492850b8c2c5019e7c25d59c (diff) | |
download | kdepimpi-2a5dfaf6f91534043ab9baa172b077c5ccef63ae.zip kdepimpi-2a5dfaf6f91534043ab9baa172b077c5ccef63ae.tar.gz kdepimpi-2a5dfaf6f91534043ab9baa172b077c5ccef63ae.tar.bz2 |
compile fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 41b3e45..c61a322 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -13,48 +13,52 @@ NEEDS ACTION | |||
13 | Fixed some problems in the German translation of OM/Pi, | 13 | Fixed some problems in the German translation of OM/Pi, |
14 | which makes some dialogs not fitting on the screen | 14 | which makes some dialogs not fitting on the screen |
15 | of the Z 5500. | 15 | of the Z 5500. |
16 | 16 | ||
17 | Fixed Qtopia crash, when disabling/deinstalling | 17 | Fixed Qtopia crash, when disabling/deinstalling |
18 | KO/Pi alarm applet. | 18 | KO/Pi alarm applet. |
19 | 19 | ||
20 | Implemented direct KDE<->KA/Pi sync for KA/Pi running | 20 | Implemented direct KDE<->KA/Pi sync for KA/Pi running |
21 | on Linux desktop. | 21 | on Linux desktop. |
22 | 22 | ||
23 | Added "remove sync info" to sync menu. | 23 | Added "remove sync info" to sync menu. |
24 | 24 | ||
25 | Tweaked the KO/Pi What's next view a bit, added | 25 | Tweaked the KO/Pi What's next view a bit, added |
26 | setting to hide events that are done. | 26 | setting to hide events that are done. |
27 | 27 | ||
28 | Disabled "beam receive enabled" on startup to | 28 | Disabled "beam receive enabled" on startup to |
29 | avoid problems if Fastload is enabled. | 29 | avoid problems if Fastload is enabled. |
30 | Please set "beam receive enabled", | 30 | Please set "beam receive enabled", |
31 | if you want to receive data via IR. | 31 | if you want to receive data via IR. |
32 | 32 | ||
33 | Fixed bug in direct KDE<->KO/Pi sync for KO/Pi running | 33 | Fixed bug in direct KDE<->KO/Pi sync for KO/Pi running |
34 | on Linux desktop. | 34 | on Linux desktop. |
35 | 35 | ||
36 | Made in KA/Pi scrolling possible, if details view is selected. | 36 | Made in KA/Pi scrolling possible, if details view is selected. |
37 | (The keyboard focus is set automatically to the search line) | ||
38 | |||
39 | Fixed a bug in DMT sync, that a new entry in DTM was added | ||
40 | on every sync to Kx/Pi. | ||
37 | 41 | ||
38 | 42 | ||
39 | 43 | ||
40 | 44 | ||
41 | ********** VERSION 1.9.10 ************ | 45 | ********** VERSION 1.9.10 ************ |
42 | 46 | ||
43 | Many internal small bugfixes. | 47 | Many internal small bugfixes. |
44 | And fix of the "big" bug in KO/Pi, | 48 | And fix of the "big" bug in KO/Pi, |
45 | that after Syncing the appointments had an offset by several hours. | 49 | that after Syncing the appointments had an offset by several hours. |
46 | That was a problem with the internal timezone setting, | 50 | That was a problem with the internal timezone setting, |
47 | introduced by the changed timezone configuration settings. | 51 | introduced by the changed timezone configuration settings. |
48 | 52 | ||
49 | German translation for OM/Pi is now available. | 53 | German translation for OM/Pi is now available. |
50 | 54 | ||
51 | 55 | ||
52 | ********** VERSION 1.9.9 ************ | 56 | ********** VERSION 1.9.9 ************ |
53 | 57 | ||
54 | KDE-Pim/Pi has a new Member! | 58 | KDE-Pim/Pi has a new Member! |
55 | It is called PWM/Pi (Passwordmanager/platform-independent) | 59 | It is called PWM/Pi (Passwordmanager/platform-independent) |
56 | and it is available for the Zaurus. | 60 | and it is available for the Zaurus. |
57 | It is planned, that it will be available later for Windows. | 61 | It is planned, that it will be available later for Windows. |
58 | (And for Linux, of course). | 62 | (And for Linux, of course). |
59 | It is a port of the Passwordmanager of KDE. | 63 | It is a port of the Passwordmanager of KDE. |
60 | It will need the MicroKDElibs to run. | 64 | It will need the MicroKDElibs to run. |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c75b4bc..9ef97c9 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2714,49 +2714,49 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2714 | } | 2714 | } |
2715 | } | 2715 | } |
2716 | ++incCounter; | 2716 | ++incCounter; |
2717 | } | 2717 | } |
2718 | er.clear(); | 2718 | er.clear(); |
2719 | QStringList el = local->uidList(); | 2719 | QStringList el = local->uidList(); |
2720 | modulo = (el.count()/10)+1; | 2720 | modulo = (el.count()/10)+1; |
2721 | 2721 | ||
2722 | syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count()); | 2722 | syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count()); |
2723 | incCounter = 0; | 2723 | incCounter = 0; |
2724 | while ( incCounter < el.count()) { | 2724 | while ( incCounter < el.count()) { |
2725 | qApp->processEvents(); | 2725 | qApp->processEvents(); |
2726 | if (syncManager->isProgressBarCanceled()) | 2726 | if (syncManager->isProgressBarCanceled()) |
2727 | return false; | 2727 | return false; |
2728 | if ( incCounter % modulo == 0 ) | 2728 | if ( incCounter % modulo == 0 ) |
2729 | syncManager->showProgressBar(incCounter); | 2729 | syncManager->showProgressBar(incCounter); |
2730 | uid = el[ incCounter ]; | 2730 | uid = el[ incCounter ]; |
2731 | bool skipIncidence = false; | 2731 | bool skipIncidence = false; |
2732 | if ( uid.left(19) == QString("last-syncAddressee-") ) | 2732 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2733 | skipIncidence = true; | 2733 | skipIncidence = true; |
2734 | if ( !skipIncidence ) { | 2734 | if ( !skipIncidence ) { |
2735 | inL = local->findByUid( uid ); | 2735 | inL = local->findByUid( uid ); |
2736 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | 2736 | if ( !inL.resource() || inL.resource()->includeInSync() ) { |
2737 | inR = remote->findByUid( uid ); | 2737 | inR = remote->findByUid( uid ); |
2738 | if ( inR.isEmpty() ) { / no conflict ********** add or delete local | 2738 | if ( inR.isEmpty() ) { // no conflict ********** add or delete local |
2739 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2739 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2740 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 2740 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
2741 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2741 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2742 | local->removeAddressee( inL ); | 2742 | local->removeAddressee( inL ); |
2743 | ++deletedAddresseeL; | 2743 | ++deletedAddresseeL; |
2744 | } else { | 2744 | } else { |
2745 | if ( ! syncManager->mWriteBackExistingOnly ) { | 2745 | if ( ! syncManager->mWriteBackExistingOnly ) { |
2746 | inL.removeID(mCurrentSyncDevice ); | 2746 | inL.removeID(mCurrentSyncDevice ); |
2747 | ++addedAddresseeR; | 2747 | ++addedAddresseeR; |
2748 | inL.setRevision( modifiedCalendar ); | 2748 | inL.setRevision( modifiedCalendar ); |
2749 | local->insertAddressee( inL, false ); | 2749 | local->insertAddressee( inL, false ); |
2750 | inR = inL; | 2750 | inR = inL; |
2751 | inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); | 2751 | inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); |
2752 | inR.setResource( 0 ); | 2752 | inR.setResource( 0 ); |
2753 | remote->insertAddressee( inR, false ); | 2753 | remote->insertAddressee( inR, false ); |
2754 | } | 2754 | } |
2755 | } | 2755 | } |
2756 | } else { | 2756 | } else { |
2757 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { | 2757 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { |
2758 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2758 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2759 | local->removeAddressee( inL ); | 2759 | local->removeAddressee( inL ); |
2760 | ++deletedAddresseeL; | 2760 | ++deletedAddresseeL; |
2761 | } else { | 2761 | } else { |
2762 | if ( ! syncManager->mWriteBackExistingOnly ) { | 2762 | if ( ! syncManager->mWriteBackExistingOnly ) { |