author | zautrix <zautrix> | 2004-08-09 14:56:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-09 14:56:56 (UTC) |
commit | ad99dd380750834b3ccc4dd6fdcdd446ca5ba7ee (patch) (unidiff) | |
tree | 0394df7d796d38e7df637e6d45b82e7945fab55e /korganizer | |
parent | 48f53b2d2e7ed189e88f924259693ab66ff44b7f (diff) | |
download | kdepimpi-ad99dd380750834b3ccc4dd6fdcdd446ca5ba7ee.zip kdepimpi-ad99dd380750834b3ccc4dd6fdcdd446ca5ba7ee.tar.gz kdepimpi-ad99dd380750834b3ccc4dd6fdcdd446ca5ba7ee.tar.bz2 |
more phone sync
-rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index d6ead37..547d02b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1190,31 +1190,29 @@ void CalendarView::syncExternal( int mode ) | |||
1190 | bool syncOK = false; | 1190 | bool syncOK = false; |
1191 | bool loadSuccess = false; | 1191 | bool loadSuccess = false; |
1192 | PhoneFormat* phoneFormat = 0; | 1192 | PhoneFormat* phoneFormat = 0; |
1193 | #ifndef DESKTOP_VERSION | 1193 | #ifndef DESKTOP_VERSION |
1194 | SharpFormat* sharpFormat = 0; | 1194 | SharpFormat* sharpFormat = 0; |
1195 | if ( mode == 0 ) { // sharp | 1195 | if ( mode == 0 ) { // sharp |
1196 | sharpFormat = new SharpFormat () ; | 1196 | sharpFormat = new SharpFormat () ; |
1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); | 1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); |
1198 | 1198 | ||
1199 | } else | 1199 | } else |
1200 | #endif | 1200 | #endif |
1201 | if ( mode == 1 ) { // phone | 1201 | if ( mode == 1 ) { // phone |
1202 | phoneFormat = new PhoneFormat (); | 1202 | phoneFormat = new PhoneFormat (mCurrentSyncDevice, |
1203 | loadSuccess = phoneFormat->load( calendar, | ||
1204 | mCalendar, | ||
1205 | mCurrentSyncDevice, | ||
1206 | KOPrefs::instance()->mPhoneDevice, | 1203 | KOPrefs::instance()->mPhoneDevice, |
1207 | KOPrefs::instance()->mPhoneConnection, | 1204 | KOPrefs::instance()->mPhoneConnection, |
1208 | KOPrefs::instance()->mPhoneModel); | 1205 | KOPrefs::instance()->mPhoneModel); |
1206 | loadSuccess = phoneFormat->load( calendar,mCalendar); | ||
1209 | 1207 | ||
1210 | } else | 1208 | } else |
1211 | return; | 1209 | return; |
1212 | if ( loadSuccess ) { | 1210 | if ( loadSuccess ) { |
1213 | getEventViewerDialog()->setSyncMode( true ); | 1211 | getEventViewerDialog()->setSyncMode( true ); |
1214 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); | 1212 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); |
1215 | getEventViewerDialog()->setSyncMode( false ); | 1213 | getEventViewerDialog()->setSyncMode( false ); |
1216 | qApp->processEvents(); | 1214 | qApp->processEvents(); |
1217 | if ( syncOK ) { | 1215 | if ( syncOK ) { |
1218 | if ( KOPrefs::instance()->mWriteBackFile ) | 1216 | if ( KOPrefs::instance()->mWriteBackFile ) |
1219 | { | 1217 | { |
1220 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); | 1218 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); |