author | zautrix <zautrix> | 2004-10-07 10:37:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-07 10:37:59 (UTC) |
commit | f0e8b8f36bccda952fa662e4faf2d58fcee67262 (patch) (unidiff) | |
tree | f1d26c6d9e8bdba9b15464682b8a64b1d3e04d8b | |
parent | 95508093d45aaf062813b7824884f964ee2d4d9a (diff) | |
download | kdepimpi-f0e8b8f36bccda952fa662e4faf2d58fcee67262.zip kdepimpi-f0e8b8f36bccda952fa662e4faf2d58fcee67262.tar.gz kdepimpi-f0e8b8f36bccda952fa662e4faf2d58fcee67262.tar.bz2 |
fix for different targets
-rw-r--r-- | korganizer/calendarview.cpp | 5 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index e4c067e..ea9607d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -129,2 +129,3 @@ | |||
129 | #endif | 129 | #endif |
130 | |||
130 | #ifdef DESKTOP_VERSION | 131 | #ifdef DESKTOP_VERSION |
@@ -159,5 +160,3 @@ class KOBeamPrefs : public QDialog | |||
159 | local = new QRadioButton(i18n(" Local time "), time ); | 160 | local = new QRadioButton(i18n(" Local time "), time ); |
160 | tz->setChecked( true );#ifdef DESKTOP_VERSION | 161 | tz->setChecked( true ); |
161 | #include <kabc/stdaddressbook.h> | ||
162 | #endif | ||
163 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); | 162 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index ea543dd..b360644 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -219,5 +219,15 @@ void KSyncManager::slotSyncMenu( int action ) | |||
219 | } else if ( temp->getIsPiSync() ) { | 219 | } else if ( temp->getIsPiSync() ) { |
220 | mPassWordPiSync = temp->getRemotePw(); | 220 | if ( mTargetApp == KAPI ) { |
221 | mActiveSyncPort = temp->getRemotePort(); | 221 | mPassWordPiSync = temp->getRemotePwAB(); |
222 | mActiveSyncIP = temp->getRemoteIP(); | 222 | mActiveSyncPort = temp->getRemotePortAB(); |
223 | mActiveSyncIP = temp->getRemoteIPAB(); | ||
224 | } else if ( mTargetApp == KOPI ) { | ||
225 | mPassWordPiSync = temp->getRemotePw(); | ||
226 | mActiveSyncPort = temp->getRemotePort(); | ||
227 | mActiveSyncIP = temp->getRemoteIP(); | ||
228 | } else { | ||
229 | mPassWordPiSync = temp->getRemotePwPWM(); | ||
230 | mActiveSyncPort = temp->getRemotePortPWM(); | ||
231 | mActiveSyncIP = temp->getRemoteIPPWM(); | ||
232 | } | ||
223 | syncPi(); | 233 | syncPi(); |