-rw-r--r-- | korganizer/calendarview.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index b307649..d6ead37 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1191,25 +1191,30 @@ void CalendarView::syncExternal( int mode ) | |||
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 (); |
1203 | loadSuccess = phoneFormat->load( calendar, mCalendar ); | 1203 | loadSuccess = phoneFormat->load( calendar, |
1204 | mCalendar, | ||
1205 | mCurrentSyncDevice, | ||
1206 | KOPrefs::instance()->mPhoneDevice, | ||
1207 | KOPrefs::instance()->mPhoneConnection, | ||
1208 | KOPrefs::instance()->mPhoneModel); | ||
1204 | 1209 | ||
1205 | } else | 1210 | } else |
1206 | return; | 1211 | return; |
1207 | if ( loadSuccess ) { | 1212 | if ( loadSuccess ) { |
1208 | getEventViewerDialog()->setSyncMode( true ); | 1213 | getEventViewerDialog()->setSyncMode( true ); |
1209 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); | 1214 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); |
1210 | getEventViewerDialog()->setSyncMode( false ); | 1215 | getEventViewerDialog()->setSyncMode( false ); |
1211 | qApp->processEvents(); | 1216 | qApp->processEvents(); |
1212 | if ( syncOK ) { | 1217 | if ( syncOK ) { |
1213 | if ( KOPrefs::instance()->mWriteBackFile ) | 1218 | if ( KOPrefs::instance()->mWriteBackFile ) |
1214 | { | 1219 | { |
1215 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); | 1220 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); |