author | zautrix <zautrix> | 2004-10-20 09:45:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-20 09:45:16 (UTC) |
commit | b3662915cb2c966ed7b5c563b8e840ae5b82d4e6 (patch) (unidiff) | |
tree | bc09d046e1d47fe94acb538af88458f716993dfc /korganizer/calendarview.cpp | |
parent | 40eaafc9e008dc004b6ebc65fae8d89c8883ee8b (diff) | |
download | kdepimpi-b3662915cb2c966ed7b5c563b8e840ae5b82d4e6.zip kdepimpi-b3662915cb2c966ed7b5c563b8e840ae5b82d4e6.tar.gz kdepimpi-b3662915cb2c966ed7b5c563b8e840ae5b82d4e6.tar.bz2 |
fixed br for kopi
-rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 884c61a..0306e07 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1234,6 +1234,7 @@ void CalendarView::syncExternal( int mode ) | |||
1234 | bool syncOK = false; | 1234 | bool syncOK = false; |
1235 | bool loadSuccess = false; | 1235 | bool loadSuccess = false; |
1236 | PhoneFormat* phoneFormat = 0; | 1236 | PhoneFormat* phoneFormat = 0; |
1237 | emit tempDisableBR(true); | ||
1237 | #ifndef DESKTOP_VERSION | 1238 | #ifndef DESKTOP_VERSION |
1238 | SharpFormat* sharpFormat = 0; | 1239 | SharpFormat* sharpFormat = 0; |
1239 | if ( mode == 0 ) { // sharp | 1240 | if ( mode == 0 ) { // sharp |
@@ -1249,8 +1250,10 @@ void CalendarView::syncExternal( int mode ) | |||
1249 | mSyncManager->mPhoneModel); | 1250 | mSyncManager->mPhoneModel); |
1250 | loadSuccess = phoneFormat->load( calendar,mCalendar); | 1251 | loadSuccess = phoneFormat->load( calendar,mCalendar); |
1251 | 1252 | ||
1252 | } else | 1253 | } else { |
1253 | return; | 1254 | emit tempDisableBR(false); |
1255 | return; | ||
1256 | } | ||
1254 | if ( loadSuccess ) { | 1257 | if ( loadSuccess ) { |
1255 | getEventViewerDialog()->setSyncMode( true ); | 1258 | getEventViewerDialog()->setSyncMode( true ); |
1256 | syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs ); | 1259 | syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs ); |
@@ -1303,6 +1306,7 @@ void CalendarView::syncExternal( int mode ) | |||
1303 | } | 1306 | } |
1304 | delete calendar; | 1307 | delete calendar; |
1305 | updateView(); | 1308 | updateView(); |
1309 | emit tempDisableBR(false); | ||
1306 | return ;//syncOK; | 1310 | return ;//syncOK; |
1307 | 1311 | ||
1308 | } | 1312 | } |